diff --git a/binaries/data/mods/official/gui/test/1_init.xml b/binaries/data/mods/official/gui/test/1_init.xml
index 556399e0d7..6e9e972a0a 100755
--- a/binaries/data/mods/official/gui/test/1_init.xml
+++ b/binaries/data/mods/official/gui/test/1_init.xml
@@ -55,6 +55,12 @@
         <script file="gui/test/functions_session_status_orb.js"><![CDATA[
         ]]></script>
 
+        <script file="gui/test/functions_session_map_orb.js"><![CDATA[
+        ]]></script>
+
+        <script file="gui/test/functions_session_team_tray.js"><![CDATA[
+        ]]></script>
+
         <script file="gui/test/functions_session.js"><![CDATA[
                 initSession();
         ]]></script>
diff --git a/binaries/data/mods/official/gui/test/3_session.xml b/binaries/data/mods/official/gui/test/3_session.xml
index a8778f9178..6c52999dd7 100755
--- a/binaries/data/mods/official/gui/test/3_session.xml
+++ b/binaries/data/mods/official/gui/test/3_session.xml
@@ -533,89 +533,6 @@
                 <!-- / GROUP: RESOURCE BAR -->
                 </object>
 
-                <!-- GROUP: MAP ORB -->
-                <object type="empty" name="session_map_orb" hotkey="maporb.toggle" size="0 0 100% 100%" z="1" hidden="false">
-			<action on="Press"><![CDATA[
-				GUIObjectToggle("session_map_orb");
-			]]></action>
-
-			<object type="text" name="session_panel_minimap_bg" sprite="session_panel_minimap_bg" z="60" ghost="true" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-174 0%+2 100% 0%+176", 
-					"100%-174 100%-174 100% 100%-176");
-				]]></action>
-			</object>
-
-			<object type="minimap" name="session_panel_minimap" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-176 0 100% 176", 
-					"100%-176 100%-176 100% 100%");
-				]]></action>
-			</object>
-
-                        <object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-206 0%+2 100%-174 0%+38", 
-					"100%-206 100%-175 100%-174 100%-129");
-				]]></action>
-			</object>
-                        <object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-214 0%+45 100%-174 0%+89", 
-					"100%-214 100%-131 100%-174 100%-87");
-				]]></action>
-			</object>
-                        <object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-214 0%+86 100%-174 0%+130", 
-					"100%-214 100%-90 100%-174 100%-46");
-				]]></action>
-			</object>
-                        <object type="button" name="session_panel_minimap_segleft4" sprite="session_panel_minimap_segleft4" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-206 0%+127 100%-174 0%+163", 
-					"100%-206 100%-48 100%-174 100%-12");
-				]]></action>
-			</object>
-
-                        <object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-46 0%+173 100%-2 0%+213", 
-					"100%-46 100%-205 100%-2 100%-165");
-				]]></action>
-			</object>
-                        <object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-88 0%+173 100%-42 0%+213", 
-					"100%-88 100%-213 100%-42 100%");
-				]]></action>
-			</object>
-                        <object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-130 0%+173 100%-84 0%+213", 
-					"100%-130 100%-213 100%-84 100%");
-				]]></action>
-			</object>
-                        <object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" z="60" hidden="false">
-				<action on="Load"><![CDATA[
-					AddSizeString(this.name,
-					"100%-174 0%+173 100%-130 0%+213", 
-					"100%-174 100%-205 100%-130 100%-165");
-				]]></action>
-			</object>
-
-                <!-- / GROUP: MAP ORB -->
-                </object>
-
                 <!-- GROUP: STATUS ORB -->
                 <object type="empty" name="session_status_orb" hotkey="statusorb.toggle" size="0 0 100% 100%" z="1" hidden="true">
 			<action on="Press"><![CDATA[
@@ -839,147 +756,150 @@
                 <!-- / GROUP: STATUS ORB -->
                 </object>
 
+                <!-- GROUP: MAP ORB -->
+                <object type="empty" name="session_map_orb" hotkey="maporb.toggle" size="0 0 100% 100%" z="1" hidden="false">
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("session_map_orb");
+			]]></action>
+
+			<object type="minimap" name="session_panel_minimap" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_minimap_x, crd_map_orb_minimap_y, crd_map_orb_minimap_x+crd_map_orb_minimap_width, crd_map_orb_minimap_y+crd_map_orb_minimap_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_minimap_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_minimap_y, crd_map_orb_minimap_x+crd_map_orb_minimap_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_minimap_y+crd_map_orb_minimap_height, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+
+                        <object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" sprite-over="session_panel_minimap_segleft1-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segleft1_x, crd_map_orb_segleft1_y, crd_map_orb_segleft1_x+crd_map_orb_segleft1_width, crd_map_orb_segleft1_y+crd_map_orb_segleft1_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segleft1_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft1_y, crd_map_orb_segleft1_x+crd_map_orb_segleft1_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft1_y+crd_map_orb_segleft1_height, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" sprite-over="session_panel_minimap_segleft2-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segleft2_x, crd_map_orb_segleft2_y, crd_map_orb_segleft2_x+crd_map_orb_segleft2_width, crd_map_orb_segleft2_y+crd_map_orb_segleft2_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segleft2_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft2_y, crd_map_orb_segleft2_x+crd_map_orb_segleft2_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft2_y+crd_map_orb_segleft2_height, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" sprite-over="session_panel_minimap_segleft3-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segleft3_x, crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segleft3_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segleft4" sprite="session_panel_minimap_segleft4" sprite-over="session_panel_minimap_segleft4-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segleft4_x, crd_map_orb_segleft4_y, crd_map_orb_segleft4_x+crd_map_orb_segleft4_width, crd_map_orb_segleft4_y+crd_map_orb_segleft4_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segleft4_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft4_y, crd_map_orb_segleft4_x+crd_map_orb_segleft4_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft4_y+crd_map_orb_segleft4_height, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+
+                        <object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" sprite-over="session_panel_minimap_segbottom1-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segbottom1_x, crd_map_orb_segbottom1_y, crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width, crd_map_orb_segbottom1_y+crd_map_orb_segbottom1_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segbottom1_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom1_y-crd_map_orb_segbottom1_height, crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom1_y, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" sprite-over="session_panel_minimap_segbottom2-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segbottom2_x, crd_map_orb_segbottom2_y, crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width, crd_map_orb_segbottom2_y+crd_map_orb_segbottom2_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segbottom2_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom2_y-crd_map_orb_segbottom2_height, crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom2_y, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" sprite-over="session_panel_minimap_segbottom3-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segbottom3_x, crd_map_orb_segbottom3_y, crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width, crd_map_orb_segbottom3_y+crd_map_orb_segbottom3_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segbottom3_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom3_y-crd_map_orb_segbottom3_height, crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom3_y, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" sprite-over="session_panel_minimap_segbottom4-lit" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_map_orb_segbottom4_x, crd_map_orb_segbottom4_y, crd_map_orb_segbottom4_x+crd_map_orb_segbottom4_width, crd_map_orb_segbottom4_y+crd_map_orb_segbottom4_height, right_screen, top_screen, right_screen, top_screen,
+					crd_map_orb_segbottom4_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom4_y-crd_map_orb_segbottom4_height, crd_map_orb_segbottom4_x+crd_map_orb_segbottom4_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom4_y, right_screen, bottom_screen, right_screen, bottom_screen);
+				]]></action>
+			</object>
+
+                <!-- / GROUP: MAP ORB -->
+                </object>
+
                 <!-- GROUP: TEAM TRAY -->
