diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index 4de768c3f2..bcf9d6e130 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -72,11 +72,9 @@ Identity.prototype.Schema =
 			"<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/>" +
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
index b4fadcf064..05e2c5b562 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
index 2bb116887d..7076e9fea3 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
index 2b213bc414..04a6c09c7f 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
index f456ec9949..9b15528c4b 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
index a667576084..0b9e8812e5 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
index 1ebaafde80..3d48b60b90 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
index 208680997d..55622daa90 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
+++ b/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/>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/athen.xml b/binaries/data/mods/public/simulation/templates/special/players/athen.xml
index 6ced6d8054..dd725d207e 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/athen.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/brit.xml b/binaries/data/mods/public/simulation/templates/special/players/brit.xml
index df6e4a7ba9..578cde97fe 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/brit.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/cart.xml b/binaries/data/mods/public/simulation/templates/special/players/cart.xml
index ab737103b7..cc292853f2 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/cart.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/gaia.xml b/binaries/data/mods/public/simulation/templates/special/players/gaia.xml
index e8f2df41ea..80bb127fc5 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/gaia.xml
+++ b/binaries/data/mods/public/simulation/templates/special/players/gaia.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Gaia</GenericName>
+    <Icon>emblems/emblem_gaia.png</Icon>
     <Undeletable>true</Undeletable>
   </Identity>
   <Player>
@@ -24,10 +25,21 @@
       </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
       special/formations/anti_cavalry
+      special/formations/scatter
     </Formations>
   </Player>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/gaul.xml b/binaries/data/mods/public/simulation/templates/special/players/gaul.xml
index eaeb45de0f..f6330ab858 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/gaul.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/han.xml b/binaries/data/mods/public/simulation/templates/special/players/han.xml
index 1a106ba1da..7b15ae821f 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/han.xml
+++ b/binaries/data/mods/public/simulation/templates/special/players/han.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/player">
+<Entity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/han_player_teambonus
   </Auras>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/iber.xml b/binaries/data/mods/public/simulation/templates/special/players/iber.xml
index e4a95c0e5b..03e452b20f 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/iber.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/kush.xml b/binaries/data/mods/public/simulation/templates/special/players/kush.xml
index 8609940dea..5c44664bee 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/kush.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/mace.xml b/binaries/data/mods/public/simulation/templates/special/players/mace.xml
index d599adb7db..dead611e2b 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/mace.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/maur.xml b/binaries/data/mods/public/simulation/templates/special/players/maur.xml
index cec1f86f7d..735e99c35e 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/maur.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/pers.xml b/binaries/data/mods/public/simulation/templates/special/players/pers.xml
index 95808debeb..c2487b38d2 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/pers.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/ptol.xml b/binaries/data/mods/public/simulation/templates/special/players/ptol.xml
index 6729b241c6..d153a54ca7 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/ptol.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/rome.xml b/binaries/data/mods/public/simulation/templates/special/players/rome.xml
index 7a7ad03e32..c346992e41 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/rome.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/sele.xml b/binaries/data/mods/public/simulation/templates/special/players/sele.xml
index 18f2fac0e5..fee3d6bafb 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/sele.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/spart.xml b/binaries/data/mods/public/simulation/templates/special/players/spart.xml
index 8222b3a5f9..ff7029b5e9 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/spart.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/special/player.xml b/binaries/data/mods/public/simulation/templates/template_player.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/special/player.xml
rename to binaries/data/mods/public/simulation/templates/template_player.xml