Index: binaries/data/mods/public/gui/session/minimap_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/minimap_panel.xml
+++ binaries/data/mods/public/gui/session/minimap_panel.xml
@@ -5,28 +5,16 @@
 	type="image"
 	sprite="mapPanel"
 >
-	<!-- Idle Worker Button -->
-	<object size="100%-80 100%-80 100%-5 100%-5">
-		<object type="button"
-			name="idleWorkerButton"
-			tooltip_style="sessionToolTip"
-			hotkey="selection.idleworker"
-		>
-			<action on="Press">if (g_HasIdleWorker) findIdleUnit(g_WorkerTypes);</action>
-			<action on="MouseEnter">if (g_HasIdleWorker) Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle-highlight.png";</action>
-			<action on="MouseLeave">if (g_HasIdleWorker) Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle.png";</action>
-			<action on="MouseLeftPress">if (g_HasIdleWorker) Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle.png";</action>
-			<action on="MouseLeftRelease">if (g_HasIdleWorker) Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle-highlight.png";</action>
-		</object>
-	</object>
 	<!-- Minimap -->
-	<object name="minimap"
-		type="minimap" z="20"
-		size="8 8 100%-8 100%-8"
-	>
+	<object size="8 8 100%-8 100%-8" type="minimap" z="20">
 		<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
 	</object>
-	<!-- Overlays -->
-	<object name="minimapOverlay" size="4 4 100%-4 100%-4" type="image" sprite="stretched:session/minimap_circle_modern.png" ghost="true"/>
-	<object name="idleOverlay" z="100" size="100%-125 100%-125 100%-5 100%-5" type="image" sprite="stretched:session/minimap-idle.png" ghost="true"/>
+	<object size="4 4 100%-4 100%-4" type="image" sprite="stretched:session/minimap_circle_modern.png" ghost="true"/>
+
+	<!-- Idle Worker Button -->
+	<object size="100%-120 100%-120 100%-5 100%-5" type="button" name="idleWorkerButton"
+		style="IdleWorker" tooltip_style="sessionToolTip" hotkey="selection.idleworker"
+	>
+		<action on="Press">if (g_HasIdleWorker) findIdleUnit(g_WorkerTypes);</action>
+	</object>
 </object>
Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js
+++ binaries/data/mods/public/gui/session/session.js
@@ -183,6 +183,7 @@
  * Unit classes to be checked for the military-only-selection modifier and for the idle-warrior-hotkey.
  */
 var g_MilitaryTypes = ["Melee", "Ranged"];
+
 /**
  * Cache the idle worker status.
  */
@@ -790,15 +791,9 @@
 function updateIdleWorkerButton()
 {
 	g_HasIdleWorker = hasIdleWorker();
-
-	let idleWorkerButton = Engine.GetGUIObjectByName("idleOverlay");
-	let prefix = "stretched:session/";
-
-	if (!g_HasIdleWorker)
-		idleWorkerButton.sprite = prefix + "minimap-idle-disabled.png";
-	else if (idleWorkerButton.sprite != prefix + "minimap-idle-highlight.png")
-		idleWorkerButton.sprite = prefix + "minimap-idle.png";
+	Engine.GetGUIObjectByName("idleWorkerButton").enabled = g_HasIdleWorker;
 }
+
 function onSimulationUpdate()
 {
 	// Templates change depending on technologies and auras, so they have to be reloaded every turn.
Index: binaries/data/mods/public/gui/session/sprites.xml
===================================================================
--- binaries/data/mods/public/gui/session/sprites.xml
+++ binaries/data/mods/public/gui/session/sprites.xml
@@ -549,7 +549,7 @@
 	</sprite>
 
 	<!-- ================================  ================================ -->
-	<!-- Unit portrait -->
+	<!-- Unit Portrait -->
 	<!-- ================================  ================================ -->
 	<sprite name="snIconPortrait">
 		<image texture="session/icons/bkg/portrait_black.dds" size="0 0 100% 100%"/>
@@ -565,4 +565,28 @@
 		<image texture="session/icons/bkg/portrait_black.dds" size="0 0 100% 100%"/>
 	</sprite>
 
+	<!-- ================================  ================================ -->
+	<!-- Idle Worker Minimap Button -->
+	<!-- ================================  ================================ -->
+	<sprite name="IdleWorker">
+		<image
+			texture="session/minimap-idle.png"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
+	<sprite name="IdleWorkerHighlight">
+		<image
+			texture="session/minimap-idle-highlight.png"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
+	<sprite name="IdleWorkerDisabled">
+		<image
+			texture="session/minimap-idle-disabled.png"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
 </sprites>
Index: binaries/data/mods/public/gui/session/styles.xml
===================================================================
--- binaries/data/mods/public/gui/session/styles.xml
+++ binaries/data/mods/public/gui/session/styles.xml
@@ -215,6 +215,12 @@
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 
+	<style name="IdleWorker"
+		sprite="IdleWorker"
+		sprite_over="IdleWorkerHighlight"
+		sprite_disabled="IdleWorkerDisabled"
+	/>
+
 	<!-- ================================  ================================ -->
 	<!-- Tooltip Styles -->
 	<!-- ================================  ================================ -->