diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png
new file mode 100644
index 000000000..bf7730024
Binary files /dev/null and b/graphics/naming_screen/back_button.png differ
diff --git a/graphics/naming_screen/buttons.pal b/graphics/naming_screen/buttons.pal
new file mode 100644
index 000000000..fdf80bdb0
--- /dev/null
+++ b/graphics/naming_screen/buttons.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+139 139 131
+197 189 180
+230 222 213
+74 115 139
+123 172 197
+172 115 74
+213 156 115
+98 156 57
+148 189 106
+189 164 32
+230 222 90
+57 57 57
+57 57 57
diff --git a/graphics/naming_screen/cursor.pal b/graphics/naming_screen/cursor.pal
new file mode 100644
index 000000000..8950f9b34
--- /dev/null
+++ b/graphics/naming_screen/cursor.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 8 8
+222 57 74
+180 65 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 213
+0 0 0
+230 222 213
+0 0 0
diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png
index 3d92ef6f4..e0f5022be 100644
Binary files a/graphics/naming_screen/cursor.png and b/graphics/naming_screen/cursor.png differ
diff --git a/graphics/naming_screen/cursor_filled.png b/graphics/naming_screen/cursor_filled.png
new file mode 100644
index 000000000..efb5e1101
Binary files /dev/null and b/graphics/naming_screen/cursor_filled.png differ
diff --git a/graphics/naming_screen/cursor_squished.png b/graphics/naming_screen/cursor_squished.png
new file mode 100644
index 000000000..5126fccca
Binary files /dev/null and b/graphics/naming_screen/cursor_squished.png differ
diff --git a/graphics/naming_screen/input_arrow.png b/graphics/naming_screen/input_arrow.png
index e07b9e5a8..0a5072673 100644
Binary files a/graphics/naming_screen/input_arrow.png and b/graphics/naming_screen/input_arrow.png differ
diff --git a/graphics/naming_screen/menu.pal b/graphics/naming_screen/menu.pal
index 0da3b93f2..2f5c86a56 100644
--- a/graphics/naming_screen/menu.pal
+++ b/graphics/naming_screen/menu.pal
@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-96
+16
 106 156 213
 255 255 255
 115 115 115
@@ -17,83 +17,3 @@ JASC-PAL
 230 222 90
 238 230 139
 246 238 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-74 115 139
