diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 29510a4b6d..0e5b428535 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -226,6 +226,18 @@
 					addCrd (this.name, lt, 100, 0);
 					addCrd (this.name, rt, 0, 0);
 				]]></action>
+				
+				<object	name="snStatusPaneEmblem"
+					style="snStatusPane"
+					type="image"
+					z="10"
+				>
+					<action on="Load"><![CDATA[				
+						currCrd = getCrd ("snStatusPaneBkg");
+						addCrds (this.name, 0, 0, currCrd.coord[rb].x, currCrd.coord[rb].y, 
+							currCrd.coord[rb].width, currCrd.coord[rb].height);
+					]]></action>								
+				</object>
 
 				<object	name="snStatusPanePortrait"
 					style="snPortrait"
@@ -258,17 +270,6 @@
 					]]></action>
 				</object>				
 				
-				<object	name="snStatusPaneEmblem"
-					style="snObject"
-					type="text"
-				>
-					<action on="Load"><![CDATA[
-						currCrd = getCrd ("snStatusPanePortrait");
-						addCrds (this.name, 0, 0, currCrd.coord[rb].x+currCrd.coord[rb].width-25,
-								currCrd.coord[rb].y, 25, 25);					
-					]]></action>
-				</object>				
-				
 				<object	name="snStatusPaneHealthBar"
 					style="snGreenBar"
 					type="progressbar"
@@ -388,6 +389,7 @@
 			<object	name="snStatusPaneCommand1_1"
 				style="snPortrait"
 				type="button"
+				z="100"
 			>
 			</object>
 			<object	name="snStatusPaneCommandGroup1" >
@@ -406,6 +408,7 @@
 			<object	name="snStatusPaneCommand2_1" 
 				style="snPortrait" 
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup2" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand2_2" />
@@ -423,6 +426,7 @@
 			<object name="snStatusPaneCommand3_1" 
 				style="snPortrait" 
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup3" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand3_2" />
@@ -440,6 +444,7 @@
 			<object name="snStatusPaneCommand4_1" 
 				style="snPortrait" 
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup4" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand4_2" />
@@ -457,6 +462,7 @@
 			<object name="snStatusPaneCommand5_1" 
 				style="snPortrait" 	
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup5" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand5_2" />
@@ -474,6 +480,7 @@
 			<object name="snStatusPaneCommand6_1" 
 				style="snPortrait" 
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup6" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand6_2" />
@@ -491,6 +498,7 @@
 			<object name="snStatusPaneCommand7_1" 
 				style="snPortrait" 	
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup7" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand7_2" />
@@ -508,6 +516,7 @@
 			<object name="snStatusPaneCommand8_1" 
 				style="snPortrait" 
 				type="button"
+				z="100"				
 			/>
 			<object name="snStatusPaneCommandGroup8" >
 				<object style="snPortrait" type="button" name="snStatusPaneCommand8_2">
