diff --git a/binaries/data/mods/public/gui/civinfo/civinfo.xml b/binaries/data/mods/public/gui/civinfo/civinfo.xml
index d299823769..5ca0f04e43 100644
--- a/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ b/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -82,7 +82,7 @@
 		
 		
 		<!-- Civ history display -->
-		<object size="25 65% 100%-25 100%-50">
+		<object size="25 65% 100%-25 100%-56">
 			<object type="image" sprite="bgInfoHeading" size="0 0 100% 35">
 				<object
 					name="civHistoryHeading"
@@ -111,7 +111,7 @@
 		<object
 			type="button"
 			style="StoneButton"
-			size="100%-150 100%-48 100%-24 100%-16"
+			size="100%-148 100%-52 100%-20 100%-20"
 		>Close
 			<action on="Press"><![CDATA[
 				Engine.PopGuiPage();
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
index 12b4ce7f66..5c7f38c4e6 100644
--- a/binaries/data/mods/public/gui/common/common_sprites.xml
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -307,7 +307,45 @@
 			texture_size="0 0 512 512"
 			size="4 4 100%-4 100%-4" 
 		/>
-		<!-- shading -->
+                
+                <!-- thin sides -->
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="20 16 100%-20 20"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="100%-20 20 100%-16 100%-20"
+		/>
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="20 100%-20 100%-20 100%-16"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="16 20 20 100%-20"
+		/>
+                
+		<!-- thin corners -->
+		<image
+			texture="global/border/line_corner_top_right.png"
+			texture_size="0 0 4 4"
+			size="100%-20 16 100%-16 20"
+		/>
+		<image	texture="global/border/line_corner_bottom_right.png"
+			texture_size="0 0 4 4"
+			size="100%-20 100%-20 100%-16 100%-16"
+		/>
+		<image	texture="global/border/line_corner_bottom_left.png"
+			texture_size="0 0 4 4"
+			size="16 100%-20 20 100%-16"
+		/>
+		<image	texture="global/border/line_corner_top_left.png"
+			texture_size="0 0 4 4"
+			size="16 16 20 20"
+		/>
+                
+                <!-- shading -->
 		<image
 			texture="global/shading/gradient_wide.png"
 			size="0 0 100% 100%"
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 59c70656e0..e1f119dc88 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -34,7 +34,7 @@
 		</object>
 
 		<!-- Map selection -->
-		<object size="16 64 250 100%-16">
+		<object size="20 64 250 100%-20">
 			<object name="mapTypeHeading" type="text" style="LeftLabelText" size="0 0 100% 30">Match Type:</object>
 			<object name="mapTypeSelection"
 				type="dropdown"
@@ -84,7 +84,7 @@
 			</object>
 		</object>
 
-		<object size="260 64 100%-16 100%-260" type="image" sprite="BackgroundIndentFillDark">
+		<object size="260 64 100%-20 100%-260" type="image" sprite="BackgroundIndentFillDark">
 			<object size="0 6 100% 30">
 				<object name="playerNameHeading" type="text" style="CenteredLabelText" size="100 0 250 100%">Player Name</object>
 				<object name="playerCivHeading" type="text" style="CenteredLabelText" size="250 0 400 100%">Civilization</object>
@@ -140,7 +140,7 @@
 		
 		
 		<!-- Chat window -->
-		<object name="chatPanel" size="260 100%-190 100%-16 100%-45" type="image" sprite="BackgroundIndentFillDark">
+		<object name="chatPanel" size="260 100%-190 100%-20 100%-58" type="image" sprite="BackgroundIndentFillDark">
 	
 			<object name="chatText" size="3 1 100%-1 100%-25" type="text" style="chatPanel"/>
 	
@@ -170,7 +170,7 @@
 			name="cancelGame"
 			type="button"
 			style="StoneButton"
-			size="100%-300 100%-48 100%-160 100%-16"
+			size="100%-304 100%-52 100%-164 100%-20"
 			tooltip_style="onscreenToolTip"
 			tooltip="Click this button to return to the main menu."
 		>Cancel
@@ -184,7 +184,7 @@
 			name="startGame"
 			type="button"
 			style="StoneButton"
-			size="100%-156 100%-48 100%-16 100%-16"
+			size="100%-160 100%-52 100%-20 100%-20"
 			tooltip_style="onscreenToolTip"
 			tooltip="Click this button to start a new game with the current settings."
 		>Start game!
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 3cfc916007..9e1f636bdb 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -60,13 +60,11 @@
                         z="20"
                 >
                         <action on="Press"><![CDATA[
-                                var btCaptions = ["Yes", "No"];
-                                var btCode = [exit, null];
-                                messageBox (400, 200, "Are you sure you want to quit [icon=iconProduct] A.D.?", "Confirmation", 0, btCaptions, btCode);
+                                // Exit without confirmation
+                                exit();
                         ]]></action>
 		</object>
 
-
 		<!--
 		==========================================
 		- MAIN MENU - USER REPORT
@@ -147,8 +145,6 @@ Status: $status.
 				<action on="Press">Engine.PushGuiPage("page_manual.xml", { "page": "userreport" });</action>
 			</object>
 		</object>
- 
-
              
 
 		<!--
@@ -263,7 +259,7 @@ Status: $status.
                                         <action on="Press"><![CDATA[
                                                 var btCaptions = ["Yes", "No"];
                                                 var btCode = [exit, null];
-                                                messageBox (400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
+                                                messageBox(400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
                                         ]]></action>
                                 </object>
                         </object>
@@ -356,8 +352,6 @@ Get involved at: wildfiregames.com/0ad
                 </object>
                 
                 
-                
-                
                 <!--
 		==========================================
 		- SUBMENU