diff --git a/gui/themes/customtheme.zip b/gui/themes/customtheme.zip
index b4d7f665553..825fc3bae72 100644
Binary files a/gui/themes/customtheme.zip and b/gui/themes/customtheme.zip differ
diff --git a/gui/themes/customtheme/grid_layout.stx b/gui/themes/customtheme/grid_layout.stx
index 72f142600de..2b125cd753c 100644
--- a/gui/themes/customtheme/grid_layout.stx
+++ b/gui/themes/customtheme/grid_layout.stx
@@ -138,8 +138,83 @@
 				size = '220, 25'
 		/>
 	</globals>
-
 	<dialog name = 'Launcher' overlays = 'screen'>
+		<layout type = 'vertical' align = 'center' padding = '23, 23, 8, 40'>
+			<widget name = 'Logo'
+					width = '287'
+					height = '80'
+					rtl = 'no'
+			/>
+			<layout type = 'horizontal'  spacing = '5' padding = '10, 0, 0, 0'>
+				<widget name = 'SearchPic'
+						width = '16'
+						height = '17'
+						rtl = 'no'
+				/>
+				<widget name = 'Search'
+						width = '150'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'SearchClearButton'
+						height = 'Globals.Line.Height'
+						width = 'Globals.Line.Height'
+				/>
+				<space />
+				<widget name = 'Version'
+						width = '310'
+						height = 'Globals.Line.Height'
+						textalign = 'center'
+				/>
+				<space />
+				<space />
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'GameList'/>
+				<layout type = 'vertical' padding = '10, 0, 0, 0' align = 'stretch'>
+					<widget name = 'StartButton'
+							type = 'Button'
+					/>
+					<widget name = 'LoadGameButton'
+							type = 'Button'
+					/>
+					<space size = '10' />
+					<widget name = 'AddGameButton'
+							type = 'Button'
+					/>
+					<widget name = 'EditGameButton'
+							type = 'Button'
+					/>
+					<widget name = 'RemoveGameButton'
+							type = 'Button'
+					/>
+					<space size = '10' />
+					<widget name = 'OptionsButton'
+							type = 'Button'
+					/>
+					<widget name = 'AboutButton'
+							type = 'Button'
+					/>
+					<space size = '10' />
+					<widget name = 'QuitButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '2'>
+				<widget name = 'ListSwitch'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+				/>
+				<widget name = 'GridSwitch'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+				/>
+				<space />
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'LauncherGrid' overlays = 'screen'>
 		<layout type = 'vertical' align = 'center' padding = '23, 23, 8, 40'>
 			<widget name = 'Logo'
 					width = '287'
@@ -205,7 +280,7 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'Browser' overlays = 'Dialog.Launcher.IconArea' shading = 'dim'>
+	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '8, 8, 8, 8'>
 			<widget name = 'Headline'
 					height = 'Globals.Line.Height'
@@ -257,7 +332,7 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.IconArea' shading = 'dim'>
+	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget' type = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
@@ -1019,7 +1094,7 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.IconArea' shading = 'dim'>
+	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget' type = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
@@ -1905,7 +1980,7 @@
 	<dialog name = 'DropdownDialog' overlays = 'screen_center'>
 	</dialog>
 
-	<dialog name = 'UnknownGameDialog' overlays = 'Dialog.Launcher.IconArea' shading = 'dim'>
+	<dialog name = 'UnknownGameDialog' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '8, 8, 8, 0'>
 			<widget name = 'TextContainer'
 			/>
diff --git a/gui/themes/customtheme/grid_layout_lowres.stx b/gui/themes/customtheme/grid_layout_lowres.stx
index af6507c5cc9..527c2a6523c 100644
--- a/gui/themes/customtheme/grid_layout_lowres.stx
+++ b/gui/themes/customtheme/grid_layout_lowres.stx
@@ -131,8 +131,68 @@
 				size = '120, 15'
 		/>
 	</globals>
-
 	<dialog name = 'Launcher' overlays = 'screen'>
+		<layout type = 'vertical' align = 'center' padding = '4, 4, 2, 2' spacing = '2'>
+			<widget name = 'Version'
+					height = 'Globals.Line.Height'
+					textalign = 'center'
+			/>
+			<layout type = 'horizontal' spacing = '5' padding = '0, 0, 2, 2'>
+				<widget name = 'SearchDesc'
+						width = '50'
+						height = 'Globals.Line.Height'
+						textalign = 'end'
+				/>
+				<widget name = 'Search'
+						width = '150'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'SearchClearButton'
+						height = 'Globals.Line.Height'
+						width = 'Globals.Line.Height'
+				/>
+				<space />
+				<widget name = 'ListSwitch'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+				/>
+				<widget name = 'GridSwitch'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+				/>
+			</layout>
+			<widget name = 'GameList'/>
+			<layout type = 'horizontal' padding = '0, 0, 2, 0' spacing = '2'>
+				<widget name = 'LoadGameButton'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'AddGameButton'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'EditGameButton'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'RemoveGameButton'
+						height = 'Globals.Button.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '2'>
+				<widget name = 'QuitButton'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'AboutButton'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'OptionsButton'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'StartButton'
+						height = 'Globals.Button.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	<dialog name = 'LauncherGrid' overlays = 'screen'>
 		<layout type = 'vertical' align = 'center' padding = '4, 4, 2, 2' spacing = '2'>
 			<widget name = 'Version'
 					height = 'Globals.Line.Height'
@@ -239,7 +299,7 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.IconArea' shading = 'dim'>
+	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget' type = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '8, 8, 8, 8'>