diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png
index 57c434194..52f76b6fa 100644
Binary files a/graphics/naming_screen/back_button.png and b/graphics/naming_screen/back_button.png differ
diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png
index e34896cb9..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
index bf1049e89..efb5e1101 100644
Binary files a/graphics/naming_screen/cursor_filled.png 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
index 45197320d..5126fccca 100644
Binary files a/graphics/naming_screen/cursor_squished.png 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 dd3f2a671..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/pc_icon.pal b/graphics/naming_screen/menu.pal
similarity index 100%
rename from graphics/naming_screen/pc_icon.pal
rename to graphics/naming_screen/menu.pal
diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png
index e7c4374c7..5bdf0a3ee 100644
Binary files a/graphics/naming_screen/menu.png and b/graphics/naming_screen/menu.png differ
diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png
index 51acd15d1..f8dafbf97 100644
Binary files a/graphics/naming_screen/ok_button.png and b/graphics/naming_screen/ok_button.png differ
diff --git a/graphics/naming_screen/page_swap_button.png b/graphics/naming_screen/page_swap_button.png
index 6c8fa888d..2e5cabed0 100644
Binary files a/graphics/naming_screen/page_swap_button.png 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
index 1e8f40983..bc3ff122b 100644
Binary files a/graphics/naming_screen/page_swap_frame.png and b/graphics/naming_screen/page_swap_frame.png differ
diff --git a/graphics/naming_screen/page_swap_lower.png b/graphics/naming_screen/page_swap_lower.png
index 741c5e589..5747c6265 100644
Binary files a/graphics/naming_screen/page_swap_lower.png and b/graphics/naming_screen/page_swap_lower.png differ
diff --git a/graphics/naming_screen/page_swap_others.png b/graphics/naming_screen/page_swap_others.png
index 32afa5282..8b5f55ce3 100644
Binary files a/graphics/naming_screen/page_swap_others.png and b/graphics/naming_screen/page_swap_others.png differ
diff --git a/graphics/naming_screen/page_swap_upper.png b/graphics/naming_screen/page_swap_upper.png
index 68f0637b4..35ff51d20 100644
Binary files a/graphics/naming_screen/page_swap_upper.png 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
index a24d40836..1f4c65a4e 100644
Binary files a/graphics/naming_screen/pc_icon_off.png and b/graphics/naming_screen/pc_icon_off.png differ
diff --git a/graphics/naming_screen/pc_icon_on.png b/graphics/naming_screen/pc_icon_on.png
index 1985816c3..8b9a2021e 100644
Binary files a/graphics/naming_screen/pc_icon_on.png and b/graphics/naming_screen/pc_icon_on.png differ
diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png
index 5d631ce99..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 7ac567281..d2f5ab5c6 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -29,6 +29,7 @@ BATTLETERRAINGFXDIR := graphics/battle_terrain
 BERRYPOUCHGFXDIR := graphics/berry_pouch
 HALLOFFAMEGFXDIR := graphics/hall_of_fame
 MAPPREVIEWGFXDIR := graphics/map_preview
+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
@@ -654,3 +655,12 @@ $(MAPPREVIEWGFXDIR)/victory_road/tiles.4bpp: %.4bpp: %.png
 
 $(MAPPREVIEWGFXDIR)/viridian_forest/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 389
+
+$(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 63da53ca7..f26373307 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4909,7 +4909,7 @@ extern const u32 gNamingScreenKeyboardSymbols_Tilemap[];
 extern const u32 gNamingScreenMenu_Gfx[];
 extern const u16 gNamingScreenRival_Pal[];
 extern const u16 gNamingScreenKeyboard_Pal[];
-extern const u16 gNamingScreenInterface_Pal[6][16];
+extern const u16 gNamingScreenMenu_Pal[6][16];
 extern const u16 gNamingScreenBackButton_Gfx[];
 extern const u16 gNamingScreenOKButton_Gfx[];
 extern const u16 gNamingScreenPageSwapFrame_Gfx[];
diff --git a/src/graphics.c b/src/graphics.c
index a00c0525d..b7694f158 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1183,9 +1183,9 @@ const u32 gUnknown_8E97EC4[] = INCBIN_U32("graphics/interface/learn_move.bin.lz"
 
 const u16 gNamingScreenKeyboard_Pal[] = INCBIN_U16("graphics/naming_screen/keyboard.gbapal");
 const u16 gNamingScreenRival_Pal[]    = INCBIN_U16("graphics/naming_screen/rival.gbapal");
-const u16 gNamingScreenInterface_Pal[6][16] =
+const u16 gNamingScreenMenu_Pal[6][16] =
 {
-    INCBIN_U16("graphics/naming_screen/pc_icon.gbapal"),
+    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"),
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 2e5bc08d5..57560c3d7 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -58,10 +58,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,
@@ -782,7 +782,7 @@ static bool8 MainState_WaitPageSwap(void)
 
         sNamingScreen->state = STATE_HANDLE_INPUT;
         sNamingScreen->currentPage++;
-        sNamingScreen->currentPage %= 3;
+        sNamingScreen->currentPage %= KBPAGE_COUNT;
 
         if (onLastColumn)
         {
@@ -1872,7 +1872,7 @@ static void CreateHelperTasks(void)
 
 static void LoadPalettes(void)
 {
-    LoadPalette(gNamingScreenInterface_Pal, 0, sizeof(gNamingScreenInterface_Pal));
+    LoadPalette(gNamingScreenMenu_Pal, 0, sizeof(gNamingScreenMenu_Pal));
     LoadPalette(gNamingScreenKeyboard_Pal, 0xA0, 0x20);
     LoadPalette(stdpal_get(2), 0xB0, 0x20);
 }
@@ -2442,7 +2442,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,
@@ -2488,13 +2488,13 @@ static const struct SpriteSheet sSpriteSheets[] = {
 };
 
 static const struct SpritePalette sSpritePalettes[] = {
-    {gNamingScreenInterface_Pal[0], PALTAG_PC_ICON},
-    {gNamingScreenInterface_Pal[1], PALTAG_PAGE_SWAP_UPPER},
-    {gNamingScreenInterface_Pal[2], PALTAG_PAGE_SWAP_LOWER},
-    {gNamingScreenInterface_Pal[3], PALTAG_PAGE_SWAP_OTHERS},
-    {gNamingScreenInterface_Pal[4], PALTAG_PAGE_SWAP},
-    {gNamingScreenInterface_Pal[5], PALTAG_CURSOR},
-    {gNamingScreenInterface_Pal[4], PALTAG_BACK_BUTTON},
-    {gNamingScreenInterface_Pal[4], 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},
     {} // terminator
 };