diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index d37f920acb..2c159151c2 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -933,6 +933,8 @@
 		<object size="100%-80 100%-80 100%-5 100%-5">
 			<!-- TODO: We should disable this button if there are no idle workers. -->
 			<object type="button"
+				tooltip="Find idle worker"
+				tooltip_style="sessionToolTip"
 				hotkey="selection.idleworker"
 			>
 				<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
@@ -942,12 +944,14 @@
 				<action on="MouseLeftRelease">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"
 		>
 			<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>