diff --git a/source/cfg.c b/source/cfg.c
index e9441bd7..004cae6b 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -248,7 +248,7 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
 	THEME.info_g = 154;
 	THEME.info_b = 192;
 	THEME.clock_x = 0;
-	THEME.clock_y = -120;
+	THEME.clock_y = -128;
 	THEME.clockAlign = CFG_ALIGN_CENTRE;
 	THEME.sdcard_x = 160;
 	THEME.sdcard_y = 390;
diff --git a/source/fonts/clock.ttf b/source/fonts/clock.ttf
index c7215cc6..cc4dace1 100644
Binary files a/source/fonts/clock.ttf and b/source/fonts/clock.ttf differ
diff --git a/source/images/bg_options_settings.png b/source/images/bg_options_settings.png
index 55cd5ed3..fa8cc064 100644
Binary files a/source/images/bg_options_settings.png and b/source/images/bg_options_settings.png differ
diff --git a/source/images/page1.png b/source/images/page1.png
index 454c0e8b..baefdd30 100644
Binary files a/source/images/page1.png and b/source/images/page1.png differ
diff --git a/source/images/page1d.png b/source/images/page1d.png
index efc81ca5..b850cc15 100644
Binary files a/source/images/page1d.png and b/source/images/page1d.png differ
diff --git a/source/images/page2.png b/source/images/page2.png
index 396e6e10..13b5fda1 100644
Binary files a/source/images/page2.png and b/source/images/page2.png differ
diff --git a/source/images/page2d.png b/source/images/page2d.png
index 4a5bfa67..0e50df2b 100644
Binary files a/source/images/page2d.png and b/source/images/page2d.png differ
diff --git a/source/menu.cpp b/source/menu.cpp
index e0d4a8c3..6f826b94 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -2562,7 +2562,7 @@ static int MenuDiscList()
 	gameBrowser.SetPosition(THEME.selection_x, THEME.selection_y);
 	gameBrowser.SetAlignment(ALIGN_LEFT, ALIGN_CENTRE);
 
-    GuiText clockTime(theTime, 30, (GXColor){138, 138, 138, 255});
+    GuiText clockTime(theTime, 40, (GXColor){138, 138, 138, 255});
     clockTime.SetAlignment(THEME.clockAlign, ALIGN_BOTTOM);
     clockTime.SetPosition(THEME.clock_x, THEME.clock_y);
 	clockTime.SetFont(fontClock);
@@ -3453,7 +3453,7 @@ static int MenuSettings()
 	GuiImage page2dImg(&page2d);
 	GuiButton page2Btn(page2.GetWidth(), page2.GetHeight());
 	page2Btn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	page2Btn.SetPosition(-202, 242);
+	page2Btn.SetPosition(-202, 186);
 	page2Btn.SetImage(&page2dImg);
 	page2Btn.SetSoundOver(&btnSoundOver);
 	page2Btn.SetSoundClick(&btnClick);
@@ -3532,9 +3532,9 @@ static int MenuSettings()
 			w.Append(btnLogo);
 
 			mainWindow->Append(&w);
-			mainWindow->Append(&optionBrowser2);
 			mainWindow->Append(&page2Btn);
 			mainWindow->Append(&page1Btn);
+			mainWindow->Append(&optionBrowser2);
 
 			ResumeGui();
 		}
@@ -3542,6 +3542,7 @@ static int MenuSettings()
 		{
 			mainWindow->Append(&page1Btn);
 			mainWindow->Append(&page2Btn);
+			mainWindow->Append(&optionBrowser2);
 
 			sprintf(options2.name[0], "Password");
 			sprintf(options2.name[1], "Boot/Standard");
@@ -3715,9 +3716,9 @@ static int MenuSettings()
 							char entered[20] = "";
 							strncpy(entered, Settings.unlockCode, sizeof(entered));
 							int result = OnScreenKeyboard(entered, 20);
-							mainWindow->Append(&optionBrowser2);
 							mainWindow->Append(&page1Btn);
 							mainWindow->Append(&page2Btn);
+							mainWindow->Append(&optionBrowser2);
 							w.Append(&backBtn);
 							w.Append(&lockBtn);
 							if ( result == 1 )
@@ -3797,9 +3798,9 @@ static int MenuSettings()
 							w.Remove(&lockBtn);
 						char entered[20] = "";
 					int result = OnScreenKeyboard(entered, 20);
-							mainWindow->Append(&optionBrowser2);
 							mainWindow->Append(&page1Btn);
 							mainWindow->Append(&page2Btn);
+							mainWindow->Append(&optionBrowser2);
 							w.Append(&backBtn);
 							w.Append(&lockBtn);
 					if ( result == 1 )