-98 139 164
-123 172 197
-156 205 230
-180 222 246
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-172 115 74
-189 131 90
-213 156 115
-246 205 164
-255 230 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-98 156 57
-123 172 82
-148 189 106
-197 230 156
-213 238 189
-106 156 213
-255 255 255
-57 57 57
-139 139 131
-197 189 180
-230 222 213
-74 115 139
-123 172 197
-172 115 74
-213 156 115
-98 156 57
-148 189 106
-189 164 32
-230 222 90
-57 57 57
-57 57 57
-106 156 213
-255 8 8
-222 57 74
-180 65 82
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-230 222 213
-0 0 0
-230 222 213
-0 0 0
diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png
new file mode 100644
index 000000000..3850f462a
Binary files /dev/null and b/graphics/naming_screen/ok_button.png differ
diff --git a/graphics/naming_screen/page_button.png b/graphics/naming_screen/page_button.png
deleted file mode 100644
index e5a004894..000000000
Binary files a/graphics/naming_screen/page_button.png and /dev/null differ
diff --git a/graphics/naming_screen/page_swap_button.png b/graphics/naming_screen/page_swap_button.png
new file mode 100644
index 000000000..2e5cabed0
Binary files /dev/null and b/graphics/naming_screen/page_swap_button.png differ
diff --git a/graphics/naming_screen/page_swap_frame.png b/graphics/naming_screen/page_swap_frame.png
new file mode 100644
index 000000000..bc3ff122b
Binary files /dev/null and b/graphics/naming_screen/page_swap_frame.png differ
diff --git a/graphics/naming_screen/page_swap_lower.pal b/graphics/naming_screen/page_swap_lower.pal
new file mode 100644
index 000000000..0fac7e375
--- /dev/null
+++ b/graphics/naming_screen/page_swap_lower.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+172 115 74
+189 131 90
+213 156 115
+246 205 164
+255 230 197
diff --git a/graphics/naming_screen/page_swap_lower.png b/graphics/naming_screen/page_swap_lower.png
new file mode 100644
index 000000000..5747c6265
Binary files /dev/null and b/graphics/naming_screen/page_swap_lower.png differ
diff --git a/graphics/naming_screen/page_swap_others.pal b/graphics/naming_screen/page_swap_others.pal
new file mode 100644
index 000000000..0bb9d4f71
--- /dev/null
+++ b/graphics/naming_screen/page_swap_others.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+98 156 57
+123 172 82
+148 189 106
+197 230 156
+213 238 189
diff --git a/graphics/naming_screen/page_swap_others.png b/graphics/naming_screen/page_swap_others.png
new file mode 100644
index 000000000..1c878a753
Binary files /dev/null and b/graphics/naming_screen/page_swap_others.png differ
diff --git a/graphics/naming_screen/page_swap_upper.pal b/graphics/naming_screen/page_swap_upper.pal
new file mode 100644
index 000000000..af5c2d1a5
--- /dev/null
+++ b/graphics/naming_screen/page_swap_upper.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+74 115 139
+98 139 164
+123 172 197
+156 205 230
+180 222 246
diff --git a/graphics/naming_screen/page_swap_upper.png b/graphics/naming_screen/page_swap_upper.png
new file mode 100644
index 000000000..922f0b93f
Binary files /dev/null and b/graphics/naming_screen/page_swap_upper.png differ
diff --git a/graphics/naming_screen/pc_icon/off.png b/graphics/naming_screen/pc_icon_off.png
similarity index 100%
rename from graphics/naming_screen/pc_icon/off.png
rename to graphics/naming_screen/pc_icon_off.png
diff --git a/graphics/naming_screen/pc_icon/on.png b/graphics/naming_screen/pc_icon_on.png
similarity index 100%
rename from graphics/naming_screen/pc_icon/on.png
rename to graphics/naming_screen/pc_icon_on.png
diff --git a/graphics/naming_screen/unused.pal b/graphics/naming_screen/rival.pal
similarity index 100%
rename from graphics/naming_screen/unused.pal
rename to graphics/naming_screen/rival.pal
diff --git a/graphics/naming_screen/roptions.png b/graphics/naming_screen/roptions.png
deleted file mode 100644
index dfb7e0105..000000000
Binary files a/graphics/naming_screen/roptions.png and /dev/null differ
diff --git a/graphics/naming_screen/rwindow.png b/graphics/naming_screen/rwindow.png
deleted file mode 100644
index 9571abb80..000000000
Binary files a/graphics/naming_screen/rwindow.png and /dev/null differ
diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png
index 409ca82ed..58d78ce08 100644
Binary files a/graphics/naming_screen/underscore.png and b/graphics/naming_screen/underscore.png differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 9e5c19193..42b1e6d74 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -20,6 +20,7 @@ MISCGFXDIR := graphics/misc
 JPCONTESTGFXDIR := graphics/contest/japanese
 POKEDEXGFXDIR := graphics/pokedex
 STARTERGFXDIR := graphics/starter_choose
