Index: selection_details.js
===================================================================
--- selection_details.js
+++ selection_details.js
@@ -138,6 +138,7 @@
 		let healthSize = unitHealthBar.size;
 		healthSize.rright = 100 * Math.max(0, Math.min(1, entState.hitpoints / entState.maxHitpoints));
 		unitHealthBar.size = healthSize;
+
 		Engine.GetGUIObjectByName("healthStats").caption = sprintf(translate("%(hitpoints)s / %(maxHitpoints)s"), {
 			"hitpoints": Math.ceil(entState.hitpoints),
 			"maxHitpoints": Math.ceil(entState.maxHitpoints)
@@ -186,7 +187,7 @@
 
 		let showSmallCapture = showResource && showHealth;
 		Engine.GetGUIObjectByName("captureStats").caption = showSmallCapture ? "" : captureText;
-		Engine.GetGUIObjectByName("capture").tooltip = showSmallCapture ? captureText : "";
+		Engine.GetGUIObjectByName("captureTooltip").tooltip = showSmallCapture ? getCurrentCaptureTooltip(entState) : translate("Capture Points");
 	}
 
 	// Experience
@@ -319,7 +320,7 @@
 
 	let isGaia = playerState.civ == "gaia";
 	Engine.GetGUIObjectByName("playerCivIcon").sprite = isGaia ? "" : "cropped:1.0, 0.15625 center:grayscale:" + civEmblem;
-	Engine.GetGUIObjectByName("player").tooltip = isGaia ? "" : civName;
+	Engine.GetGUIObjectByName("civilizationTooltip").tooltip = isGaia ? "" : civName;
 
 	// TODO: we should require all entities to have icons
 	Engine.GetGUIObjectByName("icon").sprite = template.icon ? ("stretched:session/portraits/" + template.icon) : "BackgroundBlack";
Index: selection_panels_middle/single_details_area.xml
===================================================================
--- selection_panels_middle/single_details_area.xml
+++ selection_panels_middle/single_details_area.xml
@@ -15,6 +15,7 @@
 			<object type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
 			<!-- Player name. -->
 			<object size="0 50%-10 100% 50%+10" name="player" type="text" style="largeCenteredOutlinedText"/>
+			<object name="civilizationTooltip" type="image" tooltip_style="sessionToolTip" />
 		</object>
 
 		<!-- Primary and secondary names. -->
@@ -34,27 +35,10 @@
 			<object size="96 11 100% 34" name="sectionPosMiddle" hidden="true"/>
 			<object size="96 32 100% 55" name="sectionPosBottom" hidden="true"/>
 
-			<!-- Health bar -->
-			<object name="healthSection">
-				<object size="0 0 100% 12" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
-					<translatableAttribute id="tooltip">Health</translatableAttribute>
-				</object>
-				<object size="0 0 100% 12" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 14 100% 21" name="health" type="image" tooltip_style="sessionToolTip">
-					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-					<object type="image" sprite="healthBackground" ghost="true"/>
-					<object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
-					<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
-				</object>
-			</object>
-
 			<!-- Capture bar -->
 			<object name="captureSection">
-				<object size="0 0 100% 12" name="captureLabel" type="text" style="StatsTextLeft" ghost="true">
-					<translatableAttribute id="tooltip">Capture points</translatableAttribute>
-				</object>
 				<object size="0 0 100% 12" name="captureStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 14 100% 21" name="capture" type="image" tooltip_style="sessionToolTip">
+				<object size="1 14 100% 21" name="capture" type="image">
 					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 					<repeat count="9">
 						<object type="image" sprite="playerColorBackground" ghost="true" name="captureBar[n]" hidden="true"/>
@@ -61,8 +45,23 @@
 					</repeat>
 					<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
+				<object type="image" name="captureTooltip" tooltip_style="sessionToolTip"/>
 			</object>
 
+			<!-- Health bar -->
+			<object name="healthSection">
+				<object size="0 0 100% 12" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
+				<object size="1 14 100% 21" name="health" type="image">
+					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+					<object type="image" sprite="healthBackground" ghost="true"/>
+					<object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
+					<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
+				</object>
+				<object type="image" tooltip_style="sessionToolTip">
+					<translatableAttribute id="tooltip">Health</translatableAttribute>
+				</object>
+			</object>	
+
 			<!-- Resource bar -->
 			<object name="resourceSection">
 				<object size="0 0 100% 12" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>