Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -72,11 +72,9 @@
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
-	"<optional>" +
-		"<element name='Icon'>" +
-			"<text/>" +
-		"</element>" +
-	"</optional>" +
+	"<element name='Icon'>" +
+		"<text/>" +
+	"</element>" +
 	"<optional>" +
 		"<element name='RequiredTechnology' a:help='Optional name of a technology which must be researched before the entity can be produced.'>" +
 			"<text/>" +
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry">
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/athen_cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/athen_infantry_spearman.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/athen_infantry_slinger.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/athen_ship_trireme.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/ship_trireme</general>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
@@ -6,6 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/spart_siege_ram.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/siege_ram</general>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/hele_support_female_citizen.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/support_female_citizen</general>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
@@ -6,6 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
+    <Icon>units/maur_support_elephant.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer/>
Index: binaries/data/mods/public/simulation/templates/special/player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player.xml
+++ binaries/data/mods/public/simulation/templates/special/player.xml
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity>
-  <AttackDetection>
-    <SuppressionTransferRange>80</SuppressionTransferRange>
-    <SuppressionRange>160</SuppressionRange>
-    <SuppressionTime>60000</SuppressionTime>
-  </AttackDetection>
-  <BattleDetection>
-    <TimerInterval>200</TimerInterval>
-    <RecordLength>12</RecordLength>
-    <DamageRateThreshold>0.04</DamageRateThreshold>
-    <AlertnessBattleThreshold>4</AlertnessBattleThreshold>
-    <AlertnessPeaceThreshold>0</AlertnessPeaceThreshold>
-    <AlertnessMax>8</AlertnessMax>
-  </BattleDetection>
-  <EntityLimits>
-    <Limits>
-      <Animal>50</Animal>
-      <CivilCentre>1</CivilCentre>
-      <Fortress>10</Fortress>
-      <Gladiator>0</Gladiator>
-      <Hero>1</Hero>
-      <Juggernaut>1</Juggernaut>
-      <Library>1</Library>
-      <Lighthouse>1</Lighthouse>
-      <Monument>5</Monument>
-      <Palace>2</Palace>
-      <Pillar>0</Pillar>
-      <PyramidLarge>2</PyramidLarge>
-      <PyramidSmall>4</PyramidSmall>
-      <TempleOfAmun>1</TempleOfAmun>
-      <TempleOfVesta>1</TempleOfVesta>
-      <Theater>1</Theater>
-      <Tower>30</Tower>
-      <WarDog>20</WarDog>
-      <Wonder>1</Wonder>
-    </Limits>
-    <LimitChangers>
-      <Gladiator>
-        <Amphitheater>15</Amphitheater>
-      </Gladiator>
-      <Juggernaut>
-        <PtolemyIV>4</PtolemyIV>
-      </Juggernaut>
-      <Pillar>
-        <Ashoka>5</Ashoka>
-      </Pillar>
-    </LimitChangers>
-    <LimitRemovers>
-      <CivilCentre>
-        <RequiredTechs datatype="tokens">phase_town</RequiredTechs>
-      </CivilCentre>
-    </LimitRemovers>
-  </EntityLimits>
-  <Identity>
-    <Classes datatype="tokens">Player</Classes>
-    <Undeletable>true</Undeletable>
-  </Identity>
-  <Player>
-    <BarterMultiplier>
-      <Buy>
-        <food>1.0</food>
-        <wood>1.0</wood>
-        <stone>1.0</stone>
-        <metal>1.0</metal>
-      </Buy>
-      <Sell>
-        <food>1.0</food>
-        <wood>1.0</wood>
-        <stone>1.0</stone>
-        <metal>1.0</metal>
-      </Sell>
-    </BarterMultiplier>
-    <SharedLosTech>unlock_shared_los</SharedLosTech>
-    <SharedDropsitesTech>unlock_shared_dropsites</SharedDropsitesTech>
-    <SpyCostMultiplier>1.0</SpyCostMultiplier>
-    <Formations datatype="tokens">
-      special/formations/null
-      special/formations/box
-      special/formations/column_closed
-      special/formations/line_closed
-      special/formations/column_open
-      special/formations/line_open
-      special/formations/flank
-      special/formations/battle_line
-      special/formations/skirmish
-      special/formations/wedge
-    </Formations>
-  </Player>
-  <ResourceTrickle>
-    <Rates>
-      <food>0.0</food>
-      <wood>0.0</wood>
-      <stone>0.0</stone>
-      <metal>0.0</metal>
-    </Rates>
-    <Interval>1000</Interval>
-  </ResourceTrickle>
-  <Sound>
-    <SoundGroups>
-      <defeated>interface/alarm/alarm_defeated.xml</defeated>
-      <defeated_ally>interface/alarm/alarm_defeated_ally.xml</defeated_ally>
-      <defeated_enemy>interface/alarm/alarm_defeated_enemy.xml</defeated_enemy>
-      <no_idle_unit>interface/alarm/alarm_no_idle_unit.xml</no_idle_unit>
-    </SoundGroups>
-  </Sound>
-  <StatisticsTracker>
-    <!-- The summary screen and lobby rankings expect these classes, but additional classes may be added. -->
-    <UnitClasses datatype="tokens">
-      Cavalry
-      Champion
-      Domestic
-      FemaleCitizen
-      Hero
-      Infantry
-      Ship
-      Siege
-      Trader
-      Worker
-    </UnitClasses>
-    <StructureClasses datatype="tokens">
-      Economic
-      CivCentre
-      Fortress
-      House
-      Military
-      Outpost
-      Wonder
-    </StructureClasses>
-  </StatisticsTracker>
-  <TechnologyManager/>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/special/players/athen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/athen.xml
+++ binaries/data/mods/public/simulation/templates/special/players/athen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/athen_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/brit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/brit.xml
+++ binaries/data/mods/public/simulation/templates/special/players/brit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/brit_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/cart.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/cart.xml
+++ binaries/data/mods/public/simulation/templates/special/players/cart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/cart_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/gaia.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/gaia.xml
+++ binaries/data/mods/public/simulation/templates/special/players/gaia.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Gaia</GenericName>
+    <Icon/>
     <Undeletable>true</Undeletable>
   </Identity>
   <Player>
