diff --git a/binaries/data/mods/official/gui/test/3_session.xml b/binaries/data/mods/official/gui/test/3_session.xml
index 64ad7baf17..e51066a318 100755
--- a/binaries/data/mods/official/gui/test/3_session.xml
+++ b/binaries/data/mods/official/gui/test/3_session.xml
@@ -11,6 +11,9 @@
 <objects>
 
         <object type="empty" name="session_gui" hotkey="flipgui.toggle" size="0 0 100% 100%" z="1" hidden="true">
+//		<action on="Load"><![CDATA[
+//			setInterval(getObjectInfo, 50);
+//		]]></action>
 		<action on="Press"><![CDATA[
 			FlipGUI();
 		]]></action>
@@ -669,10 +672,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_1_x, crd_status_orb_command_1_y, crd_status_orb_command_1_x+crd_status_orb_command_1_width, crd_status_orb_command_1_y+crd_status_orb_command_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_1_x, -crd_status_orb_command_1_y-crd_status_orb_command_1_height, crd_status_orb_command_1_x+crd_status_orb_command_1_width, -crd_status_orb_command_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_1",
-//					"0 184 32 216", 
-//					"0 100%-216 32 100%-184");
                                 ]]></action>
 			</object>
 			<object type="button" name="session_panel_status_command_pri_2" style="portrait" textcolor="255 255 255" z="70" hidden="false">2
@@ -680,10 +679,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_2_x, crd_status_orb_command_2_y, crd_status_orb_command_2_x+crd_status_orb_command_2_width, crd_status_orb_command_2_y+crd_status_orb_command_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_2_x, -crd_status_orb_command_2_y-crd_status_orb_command_2_height, crd_status_orb_command_2_x+crd_status_orb_command_2_width, -crd_status_orb_command_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_2",
-//					"32 184 64 216", 
-//					"32 100%-216 64 100%-184");
                                 ]]></action>
 			</object>
 
@@ -692,10 +687,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_3_x, crd_status_orb_command_3_y, crd_status_orb_command_3_x+crd_status_orb_command_3_width, crd_status_orb_command_3_y+crd_status_orb_command_3_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_3_x, -crd_status_orb_command_3_y-crd_status_orb_command_3_height, crd_status_orb_command_3_x+crd_status_orb_command_3_width, -crd_status_orb_command_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_3",
-//					"65 184 97 216", 
-//					"65 100%-216 97 100%-184");
                                 ]]></action>
 			</object>
 
@@ -704,10 +695,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_4_x, crd_status_orb_command_4_y, crd_status_orb_command_4_x+crd_status_orb_command_4_width, crd_status_orb_command_4_y+crd_status_orb_command_4_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_4_x, -crd_status_orb_command_4_y-crd_status_orb_command_4_height, crd_status_orb_command_4_x+crd_status_orb_command_4_width, -crd_status_orb_command_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_4",
-//					"97 180 129 212", 
-//					"97 100%-212 129 100%-180");
                                 ]]></action>
 			</object>
 
@@ -716,10 +703,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_5_x, crd_status_orb_command_5_y, crd_status_orb_command_5_x+crd_status_orb_command_5_width, crd_status_orb_command_5_y+crd_status_orb_command_5_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_5_x, -crd_status_orb_command_5_y-crd_status_orb_command_5_height, crd_status_orb_command_5_x+crd_status_orb_command_5_width, -crd_status_orb_command_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_5",
-//					"128 168 160 200", 
-//					"128 100%-200 160 100%-168");
                                 ]]></action>
 			</object>
 
@@ -728,10 +711,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_6_x, crd_status_orb_command_6_y, crd_status_orb_command_6_x+crd_status_orb_command_6_width, crd_status_orb_command_6_y+crd_status_orb_command_6_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_6_x, -crd_status_orb_command_6_y-crd_status_orb_command_6_height, crd_status_orb_command_6_x+crd_status_orb_command_6_width, -crd_status_orb_command_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_6",
-//					"154 148 186 180", 
-//					"154 100%-180 186 100%-148");
                                 ]]></action>
 			</object>
 