-                <object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60" hidden="true">
+                <object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60" hidden="false">
 			<action on="Press"><![CDATA[
 				GUIObjectToggle("session_team_tray");
 			]]></action>
 
-			<object type="button" name="session_team_tray_1" style="portrait" textcolor="255 255 255" hidden="false">
+			<object type="button" name="session_team_tray_1" style="portrait" text-align="left" z="70" hidden="false">1
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_1",
-					"100%-32 200 100% 232", 
-					"100%-32 100%-488 100% 100%-456");
+					AddSizeCoord(this.name,
+					crd_team_tray_1_x, crd_team_tray_1_y, crd_team_tray_1_x+crd_team_tray_1_width, crd_team_tray_1_y+crd_team_tray_1_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_1_x, -crd_team_tray_1_y-crd_team_tray_1_height, crd_team_tray_1_x+crd_team_tray_1_width, -crd_team_tray_1_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-			<object type="text" name="session_team_tray_1_num" textcolor="255 255 255" ghost="true" hidden="false">1
+			<object type="button" name="session_team_tray_2" style="portrait" text-align="left" z="70" hidden="false">2
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_1_num",
-					"100%-20 200 100% 220", 
-					"100%-20 100%-488 100% 100%-468");
+					AddSizeCoord(this.name,
+					crd_team_tray_2_x, crd_team_tray_2_y, crd_team_tray_2_x+crd_team_tray_2_width, crd_team_tray_2_y+crd_team_tray_2_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_2_x, -crd_team_tray_2_y-crd_team_tray_2_height, crd_team_tray_2_x+crd_team_tray_2_width, -crd_team_tray_2_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-
-			<object type="button" name="session_team_tray_2" style="portrait" textcolor="255 255 255" hidden="false">
+			<object type="button" name="session_team_tray_3" style="portrait" text-align="left" z="70" hidden="false">3
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_2",
-					"100%-32 232 100% 264", 
-					"100%-32 100%-456 100% 100%-424");
+					AddSizeCoord(this.name,
+					crd_team_tray_3_x, crd_team_tray_3_y, crd_team_tray_3_x+crd_team_tray_3_width, crd_team_tray_3_y+crd_team_tray_3_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_3_x, -crd_team_tray_3_y-crd_team_tray_3_height, crd_team_tray_3_x+crd_team_tray_3_width, -crd_team_tray_3_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-			<object type="text" name="session_team_tray_2_num" textcolor="255 255 255" ghost="true" hidden="false">2
+			<object type="button" name="session_team_tray_4" style="portrait" text-align="left" z="70" hidden="false">4
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_2_num",
-					"100%-20 232 100% 252", 
-					"100%-20 100%-456 100% 100%-436");
+					AddSizeCoord(this.name,
+					crd_team_tray_4_x, crd_team_tray_4_y, crd_team_tray_4_x+crd_team_tray_4_width, crd_team_tray_4_y+crd_team_tray_4_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_4_x, -crd_team_tray_4_y-crd_team_tray_4_height, crd_team_tray_4_x+crd_team_tray_4_width, -crd_team_tray_4_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-
-			<object type="button" name="session_team_tray_3" style="portrait" textcolor="255 255 255" hidden="false">
+			<object type="button" name="session_team_tray_5" style="portrait" text-align="left" z="70" hidden="false">5
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_3",
-					"100%-32 264 100% 296", 
-					"100%-32 100%-424 100% 100%-392");
+					AddSizeCoord(this.name,
+					crd_team_tray_5_x, crd_team_tray_5_y, crd_team_tray_5_x+crd_team_tray_5_width, crd_team_tray_5_y+crd_team_tray_5_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_5_x, -crd_team_tray_5_y-crd_team_tray_5_height, crd_team_tray_5_x+crd_team_tray_5_width, -crd_team_tray_5_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-			<object type="text" name="session_team_tray_3_num" textcolor="255 255 255" ghost="true" hidden="false">3
+			<object type="button" name="session_team_tray_6" style="portrait" text-align="left" z="70" hidden="false">6
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_3_num",
-					"100%-20 264 100% 284", 
-					"100%-20 100%-424 100% 100%-304");
+					AddSizeCoord(this.name,
+					crd_team_tray_6_x, crd_team_tray_6_y, crd_team_tray_6_x+crd_team_tray_6_width, crd_team_tray_6_y+crd_team_tray_6_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_6_x, -crd_team_tray_6_y-crd_team_tray_6_height, crd_team_tray_6_x+crd_team_tray_6_width, -crd_team_tray_6_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-
-			<object type="button" name="session_team_tray_4" style="portrait" textcolor="255 255 255" hidden="false">
+			<object type="button" name="session_team_tray_7" style="portrait" text-align="left" z="70" hidden="false">7
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_4",
-					"100%-32 296 100% 328", 
-					"100%-32 100%-392 100% 100%-360");
+					AddSizeCoord(this.name,
+					crd_team_tray_7_x, crd_team_tray_7_y, crd_team_tray_7_x+crd_team_tray_7_width, crd_team_tray_7_y+crd_team_tray_7_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_7_x, -crd_team_tray_7_y-crd_team_tray_7_height, crd_team_tray_7_x+crd_team_tray_7_width, -crd_team_tray_7_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-			<object type="text" name="session_team_tray_4_num" textcolor="255 255 255" ghost="true" hidden="false">4
+			<object type="button" name="session_team_tray_8" style="portrait" text-align="left" z="70" hidden="false">8
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_4_num",
-					"100%-20 296 100% 316", 
-					"100%-20 100%-392 100% 100%-372");
+					AddSizeCoord(this.name,
+					crd_team_tray_8_x, crd_team_tray_8_y, crd_team_tray_8_x+crd_team_tray_8_width, crd_team_tray_8_y+crd_team_tray_8_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_8_x, -crd_team_tray_8_y-crd_team_tray_8_height, crd_team_tray_8_x+crd_team_tray_8_width, -crd_team_tray_8_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-
-			<object type="button" name="session_team_tray_5" style="portrait" textcolor="255 255 255" hidden="false">
+			<object type="button" name="session_team_tray_9" style="portrait" text-align="left" z="70" hidden="false">9
                                 <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_5",
-					"100%-32 328 100% 360", 
-					"100%-32 100%-360 100% 100%-328");
+					AddSizeCoord(this.name,
+					crd_team_tray_9_x, crd_team_tray_9_y, crd_team_tray_9_x+crd_team_tray_9_width, crd_team_tray_9_y+crd_team_tray_9_height, right_screen, top_screen, right_screen, top_screen,
+					crd_team_tray_9_x, -crd_team_tray_9_y-crd_team_tray_9_height, crd_team_tray_9_x+crd_team_tray_9_width, -crd_team_tray_9_y, right_screen, bottom_screen, right_screen, bottom_screen);
                                 ]]></action>
 			</object>
