Index: ps/trunk/binaries/data/mods/public/gui/common/setup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/setup.xml	(revision 19648)
+++ ps/trunk/binaries/data/mods/public/gui/common/setup.xml	(revision 19649)
@@ -1,121 +1,132 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>
 
 <!DOCTYPE setup SYSTEM "..\gui.dtd">
 
 <setup>
 
 	<!--
 	==========================================
 	- SETUP - ICONS
 	==========================================
 	-->
 
 		<icon name="iconInfo"
 			sprite="iconInfoWhite"
 			size="16 16"
 		/>
 
 		<!--
 		==========================================
 		- SETUP - TOOLTIPS
 		==========================================
 		-->
 
 		<tooltip name="pgToolTip"
 			use_object="pgToolTip"
 			delay="0"
 			hide_object="true"
 		/>
 
 		<tooltip name="snToolTip"
 			anchor="top"
 			buffer_zone="4"
 			delay="500"
 			font="sans-14"
 			maxwidth="300"
 			offset="16 32"
 			sprite="BackgroundWhiteBorderBlack"
 			textcolor="0 0 0"
 		/>
 
 		<tooltip name="snToolTipBottom"
 			anchor="bottom"
 			buffer_zone="4"
 			delay="500"
 			font="sans-14"
 			maxwidth="300"
 			offset="-4 -4"
 			sprite="BackgroundWhiteBorderBlack"
 			textcolor="0 0 0"
 		/>
 
 		<tooltip name="sessionToolTip"
 			anchor="top"
 			buffer_zone="4"
 			delay="100"
 			font="sans-14"
 			maxwidth="300"
 			offset="16 32"
 			sprite="BackgroundSessionTooltip"
 			textcolor="255 255 255"
 		/>
 
+		<tooltip name="sessionToolTipInstantly"
+			anchor="top"
+			buffer_zone="4"
+			delay="0"
+			font="sans-14"
+			maxwidth="300"
+			offset="16 32"
+			sprite="BackgroundSessionTooltip"
+			textcolor="255 255 255"
+		/>
+
 		<tooltip name="sessionToolTipBottom"
 			anchor="bottom"
 			buffer_zone="4"
 			delay="100"
 			font="sans-14"
 			maxwidth="400"
 			offset="-4 -4"
 			sprite="BackgroundSessionTooltip"
 			textcolor="255 255 255"
 		/>
 
 		<tooltip name="sessionToolTipBold"
 			anchor="top"
 			buffer_zone="4"
 			delay="100"
 			font="sans-bold-14"
 			maxwidth="300"
 			offset="16 32"
 			sprite="BackgroundSessionTooltip"
 			textcolor="255 255 255"
 		/>
 
 		<tooltip name="sessionToolTipBottomBold"
 			anchor="bottom"
 			buffer_zone="4"
 			delay="100"
 			font="sans-bold-14"
 			maxwidth="400"
 			offset="-4 -4"
 			sprite="BackgroundSessionTooltip"
 			textcolor="255 255 255"
 		/>
 
 		<!--
 		==========================================
 		- SETUP - COLORS
 		==========================================
 		-->
 
 		<color name="black">0 0 0</color>
 		<color name="white">255 255 255</color>
 		<color name="red">255 0 0</color>
 		<color name="blue">0 0 255</color>
 		<color name="yellow">255 255 0</color>
 
 		<color name="gold">237 227 167</color>
 		<color name="lightgray">243 242 240</color>
 		<color name="gray">143 142 140</color>
 		<color name="darkgray">43 42 40</color>
 		<color name="green">0 200 0</color>
 		<color name="mustard">191 191 2</color>
 		<color name="brown">159 98 24</color>
 		<color name="orange">255 165 0</color>
 		<color name="darkred">80 0 0</color>
 		<color name="darkbrown">30 20 10</color>
 
 		<color name="transparent">0 0 0 0</color>
 
 </setup>
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml	(revision 19648)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml	(revision 19649)
@@ -1,109 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Unit details for Single Unit -->
 <object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
 
 	<!-- Stats Bars -->
 	<object size= "2 0 100%-2 98" type="image" tooltip_style="sessionToolTip">
 
 	<object size="0 8 100% 60" type="image" sprite="edgedPanelShader">
 		<!-- Health bar -->
 		<object size="88 0 100% 24" name="healthSection">
 		<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
 			<translatableAttribute id="tooltip">Health:</translatableAttribute>
 		</object>
 		<object size="0 0 100% 16" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
 		<object size="1 16 100% 23" 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 size="88 28 100% 52" name="captureSection">
 		<object size="0 0 100% 16" name="captureLabel" type="text" style="StatsTextLeft" ghost="true">
 			<translatableAttribute id="tooltip">Capture points:</translatableAttribute>
 		</object>
 		<object size="0 0 100% 16" name="captureStats" type="text" style="StatsTextRight" ghost="true"/>
 		<object size="1 16 100% 23" 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"/>
 			</repeat>
 			<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 		</object>
 		</object>
 
 		<!-- Resource bar -->
 		<object size="88 28 100% 52" name="resourceSection">
 		<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
 		<object size="0 0 100% 16" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
 		<object size="1 16 100% 23" name="resources" type="image">
 			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 			<object type="image" sprite="resourceBackground" ghost="true"/>
 			<object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
 			<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 		</object>
 		</object>
 	</object>
 
 	<object size="0 60 100% 96" type="image" sprite="edgedPanelShader">
 		<!-- Attack and Armor -->
-		<object size="90 -2 126 34" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTip">
+		<object size="90 -2 126 34" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
 			<translatableAttribute id="tooltip">Attack and Armor</translatableAttribute>
 		</object>
 
 		<!-- Resource carrying icon/counter -->
 		<!-- Used also for number of gatherers/builders -->
 		<object size="100%-98 -2 100%-28 34" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
 		<object size="100%-36 -2 100% 34" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
 	</object>
 
 	<!-- Big unit icon -->
 	<object size="-8 -8 88 88" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
 		<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
 
 		<!-- Experience bar -->
 		<object size="2 2 6 100%-2" type="image" name="experience" tooltip_style="sessionToolTip">
 			<translatableAttribute id="tooltip">Experience</translatableAttribute>
 			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 			<object type="image" sprite="experienceBackground" ghost="true"/>
 			<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
 			<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 		</object>
 
 		<object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip_style="sessionToolTip">
 			<translatableAttribute id="tooltip">Rank</translatableAttribute>
 		</object>
 	</object>
 	</object>
 
 	<!-- Names (this must come before the attack and armor icon to avoid clipping issues) -->
 	<object size="2 96 100%-2 100%-36" name="statsArea" type="image" sprite="edgedPanelShader">
 
 	<!-- These images are used to clip off the top and bottom of the civ icon -->
 	<object z="30" size="0 -5 100% 40" ghost="true" type="image" sprite="remove"/>
 	<object z="30" size="0 100%-5 100% 100%+40" ghost="true" type="image" sprite="remove"/>
 
 	<object z="30" size="0 2 100% 45" ghost="true">
 		<!-- Specific Name -->
 		<object size="0 0 100% 20" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
 
 		<!-- Generic Name -->
 		<object size="0 15 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 	</object>
 
 	<!-- Player Name and Civ -->
 	<object size="0 40 100% 100%">
 		<object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
 		<object size="0 0 100% 100%" name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
 		<object size="0 0 100% 100%" type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
 
 		<!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
 		<object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
 	</object>
 	</object>
 
 </object>