+NAMINGGFXDIR := graphics/naming_screen
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -710,3 +711,12 @@ $(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
 
 $(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp
 	@cat $^ >$@
+
+$(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 5
+
+$(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 5
+
+$(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 5
diff --git a/include/graphics.h b/include/graphics.h
index 0972743c5..08a2a1c42 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4063,18 +4063,24 @@ extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 
-extern const u16 gNamingScreenMenu_Pal[];
+extern const u16 gNamingScreenMenu_Pal[6][16];
 extern const u32 gNamingScreenMenu_Gfx[];
 extern const u32 gNamingScreenBackground_Tilemap[];
 extern const u8 gNamingScreenKeyboardUpper_Tilemap[];
 extern const u8 gNamingScreenKeyboardLower_Tilemap[];
 extern const u8 gNamingScreenKeyboardSymbols_Tilemap[];
-extern const u8 gNamingScreenRWindow_Gfx[];
-extern const u8 gNamingScreenPageButton_Gfx[];
-extern const u8 gNamingScreenROptions_Gfx[];
-extern const u8 gNamingScreenCursor_Gfx[];
-extern const u8 gNamingScreenInputArrow_Gfx[];
-extern const u8 gNamingScreenUnderscore_Gfx[];
+extern const u32 gNamingScreenPageSwapFrame_Gfx[];
+extern const u32 gNamingScreenBackButton_Gfx[];
+extern const u32 gNamingScreenOKButton_Gfx[];
+extern const u32 gNamingScreenPageSwapButton_Gfx[];
+extern const u32 gNamingScreenPageSwapUpper_Gfx[];
+extern const u32 gNamingScreenPageSwapLower_Gfx[];
+extern const u32 gNamingScreenPageSwapOthers_Gfx[];
+extern const u32 gNamingScreenCursor_Gfx[];
+extern const u32 gNamingScreenCursorSquished_Gfx[];
+extern const u32 gNamingScreenCursorFilled_Gfx[];
+extern const u32 gNamingScreenInputArrow_Gfx[];
+extern const u32 gNamingScreenUnderscore_Gfx[];
 
 extern const u32 gPokeblockFeedBg_Tilemap[];
 
diff --git a/include/strings.h b/include/strings.h
index a22aa307b..26bdb2153 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -3021,4 +3021,11 @@ extern const u8 gText_PkmnForSwap[];
 extern const u8 gText_SamePkmnInPartyAlready[];
 extern const u8 gText_Cancel3[];
 
+// Naming Screen
+extern const u8 gText_MoveOkBack[];
+extern const u8 gText_YourName[];
+extern const u8 gText_BoxName[];
+extern const u8 gText_PkmnsNickname[];
+extern const u8 gText_TellHimTheWords[];
+
 #endif // GUARD_STRINGS_H
diff --git a/src/graphics.c b/src/graphics.c
index 9f708f18b..eb798433d 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1400,17 +1400,31 @@ const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_stora
 
 // naming screen
 
-const u16 gNamingScreenMenu_Pal[] = INCBIN_U16("graphics/naming_screen/menu.gbapal");
-const u32 gNamingScreenMenu_Gfx[] = INCBIN_U32("graphics/naming_screen/menu.4bpp.lz");
-const u8 gNamingScreenRWindow_Gfx[] = INCBIN_U8("graphics/naming_screen/rwindow.4bpp");
-const u8 gNamingScreenROptions_Gfx[] = INCBIN_U8("graphics/naming_screen/roptions.4bpp");
-const u8 gNamingScreenCursor_Gfx[] = INCBIN_U8("graphics/naming_screen/cursor.4bpp");
-const u8 gNamingScreenPageButton_Gfx[] = INCBIN_U8("graphics/naming_screen/page_button.4bpp");
-const u8 gNamingScreenInputArrow_Gfx[] = INCBIN_U8("graphics/naming_screen/input_arrow.4bpp");
-const u8 gNamingScreenUnderscore_Gfx[] = INCBIN_U8("graphics/naming_screen/underscore.4bpp");
-const u32 gNamingScreenBackground_Tilemap[] = INCBIN_U32("graphics/naming_screen/background.bin.lz");
-const u32 gNamingScreenKeyboardUpper_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_upper.bin.lz");
-const u32 gNamingScreenKeyboardLower_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_lower.bin.lz");
+const u16 gNamingScreenMenu_Pal[6][16] =
+{
+    INCBIN_U16("graphics/naming_screen/menu.gbapal"),
+    INCBIN_U16("graphics/naming_screen/page_swap_upper.gbapal"),
+    INCBIN_U16("graphics/naming_screen/page_swap_lower.gbapal"),
+    INCBIN_U16("graphics/naming_screen/page_swap_others.gbapal"),
+    INCBIN_U16("graphics/naming_screen/buttons.gbapal"),
+    INCBIN_U16("graphics/naming_screen/cursor.gbapal"),
+};
+const u32 gNamingScreenMenu_Gfx[]                = INCBIN_U32("graphics/naming_screen/menu.4bpp.lz");
+const u32 gNamingScreenPageSwapFrame_Gfx[]       = INCBIN_U32("graphics/naming_screen/page_swap_frame.4bpp");
+const u32 gNamingScreenBackButton_Gfx[]          = INCBIN_U32("graphics/naming_screen/back_button.4bpp");
+const u32 gNamingScreenOKButton_Gfx[]            = INCBIN_U32("graphics/naming_screen/ok_button.4bpp");
+const u32 gNamingScreenPageSwapUpper_Gfx[]       = INCBIN_U32("graphics/naming_screen/page_swap_upper.4bpp");
+const u32 gNamingScreenPageSwapLower_Gfx[]       = INCBIN_U32("graphics/naming_screen/page_swap_lower.4bpp");
+const u32 gNamingScreenPageSwapOthers_Gfx[]      = INCBIN_U32("graphics/naming_screen/page_swap_others.4bpp");
+const u32 gNamingScreenCursor_Gfx[]              = INCBIN_U32("graphics/naming_screen/cursor.4bpp");
+const u32 gNamingScreenCursorSquished_Gfx[]      = INCBIN_U32("graphics/naming_screen/cursor_squished.4bpp");
+const u32 gNamingScreenCursorFilled_Gfx[]        = INCBIN_U32("graphics/naming_screen/cursor_filled.4bpp");
+const u32 gNamingScreenPageSwapButton_Gfx[]      = INCBIN_U32("graphics/naming_screen/page_swap_button.4bpp");
+const u32 gNamingScreenInputArrow_Gfx[]          = INCBIN_U32("graphics/naming_screen/input_arrow.4bpp");
+const u32 gNamingScreenUnderscore_Gfx[]          = INCBIN_U32("graphics/naming_screen/underscore.4bpp");
+const u32 gNamingScreenBackground_Tilemap[]      = INCBIN_U32("graphics/naming_screen/background.bin.lz");
+const u32 gNamingScreenKeyboardUpper_Tilemap[]   = INCBIN_U32("graphics/naming_screen/keyboard_upper.bin.lz");
+const u32 gNamingScreenKeyboardLower_Tilemap[]   = INCBIN_U32("graphics/naming_screen/keyboard_lower.bin.lz");
 const u32 gNamingScreenKeyboardSymbols_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_symbols.bin.lz");
 
 // union room chat
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 613928030..3dbc0aaac 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -26,6 +26,7 @@
 #include "text_window.h"
 #include "overworld.h"
 #include "walda_phrase.h"
+#include "main.h"
 #include "constants/event_objects.h"
 #include "constants/rgb.h"
 
@@ -61,10 +62,10 @@ enum {
 };
 
 enum {
-    PALTAG_PC_ICON,
+    PALTAG_MENU, // Also the PC icon
     PALTAG_PAGE_SWAP_UPPER,
     PALTAG_PAGE_SWAP_LOWER,
-    PALTAG_PAGE_SWAP_OTHERS,
+    PALTAG_PAGE_SWAP_OTHERS, // Also the input arrow/underscore
     PALTAG_PAGE_SWAP,
     PALTAG_CURSOR,
     PALTAG_BACK_BUTTON,
@@ -180,21 +181,11 @@ struct NamingScreenData
 };
 
 EWRAM_DATA static struct NamingScreenData *sNamingScreen = NULL;
-extern u16 gKeyRepeatStartDelay;
 
-// extern text
-extern const u8 gText_MoveOkBack[];
-extern const u8 gText_YourName[];
-extern const u8 gText_BoxName[];
-extern const u8 gText_PkmnsNickname[];
-extern const u8 gText_TellHimTheWords[];
-
-
-// start of .rodata
-static const u8 sPCIconOff_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon/off.4bpp");
-static const u8 sPCIconOn_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon/on.4bpp");
+static const u8 sPCIconOff_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon_off.4bpp");
+static const u8 sPCIconOn_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon_on.4bpp");
 static const u16 sKeyboard_Pal[] = INCBIN_U16("graphics/naming_screen/keyboard.gbapal");
-static const u16 sUnused_Pal[] = INCBIN_U16("graphics/naming_screen/unused.gbapal");
+static const u16 sRival_Pal[] = INCBIN_U16("graphics/naming_screen/rival.gbapal"); // Unused, leftover from FRLG rival
 
 static const u8 *const sTransferredToPCMessages[] =
 {
@@ -312,13 +303,12 @@ static const u8 sPageColumnCounts[KBPAGE_COUNT] = {
     [KEYBOARD_LETTERS_UPPER] = KBCOL_COUNT,
     [KEYBOARD_SYMBOLS]       = 6
 };
-static const u8 sPageColumnXPos[KBPAGE_COUNT * KBCOL_COUNT] = {
-    0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_LOWER
-    0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_UPPER
-    0, 22, 44, 66, 88, 110          // KEYBOARD_SYMBOLS
+static const u8 sPageColumnXPos[KBPAGE_COUNT][KBCOL_COUNT] = {
+    [KEYBOARD_LETTERS_LOWER] = {0, 12, 24, 56, 68, 80, 92, 123},
+    [KEYBOARD_LETTERS_UPPER] = {0, 12, 24, 56, 68, 80, 92, 123},
+    [KEYBOARD_SYMBOLS]       = {0, 22, 44, 66, 88, 110}
 };
 
-// forward declarations
 static const struct NamingScreenTemplate *const sNamingScreenTemplates[];
 static const struct SubspriteTable sSubspriteTable_PageSwapFrame[];
 static const struct SubspriteTable sSubspriteTable_PageSwapText[];
@@ -1142,7 +1132,7 @@ static void SetCursorPos(s16 x, s16 y)
     struct Sprite *cursorSprite = &gSprites[sNamingScreen->cursorSpriteId];
 
     if (x < sPageColumnCounts[CurrentPageToKeyboardId()])
-        cursorSprite->x = sPageColumnXPos[x + CurrentPageToKeyboardId() * KBCOL_COUNT] + 38;
+        cursorSprite->x = sPageColumnXPos[CurrentPageToKeyboardId()][x] + 38;
     else
         cursorSprite->x = 0;
 
@@ -1890,7 +1880,7 @@ static void CreateHelperTasks(void)
 
 static void LoadPalettes(void)
 {
-    LoadPalette(gNamingScreenMenu_Pal, 0, 0xC0);
+    LoadPalette(gNamingScreenMenu_Pal, 0, sizeof(gNamingScreenMenu_Pal));
     LoadPalette(sKeyboard_Pal, 0xA0, sizeof(sKeyboard_Pal));
     LoadPalette(GetTextWindowPalette(2), 0xB0, 0x20);
 }
@@ -2512,7 +2502,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore =
 static const struct SpriteTemplate sSpriteTemplate_PCIcon =
 {
     .tileTag = TAG_NONE,
-    .paletteTag = PALTAG_PC_ICON,
+    .paletteTag = PALTAG_MENU,
     .oam = &sOam_8x8,
     .anims = sAnims_PCIcon,
     .images = sImageTable_PCIcon,
@@ -2547,31 +2537,31 @@ static const u8 *const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
 
 static const struct SpriteSheet sSpriteSheets[] =
 {
-    {gNamingScreenRWindow_Gfx + 0x280,          0x1E0,  GFXTAG_BACK_BUTTON},
-    {gNamingScreenRWindow_Gfx + 0x460,          0x1E0,  GFXTAG_OK_BUTTON},
-    {gNamingScreenRWindow_Gfx,                  0x280,  GFXTAG_PAGE_SWAP_FRAME},
-    {gNamingScreenPageButton_Gfx + 0x20,        0x100,  GFXTAG_PAGE_SWAP_BUTTON},
-    {gNamingScreenROptions_Gfx,                 0x060,  GFXTAG_PAGE_SWAP_UPPER},
-    {gNamingScreenROptions_Gfx + 0xA0,          0x060,  GFXTAG_PAGE_SWAP_LOWER},
-    {gNamingScreenROptions_Gfx + 0x140,         0x060,  GFXTAG_PAGE_SWAP_OTHERS},
-    {gNamingScreenCursor_Gfx,                   0x080,  GFXTAG_CURSOR},
-    {gNamingScreenCursor_Gfx + 0xA0,            0x080,  GFXTAG_CURSOR_SQUISHED},
-    {gNamingScreenCursor_Gfx + 0x140,           0x080,  GFXTAG_CURSOR_FILLED},
-    {gNamingScreenInputArrow_Gfx,               0x020,  GFXTAG_INPUT_ARROW},
-    {gNamingScreenUnderscore_Gfx,               0x020,  GFXTAG_UNDERSCORE},
+    {gNamingScreenBackButton_Gfx,     0x1E0,  GFXTAG_BACK_BUTTON},
+    {gNamingScreenOKButton_Gfx,       0x1E0,  GFXTAG_OK_BUTTON},
+    {gNamingScreenPageSwapFrame_Gfx,  0x280,  GFXTAG_PAGE_SWAP_FRAME},
+    {gNamingScreenPageSwapButton_Gfx, 0x100,  GFXTAG_PAGE_SWAP_BUTTON},
+    {gNamingScreenPageSwapUpper_Gfx,  0x060,  GFXTAG_PAGE_SWAP_UPPER},
+    {gNamingScreenPageSwapLower_Gfx,  0x060,  GFXTAG_PAGE_SWAP_LOWER},
+    {gNamingScreenPageSwapOthers_Gfx, 0x060,  GFXTAG_PAGE_SWAP_OTHERS},
+    {gNamingScreenCursor_Gfx,         0x080,  GFXTAG_CURSOR},
+    {gNamingScreenCursorSquished_Gfx, 0x080,  GFXTAG_CURSOR_SQUISHED},
+    {gNamingScreenCursorFilled_Gfx,   0x080,  GFXTAG_CURSOR_FILLED},
+    {gNamingScreenInputArrow_Gfx,     0x020,  GFXTAG_INPUT_ARROW},
+    {gNamingScreenUnderscore_Gfx,     0x020,  GFXTAG_UNDERSCORE},
     {}
 };
 
 static const struct SpritePalette sSpritePalettes[] =
 {
-    {gNamingScreenMenu_Pal,         PALTAG_PC_ICON},
-    {gNamingScreenMenu_Pal + 0x10,  PALTAG_PAGE_SWAP_UPPER},
-    {gNamingScreenMenu_Pal + 0x20,  PALTAG_PAGE_SWAP_LOWER},
-    {gNamingScreenMenu_Pal + 0x30,  PALTAG_PAGE_SWAP_OTHERS},
-    {gNamingScreenMenu_Pal + 0x40,  PALTAG_PAGE_SWAP},
-    {gNamingScreenMenu_Pal + 0x50,  PALTAG_CURSOR},
-    {gNamingScreenMenu_Pal + 0x40,  PALTAG_BACK_BUTTON},
-    {gNamingScreenMenu_Pal + 0x40,  PALTAG_OK_BUTTON},
+    {gNamingScreenMenu_Pal[0], PALTAG_MENU},
+    {gNamingScreenMenu_Pal[1], PALTAG_PAGE_SWAP_UPPER},
+    {gNamingScreenMenu_Pal[2], PALTAG_PAGE_SWAP_LOWER},
+    {gNamingScreenMenu_Pal[3], PALTAG_PAGE_SWAP_OTHERS},
+    {gNamingScreenMenu_Pal[4], PALTAG_PAGE_SWAP},
+    {gNamingScreenMenu_Pal[5], PALTAG_CURSOR},
+    {gNamingScreenMenu_Pal[4], PALTAG_BACK_BUTTON},
+    {gNamingScreenMenu_Pal[4], PALTAG_OK_BUTTON},
     {}
 };