Index: binaries/data/mods/public/gui/page_credits.xml
===================================================================
--- binaries/data/mods/public/gui/page_credits.xml
+++ binaries/data/mods/public/gui/page_credits.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>credits/credits.xml</include>
-
-	<!-- Work around a render bug:
-		 Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_gamesetup_mp.xml
===================================================================
--- binaries/data/mods/public/gui/page_gamesetup_mp.xml
+++ binaries/data/mods/public/gui/page_gamesetup_mp.xml
@@ -4,12 +4,9 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>gamesetup_mp/gamesetup_mp.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_loading.xml
===================================================================
--- binaries/data/mods/public/gui/page_loading.xml
+++ binaries/data/mods/public/gui/page_loading.xml
@@ -4,6 +4,7 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
@@ -11,8 +12,4 @@
 	<include>loading/styles.xml</include>
 	<include>loading/sprites.xml</include>
 	<include>loading/loading.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_lobby.xml
===================================================================
--- binaries/data/mods/public/gui/page_lobby.xml
+++ binaries/data/mods/public/gui/page_lobby.xml
@@ -4,13 +4,10 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/styles.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>lobby/icons/</include>
 	<include>lobby/lobby.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_locale.xml
===================================================================
--- binaries/data/mods/public/gui/page_locale.xml
+++ binaries/data/mods/public/gui/page_locale.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>locale/locale.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_locale_advanced.xml
===================================================================
--- binaries/data/mods/public/gui/page_locale_advanced.xml
+++ binaries/data/mods/public/gui/page_locale_advanced.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>locale_advanced/locale_advanced.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_manual.xml
===================================================================
--- binaries/data/mods/public/gui/page_manual.xml
+++ binaries/data/mods/public/gui/page_manual.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>manual/manual.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_mapbrowser.xml
===================================================================
--- binaries/data/mods/public/gui/page_mapbrowser.xml
+++ binaries/data/mods/public/gui/page_mapbrowser.xml
@@ -4,13 +4,10 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
 	<include>maps/mapbrowser/MapBrowserPage.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_options.xml
===================================================================
--- binaries/data/mods/public/gui/page_options.xml
+++ binaries/data/mods/public/gui/page_options.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>options/options.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_pregame.xml
===================================================================
--- binaries/data/mods/public/gui/page_pregame.xml
+++ binaries/data/mods/public/gui/page_pregame.xml
@@ -4,6 +4,7 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
@@ -12,8 +13,4 @@
 	<include>pregame/sprites.xml</include>
 	<include>pregame/styles.xml</include>
 	<include>pregame/mainmenu.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_prelobby_entrance.xml
===================================================================
--- binaries/data/mods/public/gui/page_prelobby_entrance.xml
+++ binaries/data/mods/public/gui/page_prelobby_entrance.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>prelobby/entrance/entrance.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_prelobby_login.xml
===================================================================
--- binaries/data/mods/public/gui/page_prelobby_login.xml
+++ binaries/data/mods/public/gui/page_prelobby_login.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>prelobby/login/login.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_prelobby_register.xml
===================================================================
--- binaries/data/mods/public/gui/page_prelobby_register.xml
+++ binaries/data/mods/public/gui/page_prelobby_register.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>prelobby/register/register.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_session.xml
===================================================================
--- binaries/data/mods/public/gui/page_session.xml
+++ binaries/data/mods/public/gui/page_session.xml
@@ -6,6 +6,7 @@
 
 	<include>common/resources/</include>
 
+	<include>common/global.xml</include>
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
@@ -14,8 +15,4 @@
 	<include>session/sprites.xml</include>
 	<include>session/styles.xml</include>
 	<include>session/session.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_splashscreen.xml
===================================================================
--- binaries/data/mods/public/gui/page_splashscreen.xml
+++ binaries/data/mods/public/gui/page_splashscreen.xml
@@ -4,12 +4,9 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>splashscreen/setup.xml</include>
 	<include>splashscreen/splashscreen.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>
Index: binaries/data/mods/public/gui/page_summary.xml
===================================================================
--- binaries/data/mods/public/gui/page_summary.xml
+++ binaries/data/mods/public/gui/page_summary.xml
@@ -4,11 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/global.xml</include>
 	<include>common/sprites.xml</include>
 
 	<include>summary/summary.xml</include>
-
-	<!-- Work around a render bug:
-	     Needs to be drawn last, as it should overlay everything -->
-	<include>common/global.xml</include>
 </page>