@@ -24,6 +25,16 @@
       </Sell>
     </BarterMultiplier>
     <Formations datatype="tokens">
+      special/formations/null
+      special/formations/box
+      special/formations/column_closed
+      special/formations/line_closed
+      special/formations/column_open
+      special/formations/line_open
+      special/formations/flank
+      special/formations/battle_line
+      special/formations/skirmish
+      special/formations/wedge
       special/formations/phalanx
       special/formations/syntagma
       special/formations/testudo
Index: binaries/data/mods/public/simulation/templates/special/players/gaul.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/gaul.xml
+++ binaries/data/mods/public/simulation/templates/special/players/gaul.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/gaul_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/iber.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/iber.xml
+++ binaries/data/mods/public/simulation/templates/special/players/iber.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/iber_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/kush.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/kush.xml
+++ binaries/data/mods/public/simulation/templates/special/players/kush.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/kush_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/mace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/mace.xml
+++ binaries/data/mods/public/simulation/templates/special/players/mace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/mace_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/maur.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/maur.xml
+++ binaries/data/mods/public/simulation/templates/special/players/maur.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/maur_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/pers.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/pers.xml
+++ binaries/data/mods/public/simulation/templates/special/players/pers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/pers_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/ptol.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/ptol.xml
+++ binaries/data/mods/public/simulation/templates/special/players/ptol.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/ptol_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/rome.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/rome.xml
+++ binaries/data/mods/public/simulation/templates/special/players/rome.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/rome_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/sele.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/sele.xml
+++ binaries/data/mods/public/simulation/templates/special/players/sele.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/sele_player_teambonus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/special/players/spart.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/spart.xml
+++ binaries/data/mods/public/simulation/templates/special/players/spart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">teambonuses/spart_player_teambonus</Auras>
   <Identity>
     <Civ>spart</Civ>