-			<object type="text" name="session_team_tray_5_num" textcolor="255 255 255" ghost="true" hidden="false">5
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_5_num",
-					"100%-20 328 100% 348", 
-					"100%-20 100%-360 100% 100%-340");
-                                ]]></action>
-			</object>
-
-			<object type="button" name="session_team_tray_6" style="portrait" textcolor="255 255 255" hidden="false">
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_6",
-					"100%-32 360 100% 392", 
-					"100%-32 100%-328 100% 100%-296");
-                                ]]></action>
-			</object>
-			<object type="text" name="session_team_tray_6_num" textcolor="255 255 255" ghost="true" hidden="false">6
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_6_num",
-					"100%-20 360 100% 380", 
-					"100%-20 100%-328 100% 100%-308");
-                                ]]></action>
-			</object>
-
-			<object type="button" name="session_team_tray_7" style="portrait" textcolor="255 255 255" hidden="false">
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_7",
-					"100%-32 392 100% 424", 
-					"100%-32 100%-296 100% 100%-264");
-                                ]]></action>
-			</object>
-			<object type="text" name="session_team_tray_7_num" textcolor="255 255 255" ghost="true" hidden="false">7
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_7_num",
-					"100%-20 392 100% 412", 
-					"100%-20 100%-296 100% 100%-276");
-                                ]]></action>
-			</object>
-
-			<object type="button" name="session_team_tray_8" style="portrait" textcolor="255 255 255" hidden="false">
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_8",
-					"100%-32 424 100% 456", 
-					"100%-32 100%-264 100% 100%-232");
-                                ]]></action>
-			</object>
-			<object type="text" name="session_team_tray_8_num" textcolor="255 255 255" ghost="true" hidden="false">8
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_8_num",
-					"100%-20 424 100% 444", 
-					"100%-20 100%-264 100% 100%-244");
-                                ]]></action>
-			</object>
-
-			<object type="button" name="session_team_tray_9" style="portrait" textcolor="255 255 255" hidden="false">
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_9",
-					"100%-32 456 100% 488", 
-					"100%-32 100%-232 100% 100%-200");
-                                ]]></action>
-			</object>
-			<object type="text" name="session_team_tray_9_num" textcolor="255 255 255" ghost="true" hidden="false">9
-                                <action on="Load"><![CDATA[
-					AddSizeString("session_team_tray_9_num",
-					"100%-20 456 100% 476", 
-					"100%-20 100%-232 100% 100%-212");
-                                ]]></action>
-			</object>
-
                 <!-- / GROUP: TRAY -->
                 </object>
 