@@ -740,10 +719,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_7_x, crd_status_orb_command_7_y, crd_status_orb_command_7_x+crd_status_orb_command_7_width, crd_status_orb_command_7_y+crd_status_orb_command_7_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_7_x, -crd_status_orb_command_7_y-crd_status_orb_command_7_height, crd_status_orb_command_7_x+crd_status_orb_command_7_width, -crd_status_orb_command_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_7",
-//					"172 121 204 153", 
-//					"172 100%-153 204 100%-121");
                                 ]]></action>
 			</object>
 
@@ -752,10 +727,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_8_x, crd_status_orb_command_8_y, crd_status_orb_command_8_x+crd_status_orb_command_8_width, crd_status_orb_command_8_y+crd_status_orb_command_8_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_8_x, -crd_status_orb_command_8_y-crd_status_orb_command_8_height, crd_status_orb_command_8_x+crd_status_orb_command_8_width, -crd_status_orb_command_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_8",
-//					"184 90 216 122", 
-//					"184 100%-122 216 100%-90");
                                 ]]></action>
 			</object>
 
@@ -764,10 +735,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_9_x, crd_status_orb_command_9_y, crd_status_orb_command_9_x+crd_status_orb_command_9_width, crd_status_orb_command_9_y+crd_status_orb_command_9_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_9_x, -crd_status_orb_command_9_y-crd_status_orb_command_9_height, crd_status_orb_command_9_x+crd_status_orb_command_9_width, -crd_status_orb_command_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_9",
-//					"183 57 215 89", 
-//					"183 100%-89 215 100%-57");
                                 ]]></action>
 			</object>
 
@@ -776,10 +743,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_10_x, crd_status_orb_command_10_y, crd_status_orb_command_10_x+crd_status_orb_command_10_width, crd_status_orb_command_10_y+crd_status_orb_command_10_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_10_x, -crd_status_orb_command_10_y-crd_status_orb_command_10_height, crd_status_orb_command_10_x+crd_status_orb_command_10_width, -crd_status_orb_command_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_10",
-//					"171 26 203 58", 
-//					"171 100%-58 203 100%-26");
                                 ]]></action>
 			</object>
 
@@ -788,10 +751,6 @@
 					AddSizeCoord(this.name,
 					crd_status_orb_command_11_x, crd_status_orb_command_11_y, crd_status_orb_command_11_x+crd_status_orb_command_11_width, crd_status_orb_command_11_y+crd_status_orb_command_11_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_11_x, -crd_status_orb_command_11_y-crd_status_orb_command_11_height, crd_status_orb_command_11_x+crd_status_orb_command_11_width, -crd_status_orb_command_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-
-//					AddSizeString("session_panel_status_command_pri_11",
-//					"150 0 182 32", 
-//					"150 100%-32 182 100%");
                                 ]]></action>
 			</object>
 
@@ -876,68 +835,68 @@
                 </object>
 
                 <!-- GROUP: TEAM TRAY -->
-                <object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60" hidden="false">
+                <object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60">
 			<action on="Press"><![CDATA[
 				GUIObjectToggle("session_team_tray");
 			]]></action>
 
