diff --git a/src/k_menu.h b/src/k_menu.h
index a663c4a2f..caa7012d8 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -1201,6 +1201,7 @@ void M_DrawKickHandler(void);
 void M_DrawPlaybackMenu(void);
 
 // Options menus:
+void M_DrawOptionsCogs(void);
 void M_DrawOptionsMovingButton(void);	// for sick transitions...
 void M_DrawOptions(void);
 void M_DrawGenericOptions(void);
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index dea01d1d0..dff884702 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -2151,22 +2151,31 @@ void M_DrawCharacterSelect(void)
 	UINT8 priority = 0;
 	INT16 quadx, quady;
 	INT16 skin;
-	INT32 basex = optionsmenu.profile != NULL ? 64 : 0;
+	INT32 basex = 0;
 	boolean forceskin = (Playing() && K_CanChangeRules(true) == true) && (cv_forceskin.value != -1);
 
+	if (optionsmenu.profile)
+	{
+		basex = (64 + (menutransition.tics*32));
+		M_DrawOptionsCogs();
+	}
+
 	if (setup_numplayers > 0)
 	{
 		priority = setup_animcounter % setup_numplayers;
 	}
 
 	{
-		const int kLeft = 80;
+		const int kLeft = 76;
 		const int kTop = 6;
 		const int kButtonWidth = 16;
 		INT32 x = basex + kLeft;
 
-		K_drawButton((x += 18) * FRACUNIT, (kTop - 3) * FRACUNIT, 0, kp_button_r, M_MenuButtonPressed(pid, MBT_R));
-		V_DrawThinString((x += kButtonWidth), kTop, 0, "Info");
+		if (!optionsmenu.profile) // Does nothing on this screen
+		{
+			K_drawButton((x += 22) * FRACUNIT, (kTop - 3) * FRACUNIT, 0, kp_button_r, M_MenuButtonPressed(pid, MBT_R));
+			V_DrawThinString((x += kButtonWidth), kTop, 0, "Info");
+		}
 
 		K_drawButton((x += 58) * FRACUNIT, (kTop - 1) * FRACUNIT, 0, kp_button_c[1], M_MenuButtonPressed(pid, MBT_C));
 		V_DrawThinString((x += kButtonWidth), kTop, 0, "Default");
@@ -3730,7 +3739,7 @@ void M_DrawMPServerBrowser(void)
 // OPTIONS MENU
 
 // Draws the cogs and also the options background!
-static void M_DrawOptionsCogs(void)
+void M_DrawOptionsCogs(void)
 {
 	// the background isn't drawn outside of being in the main menu state.
 	if (gamestate == GS_MENU)
diff --git a/src/menus/play-char-select.c b/src/menus/play-char-select.c
index e3424d96d..0eb457ef9 100644
--- a/src/menus/play-char-select.c
+++ b/src/menus/play-char-select.c
@@ -22,10 +22,10 @@ menu_t PLAY_CharSelectDef = {
 	0,
 	PLAY_CharSelect,
 	0, 0,
-	0, 0,
+	SKINCOLOR_ULTRAMARINE, 0,
 	0,
 	NULL,
-	0, 0,
+	2, 5, // matches OPTIONS_EditProfileDef
 	M_DrawCharacterSelect,
 	M_CharacterSelectTick,
 	M_CharacterSelectInit,
@@ -1409,6 +1409,9 @@ void M_CharacterSelectTick(void)
 			M_MPConfirmCharacterSelection();
 		}
 	}
+
+	if (optionsmenu.profile)
+		M_OptionsTick();
 }
 
 boolean M_CharacterSelectQuit(void)