diff --git a/binaries/data/mods/official/gui/test/4_manual.xml b/binaries/data/mods/official/gui/test/4_manual.xml
index 3173fd2794..311fb9addd 100755
--- a/binaries/data/mods/official/gui/test/4_manual.xml
+++ b/binaries/data/mods/official/gui/test/4_manual.xml
@@ -20,7 +20,7 @@
 			}
 		]]></action>
 
-        	<object type="text" name="manual_bkg" sprite="tooltip-background" size="50%-200 0%+50 50%+200 100%-50" font="prospero16" textcolor="255 255 255" hidden="false" ghost="true">
+        	<object type="text" name="manual_bkg" sprite="tooltip-background" size="50%-200 0%+50 50%+200 100%-50" font="prospero16" textcolor="255 255 255" z="100" hidden="false" ghost="true">
 			<action on="Tick"><![CDATA[
 				if (selection.length && !( getGUIObjectByName( "manual_gui" ).hidden ))
 				{
@@ -29,15 +29,15 @@
 			]]></action>
 		</object>
 
-   	    	<object type="button" name="manual_portrait" style="portrait" size="50%-192 0%+80 50%-128 0%+144" ghost="true"/>
+   	    	<object type="button" name="manual_portrait" style="portrait" size="50%-192 0%+80 50%-128 0%+144" z="100" ghost="true"/>
 
-		<object type="text" name="manual_name" sprite="tooltip-background" size="50%-195 0%+149 50%+195 100%-205" font="prospero14" textcolor="255 255 255" ghost="true"/>
+		<object type="text" name="manual_name" sprite="tooltip-background" size="50%-195 0%+149 50%+195 100%-205" font="prospero14" textcolor="255 255 255" z="100" ghost="true"/>
 
 		<!-- Gee needs to implement text clipping, so long text doesn't get clipped to these scroll windows yet. Scroll bars also don't block world input yet. -->
-		<object type="text" name="manual_rollover" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="tooltip-background" size="50%-126 0%+80 50%+195 0%+144" font="prospero16" textcolor="255 255 255" ghost="false"/>
-   	    	<object type="text" name="manual_history" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="tooltip-background" size="50%-195 100%-200 50%+195 100%-55" font="prospero16" textcolor="255 255 255" ghost="false"/>
+		<object type="text" name="manual_rollover" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="tooltip-background" size="50%-126 0%+80 50%+195 0%+144" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
+   	    	<object type="text" name="manual_history" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="tooltip-background" size="50%-195 100%-200 50%+195 100%-55" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
 
-		<object type="button" name="manual_exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="50%+184 0%+50 50%+200 0%+66" z="1000" ghost="false" hidden="false">
+		<object type="button" name="manual_exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="50%+184 0%+50 50%+200 0%+66" ghost="false" z="100" hidden="false">
 			<action on="Press"><![CDATA[
 				// Close manual.
 				ManualGUI = getGUIObjectByName("manual_gui");
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index 660bf5bf39..a835d94705 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -4,6 +4,8 @@ function initSession()
 	initGroupPane();
 	initResourcePool();
 	initStatusOrb();
+	initMapOrb();
+	initTeamTray();
 }
 
 // ====================================================================
diff --git a/binaries/data/mods/official/gui/test/functions_session_coord.js b/binaries/data/mods/official/gui/test/functions_session_coord.js
index fdce686464..4b418d6b51 100755
--- a/binaries/data/mods/official/gui/test/functions_session_coord.js
+++ b/binaries/data/mods/official/gui/test/functions_session_coord.js
@@ -109,15 +109,19 @@ function FlipGUI(NewGUIType)
 					switch (SizeCoord[FlipGUILoop].name){
 						case "session_panel_minimap_segbottom1":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
 						break;
 						case "session_panel_minimap_segbottom2":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
 						break;
 						case "session_panel_minimap_segbottom3":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
 						break;
 						case "session_panel_minimap_segbottom4":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
 						break;
 						case "session_panel_status_bg":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg-top";
@@ -131,15 +135,19 @@ function FlipGUI(NewGUIType)
 					switch (SizeCoord[FlipGUILoop].name){
 						case "session_panel_minimap_segbottom1":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop1";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop1-lit";
 						break;
 						case "session_panel_minimap_segbottom2":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop2";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop2-lit";
 						break;
 						case "session_panel_minimap_segbottom3":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop3";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop3-lit";
 						break;
 						case "session_panel_minimap_segbottom4":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop4";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop4-lit";
 						break;
 						case "session_panel_status_bg":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg-bottom";
diff --git a/binaries/data/mods/official/gui/test/functions_session_map_orb.js b/binaries/data/mods/official/gui/test/functions_session_map_orb.js
new file mode 100755
index 0000000000..a40126622a
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_session_map_orb.js
@@ -0,0 +1,68 @@
+function initMapOrb()
+{
+	// Mini Map.
+	crd_map_orb_minimap_width = 176;
+	crd_map_orb_minimap_height = crd_map_orb_minimap_width;
+	crd_map_orb_minimap_x = -crd_map_orb_minimap_width;
+	crd_map_orb_minimap_y = 0;
+
+	// Map Button Seg Left 1.
+	crd_map_orb_segleft1_span_x = 2;
+	crd_map_orb_segleft1_span_y = -1;
+	crd_map_orb_segleft1_width = 32;
+	crd_map_orb_segleft1_height = 46;
+	crd_map_orb_segleft1_x = -crd_map_orb_minimap_width-crd_map_orb_segleft1_width+crd_map_orb_segleft1_span_x;
+	crd_map_orb_segleft1_y = 0;
+
+	// Map Button Seg Left 2.
+	crd_map_orb_segleft2_span_y = -1;
+	crd_map_orb_segleft2_width = 40;
+	crd_map_orb_segleft2_height = 44;
+	crd_map_orb_segleft2_x = -crd_map_orb_minimap_width-crd_map_orb_segleft2_width+crd_map_orb_segleft1_span_x;
+	crd_map_orb_segleft2_y = crd_map_orb_segleft1_y+crd_map_orb_segleft1_height+crd_map_orb_segleft1_span_y;
+
+	// Map Button Seg Left 3.
+	crd_map_orb_segleft3_span_y = -1;
+	crd_map_orb_segleft3_width = crd_map_orb_segleft2_width;
+	crd_map_orb_segleft3_height = crd_map_orb_segleft2_height;
+	crd_map_orb_segleft3_x = -crd_map_orb_minimap_width-crd_map_orb_segleft3_width+crd_map_orb_segleft1_span_x;
+	crd_map_orb_segleft3_y = crd_map_orb_segleft2_y+crd_map_orb_segleft2_height+crd_map_orb_segleft2_span_y;
+
+	// Map Button Seg Left 4.
+	crd_map_orb_segleft4_width = crd_map_orb_segleft1_width;
+	crd_map_orb_segleft4_height = crd_map_orb_segleft1_height;
+	crd_map_orb_segleft4_x = -crd_map_orb_minimap_width-crd_map_orb_segleft4_width+crd_map_orb_segleft1_span_x;
+	crd_map_orb_segleft4_y = crd_map_orb_segleft3_y+crd_map_orb_segleft3_height+crd_map_orb_segleft3_span_y;
+
+	// Map Button Seg Bottom 1.
+	crd_map_orb_segbottom1_span_x = 0;
+	crd_map_orb_segbottom1_span_y = -3;
+	crd_map_orb_segbottom1_width = 46;
+	crd_map_orb_segbottom1_height = 32;
+	crd_map_orb_segbottom1_x = -crd_map_orb_minimap_width+crd_map_orb_segbottom1_span_x;
+	crd_map_orb_segbottom1_y = crd_map_orb_minimap_y+crd_map_orb_minimap_height+crd_map_orb_segbottom1_span_y;
+
+	// Map Button Seg Bottom 2.
+	crd_map_orb_segbottom2_span_x = -1;
+	crd_map_orb_segbottom2_span_y = -3;
+	crd_map_orb_segbottom2_width = 44;
+	crd_map_orb_segbottom2_height = 40;
+	crd_map_orb_segbottom2_x = crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width+crd_map_orb_segbottom2_span_x;
+	crd_map_orb_segbottom2_y = crd_map_orb_minimap_y+crd_map_orb_minimap_height+crd_map_orb_segbottom2_span_y;
+
+	// Map Button Seg Bottom 3.
+	crd_map_orb_segbottom3_span_x = -1;
+	crd_map_orb_segbottom3_span_y = -3;
+	crd_map_orb_segbottom3_width = crd_map_orb_segbottom2_width;
+	crd_map_orb_segbottom3_height = crd_map_orb_segbottom2_height;
+	crd_map_orb_segbottom3_x = crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width+crd_map_orb_segbottom3_span_x;
+	crd_map_orb_segbottom3_y = crd_map_orb_minimap_y+crd_map_orb_minimap_height+crd_map_orb_segbottom3_span_y;
+
+	// Map Button Seg Bottom 4.
+	crd_map_orb_segbottom4_span_x = -1;
+	crd_map_orb_segbottom4_span_y = -3;
+	crd_map_orb_segbottom4_width = crd_map_orb_segbottom1_width;
+	crd_map_orb_segbottom4_height = crd_map_orb_segbottom1_height;
+	crd_map_orb_segbottom4_x = crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width+crd_map_orb_segbottom4_span_x;
+	crd_map_orb_segbottom4_y = crd_map_orb_minimap_y+crd_map_orb_minimap_height+crd_map_orb_segbottom4_span_y;
+}
diff --git a/binaries/data/mods/official/gui/test/functions_session_team_tray.js b/binaries/data/mods/official/gui/test/functions_session_team_tray.js
new file mode 100755
index 0000000000..43ea42cb97
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_session_team_tray.js
@@ -0,0 +1,56 @@
+function initTeamTray()
+{
+	// Team Tray Button 1.
+	crd_team_tray_1_width = crd_portrait_sml_width;
+	crd_team_tray_1_height = crd_portrait_sml_height;
+	crd_team_tray_1_x = -(crd_team_tray_1_width/1.5);
+	crd_team_tray_1_y = crd_map_orb_minimap_height+(crd_team_tray_1_height/2);
+
+	// Team Tray Button 2.
+	crd_team_tray_2_width = crd_team_tray_1_width;
+	crd_team_tray_2_height = crd_team_tray_1_height;
+	crd_team_tray_2_x = crd_team_tray_1_x;
+	crd_team_tray_2_y = crd_team_tray_1_y+crd_team_tray_2_height;
+
+	// Team Tray Button 3.
+	crd_team_tray_3_width = crd_team_tray_1_width;
+	crd_team_tray_3_height = crd_team_tray_1_height;
+	crd_team_tray_3_x = crd_team_tray_1_x;
+	crd_team_tray_3_y = crd_team_tray_2_y+crd_team_tray_3_height;
+
+	// Team Tray Button 4.
+	crd_team_tray_4_width = crd_team_tray_1_width;
+	crd_team_tray_4_height = crd_team_tray_1_height;
+	crd_team_tray_4_x = crd_team_tray_1_x;
+	crd_team_tray_4_y = crd_team_tray_3_y+crd_team_tray_4_height;
+
+	// Team Tray Button 5.
+	crd_team_tray_5_width = crd_team_tray_1_width;
+	crd_team_tray_5_height = crd_team_tray_1_height;
+	crd_team_tray_5_x = crd_team_tray_1_x;
+	crd_team_tray_5_y = crd_team_tray_4_y+crd_team_tray_5_height;
+
+	// Team Tray Button 6.
+	crd_team_tray_6_width = crd_team_tray_1_width;
+	crd_team_tray_6_height = crd_team_tray_1_height;
+	crd_team_tray_6_x = crd_team_tray_1_x;
+	crd_team_tray_6_y = crd_team_tray_5_y+crd_team_tray_6_height;
+
+	// Team Tray Button 7.
+	crd_team_tray_7_width = crd_team_tray_1_width;
+	crd_team_tray_7_height = crd_team_tray_1_height;
+	crd_team_tray_7_x = crd_team_tray_1_x;
+	crd_team_tray_7_y = crd_team_tray_6_y+crd_team_tray_7_height;
+
+	// Team Tray Button 8.
+	crd_team_tray_8_width = crd_team_tray_1_width;
+	crd_team_tray_8_height = crd_team_tray_1_height;
+	crd_team_tray_8_x = crd_team_tray_1_x;
+	crd_team_tray_8_y = crd_team_tray_7_y+crd_team_tray_8_height;
+
+	// Team Tray Button 9.
+	crd_team_tray_9_width = crd_team_tray_1_width;
+	crd_team_tray_9_height = crd_team_tray_1_height;
+	crd_team_tray_9_x = crd_team_tray_1_x;
+	crd_team_tray_9_y = crd_team_tray_8_y+crd_team_tray_9_height;
+}
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index eea5c25fe0..58a035436a 100755
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -171,59 +171,107 @@
                 -->
 
                        <sprite name="session_panel_minimap_bg">
-                        <image texture="ui_session_panel_minimap_bg.png" texture-size="0 0 256 256" size="0 0 176 176" />
+                        <image texture="ui_session_panel_minimap_bg.png" texture-size="0 0 256 256" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_dummy">
-                        <image texture="ui_session_panel_minimap_dummy.png" texture-size="0 0 256 256" size="0 0 172 172" />
+                        <image texture="ui_session_panel_minimap_dummy.png" texture-size="0 0 256 256" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft1">
-                        <image texture="ui_session_panel_minimap_segleft1.png" texture-size="0 0 64 64" size="0 0 32 46" />
+                        <image texture="ui_session_panel_minimap_segleft1.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft2">
-                        <image texture="ui_session_panel_minimap_segleft2.png" texture-size="0 0 64 64" size="0 0 40 44" />
+                        <image texture="ui_session_panel_minimap_segleft2.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft3">
-                        <image texture="ui_session_panel_minimap_segleft3.png" texture-size="0 0 64 64" size="0 0 40 44" />
+                        <image texture="ui_session_panel_minimap_segleft3.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft4">
-                        <image texture="ui_session_panel_minimap_segleft4.png" texture-size="0 0 64 64" size="0 0 32 46" />
+                        <image texture="ui_session_panel_minimap_segleft4.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom1">
-                        <image texture="ui_session_panel_minimap_segbottom1.png" texture-size="0 0 64 64" size="0 0 44 40" />
+                        <image texture="ui_session_panel_minimap_segbottom1.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom2">
-                        <image texture="ui_session_panel_minimap_segbottom2.png" texture-size="0 0 64 64" size="0 0 46 46" />
+                        <image texture="ui_session_panel_minimap_segbottom2.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom3">
-                        <image texture="ui_session_panel_minimap_segbottom3.png" texture-size="0 0 64 64" size="0 0 46 46" />
+                        <image texture="ui_session_panel_minimap_segbottom3.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom4">
-                        <image texture="ui_session_panel_minimap_segbottom4.png" texture-size="0 0 64 64" size="0 0 44 40" />
+                        <image texture="ui_session_panel_minimap_segbottom4.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop1">
-                        <image texture="ui_session_panel_minimap_segtop1.png" texture-size="0 0 64 64" size="0 0 44 40" />
+                        <image texture="ui_session_panel_minimap_segtop1.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop2">
-                        <image texture="ui_session_panel_minimap_segtop2.png" texture-size="0 0 64 64" size="0 0 46 46" />
+                        <image texture="ui_session_panel_minimap_segtop2.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop3">
-                        <image texture="ui_session_panel_minimap_segtop3.png" texture-size="0 0 64 64" size="0 0 46 46" />
+                        <image texture="ui_session_panel_minimap_segtop3.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop4">
-                        <image texture="ui_session_panel_minimap_segtop4.png" texture-size="0 0 64 64" size="0 0 44 40" />
+                        <image texture="ui_session_panel_minimap_segtop4.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segleft1-lit">
+                        <image texture="ui_session_panel_minimap_segleft1-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segleft2-lit">
+                        <image texture="ui_session_panel_minimap_segleft2-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segleft3-lit">
+                        <image texture="ui_session_panel_minimap_segleft3-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segleft4-lit">
+                        <image texture="ui_session_panel_minimap_segleft4-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segbottom1-lit">
+                        <image texture="ui_session_panel_minimap_segbottom1-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segbottom2-lit">
+                        <image texture="ui_session_panel_minimap_segbottom2-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segbottom3-lit">
+                        <image texture="ui_session_panel_minimap_segbottom3-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segbottom4-lit">
+                        <image texture="ui_session_panel_minimap_segbottom4-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segtop1-lit">
+                        <image texture="ui_session_panel_minimap_segtop1-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segtop2-lit">
+                        <image texture="ui_session_panel_minimap_segtop2-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segtop3-lit">
+                        <image texture="ui_session_panel_minimap_segtop3-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                </sprite>
+
+                <sprite name="session_panel_minimap_segtop4-lit">
+                        <image texture="ui_session_panel_minimap_segtop4-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <!--
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index f422fe81b4..e85ad9f9d3 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -46,11 +46,13 @@
 		sprite-background=""
 		sprite-bar="green-bar"
 		tooltip-style="session-tooltip"
+		ghost="true"
 	/>
 
 	<style name="up_bar"
 		sprite-background=""
 		sprite-bar="yellow-bar"
 		tooltip-style="session-tooltip"
+		ghost="true"
 	/>
 </styles>