diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png
new file mode 100644
index 0000000000..1fc77ba2ad
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd06cd3849a584bd192e7371cdf0f6a2f8a8bafafabbb5aa66334d96e7c98489
+size 347
diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 126ae36c89..3c4511fe36 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -1370,7 +1370,7 @@
 					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">
+                        <object type="button" name="session_panel_minimap_segleft4" hotkey="menu.game" 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,
diff --git a/binaries/data/mods/official/gui/test/functions_session_status_orb.js b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
index 4af8604984..db4d0791d9 100755
--- a/binaries/data/mods/official/gui/test/functions_session_status_orb.js
+++ b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
@@ -726,6 +726,7 @@ function UpdateStatusOrb()
 	// Update Supply/Garrison
 	GUIObject = getGUIObjectByName("session_panel_status_stat1");
 	GUIObject.caption = '';
+
 	if (selection[0].traits.garrison)
 	{
 		if (selection[0].traits.garrison.curr && selection[0].traits.garrison.max)
@@ -733,16 +734,16 @@ function UpdateStatusOrb()
 			GUIObject.caption += '[icon="icon_statistic_garrison"] [color="100 100 255"]' + selection[0].traits.garrison.curr + '/' + selection[0].traits.garrison.max + '[/color] ';
 		}
 	}
+
 	if (selection[0].traits.supply)
 	{
 		if (selection[0].traits.supply.curr && selection[0].traits.supply.max && selection[0].traits.supply.type)
 		{
-			GUIObject.caption += '[icon="icon_resource_' + selection[0].traits.supply.type + '"] [color="255 100 100"]';
 			// Special case for infinity.
 			if (selection[0].traits.supply.curr == "0" && selection[0].traits.supply.max == "0")
-				GUIObject.caption += '8 ';
+				GUIObject.caption += '[icon="icon_resource_' + selection[0].traits.supply.type + '"] [color="100 100 255"] [icon="infinity_icon"] [/color] ';
 			else
-				GUIObject.caption += selection[0].traits.supply.curr + '/' + selection[0].traits.supply.max;
+				GUIObject.caption += '[icon="icon_resource_' + selection[0].traits.supply.type + '"] [color="100 100 255"]' + selection[0].traits.supply.curr + '/' + selection[0].traits.supply.max + '[/color] ';
 		}
 	}
 
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index 314149ea22..2c6838468e 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -68,6 +68,7 @@
         <!-- Generic Icons / malte, 15th nov -->
         <icon name="0ad_icon" texture="0ad_icon" size="16 16" />
 	<icon name="bullet_icon" texture="bullet_icon" size="8 8" />
+	<icon name="infinity_icon" texture="infinity_icon" size="16 16" />
 
 <!-- Commented out until tooltips are implemented as documented.
         <tooltip name="session_tooltip"
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index b41e66bab4..66b5d95aaf 100755
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -4240,6 +4240,10 @@
                 <image texture="global/ui_gen_bullet-icon.png" size="0 0 100% 100%" texture-size="0 0 8 8" />
         </sprite>
 
+        <sprite name="0ad_icon">
+                <image texture="global/ui_gen_infinity-icon.png" size="0 0 100% 100%" texture-size="0 0 16 16" />
+        </sprite>
+
         <!--
         ==========================================
         MESSAGE BOX