-			<object type="button" name="session_team_tray_1" style="portrait" text-align="left" z="70" hidden="false">1
+			<object type="button" name="session_team_tray_1" style="portrait" text-align="left" z="70">1
                                 <action on="Load"><![CDATA[
 					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="button" name="session_team_tray_2" style="portrait" text-align="left" z="70" hidden="false">2
+			<object type="button" name="session_team_tray_2" style="portrait" text-align="left" z="70">2
                                 <action on="Load"><![CDATA[
 					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_3" style="portrait" text-align="left" z="70" hidden="false">3
+			<object type="button" name="session_team_tray_3" style="portrait" text-align="left" z="70">3
                                 <action on="Load"><![CDATA[
 					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="button" name="session_team_tray_4" style="portrait" text-align="left" z="70" hidden="false">4
+			<object type="button" name="session_team_tray_4" style="portrait" text-align="left" z="70">4
                                 <action on="Load"><![CDATA[
 					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_5" style="portrait" text-align="left" z="70" hidden="false">5
+			<object type="button" name="session_team_tray_5" style="portrait" text-align="left" z="70">5
                                 <action on="Load"><![CDATA[
 					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="button" name="session_team_tray_6" style="portrait" text-align="left" z="70" hidden="false">6
+			<object type="button" name="session_team_tray_6" style="portrait" text-align="left" z="70">6
                                 <action on="Load"><![CDATA[
 					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_7" style="portrait" text-align="left" z="70" hidden="false">7
+			<object type="button" name="session_team_tray_7" style="portrait" text-align="left" z="70">7
                                 <action on="Load"><![CDATA[
 					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="button" name="session_team_tray_8" style="portrait" text-align="left" z="70" hidden="false">8
+			<object type="button" name="session_team_tray_8" style="portrait" text-align="left" z="70">8
                                 <action on="Load"><![CDATA[
 					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_9" style="portrait" text-align="left" z="70" hidden="false">9
+			<object type="button" name="session_team_tray_9" style="portrait" text-align="left" z="70">9
                                 <action on="Load"><![CDATA[
 					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,
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index a835d94705..f7796b4918 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -80,6 +80,9 @@ function getObjectInfo()
 
 	// Modify any resources given/taken (later, we need to base this on a resource-changing event).
 	UpdateResourcePool();
+
+	// Update Team Tray (later, we need to base this on the player creating a group).
+	UpdateTeamTray();
 }
 
 // ====================================================================
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
index 43ea42cb97..52c2072ef5 100755
--- a/binaries/data/mods/official/gui/test/functions_session_team_tray.js
+++ b/binaries/data/mods/official/gui/test/functions_session_team_tray.js
@@ -54,3 +54,30 @@ function initTeamTray()
 	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;
 }
+
+// ====================================================================
+
+function UpdateTeamTray()
+{
+	// Enable a Team Tray icon if its group has been created.
+	if (groups[1].length > 0) getGUIObjectByName("session_team_tray_1").hidden = false;
+	else getGUIObjectByName("session_team_tray_1").hidden = true;
+	if (groups[2].length > 0) getGUIObjectByName("session_team_tray_2").hidden = false;
+	else getGUIObjectByName("session_team_tray_2").hidden = true;
+	if (groups[3].length > 0) getGUIObjectByName("session_team_tray_3").hidden = false;
+	else getGUIObjectByName("session_team_tray_3").hidden = true;
+	if (groups[4].length > 0) getGUIObjectByName("session_team_tray_4").hidden = false;
+	else getGUIObjectByName("session_team_tray_4").hidden = true;
+	if (groups[5].length > 0) getGUIObjectByName("session_team_tray_5").hidden = false;
+	else getGUIObjectByName("session_team_tray_5").hidden = true;
+	if (groups[6].length > 0) getGUIObjectByName("session_team_tray_6").hidden = false;
+	else getGUIObjectByName("session_team_tray_6").hidden = true;
+	if (groups[7].length > 0) getGUIObjectByName("session_team_tray_7").hidden = false;
+	else getGUIObjectByName("session_team_tray_7").hidden = true;
+	if (groups[8].length > 0) getGUIObjectByName("session_team_tray_8").hidden = false;
+	else getGUIObjectByName("session_team_tray_8").hidden = true;
+	if (groups[9].length > 0) getGUIObjectByName("session_team_tray_9").hidden = false;
+	else getGUIObjectByName("session_team_tray_9").hidden = true;
+}
+
+// ====================================================================
\ No newline at end of file