diff --git a/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js b/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js
index 2cf96f127a..12aab602be 100644
--- a/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js
+++ b/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js
@@ -30,7 +30,7 @@ function defineCommandButtons(command)
 	{
 		tempGroupObject = getGUIObjectByName("snStatusPaneCommand" +
 			"Group" + tabLoop);
-			
+		
 		// Update each list under each tab.
 		for (var listLoop = 1; listLoop <= snStatusPaneCommand.list.max; listLoop++)
 		{
diff --git a/binaries/data/mods/official/gui/test/functions_page_session_status_pane.js b/binaries/data/mods/official/gui/test/functions_page_session_status_pane.js
index 7eb5cf3dd3..f6b2c3fcaf 100644
--- a/binaries/data/mods/official/gui/test/functions_page_session_status_pane.js
+++ b/binaries/data/mods/official/gui/test/functions_page_session_status_pane.js
@@ -7,6 +7,16 @@
 
 function refreshStatusPane()
 {
+	// Update civilisation emblem.
+	if ( selectionChanged )
+	{
+		emblemObject = getGUIObjectByName ("snStatusPaneEmblem");
+		if (selection[0].traits.id.civ_code != "gaia")
+			emblemObject.sprite = "snStatusPaneEmblem" + toTitleCase (selection[0].traits.id.civ_code);
+		else
+			emblemObject.sprite = "";
+	}
+
 	if ( shouldUpdateStat ( "traits.id.icon" ) )
 	{
 		// Update portrait
@@ -84,16 +94,6 @@ textCaption += '[font=verdana10][color="' + Math.round(selection[0].player.getCo
 			rankObject.hidden = true;
 	}
 	
-	// Update civilisation emblem.
-	if ( selectionChanged )
-	{
-		emblemObject = getGUIObjectByName ("snStatusPaneEmblem");
-		if (selection[0].traits.id.civ_code != "gaia")
-			emblemObject.sprite = "snEmblem" + toTitleCase (selection[0].traits.id.civ_code);
-		else
-			emblemObject.sprite = "";
-	}	
-	
 	// Update garrison capacity.
 	if( shouldUpdateStat( "traits.garrison" ) )
 	{
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 1020a822c9..cf03d6bd6b 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -682,37 +682,37 @@
 		-->		
 		
 		<sprite name="snEmblemCelt">
-			<image 	texture="session/icons/emblems/celt.dds"
+			<image 	texture="session/portraits/emblems/celt.dds"
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
 		
 		<sprite name="snEmblemHele">
-			<image 	texture="session/icons/emblems/hele.dds"
+			<image 	texture="session/portraits/emblems/hele.dds"
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
 		
 		<sprite name="snEmblemIber">
-			<image 	texture="session/icons/emblems/iber.dds"
+			<image 	texture="session/portraits/emblems/iber.dds"
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
 		
 		<sprite name="snEmblemKart">
-			<image 	texture="session/icons/emblems/kart.dds"
+			<image 	texture="session/portraits/emblems/kart.dds"
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
 		
 		<sprite name="snEmblemPers">
-			<image 	texture="session/icons/emblems/pers.dds"
+			<image 	texture="session/portraits/emblems/pers.dds"
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
 		
 		<sprite name="snEmblemRome">
-			<image 	texture="session/icons/emblems/rome.dds"
+			<image 	texture="session/portraits/emblems/rome.dds"
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
@@ -728,6 +728,48 @@
 					size="0 0 100% 100%"
 			/>
 		</sprite>		
+		
+        <!--
+		==========================================
+		STATUS PANE CIVILISATION OVERLAYS
+		==========================================
+		-->		
+		
+		<sprite name="snStatusPaneEmblemCart">
+			<image 	texture="session/status_pane_cart.dds"
+					size="0 0 100% 100%"
+			/>
+		</sprite>		
+		
+		<sprite name="snStatusPaneEmblemCelt">
+			<image 	texture="session/status_pane_celt.dds"
+					size="0 0 100% 100%"
+			/>
+		</sprite>		
+		
+		<sprite name="snStatusPaneEmblemHele">
+			<image 	texture="session/status_pane_hele.dds"
+					size="0 0 100% 100%"
+			/>
+		</sprite>		
+		
+		<sprite name="snStatusPaneEmblemIber">
+			<image 	texture="session/status_pane_iber.dds"
+					size="0 0 100% 100%"
+			/>
+		</sprite>		
+		
+		<sprite name="snStatusPaneEmblemPers">
+			<image 	texture="session/status_pane_pers.dds"
+					size="0 0 100% 100%"
+			/>
+		</sprite>		
+		
+		<sprite name="snStatusPaneEmblemRome">
+			<image 	texture="session/status_pane_rome.dds"
+					size="0 0 100% 100%"
+			/>
+		</sprite>		
 
 		<!--
 		==========================================
@@ -794,19 +836,19 @@
 			
 			<!-- Statistic (gold circle). -->
 			<sprite	name="snIconStatistic">
-				<image	texture="session/icons/bkg/statistic.dds"
+				<image	texture="session/icons/bkg/statistic_s.dds"
 						size="0 0 100% 100%" 
 				/>
 			</sprite>
 			<sprite	name="snIconStatisticOver">
 				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/statistic.dds"
+				<image	texture="session/icons/bkg/statistic_s.dds"
 						size="0 0 100% 100%" 
 				/>
 			</sprite>
 			<sprite	name="snIconStatisticDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/statistic.dds"
+				<image	texture="session/icons/bkg/statistic_s.dds"
 						size="0 0 100% 100%" 
 				/>
 			</sprite>	
@@ -1445,21 +1487,21 @@
 		-->
 		
 		<sprite	name="snIconSheetArmour">
-				<image	texture="session/icons/sheets/armour.dds"
+				<image	texture="session/icons/sheets/armour_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetArmourOver">
 				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/sheets/armour.dds"
+				<image	texture="session/icons/sheets/armour_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetArmourDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/sheets/armour.dds"
+				<image	texture="session/icons/sheets/armour_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1469,7 +1511,7 @@
 				<image	texture="session/icons/bkg/statistic.dds"
 						size="0 0 100% 100%" 
 				/>		
-				<image	texture="session/icons/sheets/armour.dds"
+				<image	texture="session/icons/sheets/armour_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1479,7 +1521,7 @@
 				<image	texture="session/icons/bkg/statistic.dds"
 						size="0 0 100% 100%" 
 				/>				
-				<image	texture="session/icons/sheets/armour.dds"
+				<image	texture="session/icons/sheets/armour_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1489,7 +1531,7 @@
 				<image	texture="session/icons/bkg/statistic.dds"
 						size="0 0 100% 100%" 
 				/>				
-				<image	texture="session/icons/sheets/armour.dds"
+				<image	texture="session/icons/sheets/armour_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1502,21 +1544,21 @@
 		-->
 		
 		<sprite	name="snIconSheetAttack">
-				<image	texture="session/icons/sheets/attack.dds"
+				<image	texture="session/icons/sheets/attack_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetAttackOver">
 				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/sheets/attack.dds"
+				<image	texture="session/icons/sheets/attack_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetAttackDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/sheets/attack.dds"
+				<image	texture="session/icons/sheets/attack_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1526,7 +1568,7 @@
 				<image	texture="session/icons/bkg/statistic.dds"
 						size="0 0 100% 100%" 
 				/>		
-				<image	texture="session/icons/sheets/attack.dds"
+				<image	texture="session/icons/sheets/attack_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1536,7 +1578,7 @@
 				<image	texture="session/icons/bkg/statistic.dds"
 						size="0 0 100% 100%" 
 				/>				
-				<image	texture="session/icons/sheets/attack.dds"
+				<image	texture="session/icons/sheets/attack_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
@@ -1546,7 +1588,7 @@
 				<image	texture="session/icons/bkg/statistic.dds"
 						size="0 0 100% 100%" 
 				/>				
-				<image	texture="session/icons/sheets/attack.dds"
+				<image	texture="session/icons/sheets/attack_s.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>