Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
@@ -9,8 +9,8 @@
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Carbanto</SpecificName>
-    <SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_brit.png</Icon>
+    <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
+    <Icon>units/brit_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_4.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
@@ -5,7 +5,7 @@
     <GenericName>Brythonic Longswordsman</GenericName>
     <SpecificName>Delamokludda</SpecificName>
     <SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_brit.png</Icon>
+    <Icon>units/brit_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_3.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
@@ -13,7 +13,7 @@
     <GenericName>Boudicca (Chariot)</GenericName>
     <SpecificName>Boadicea</SpecificName>
     <Gender>female</Gender>
-    <Icon>units/celt_hero_boudicca.png</Icon>
+    <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
@@ -8,7 +8,7 @@
     <GenericName>Boudicca (Sword)</GenericName>
     <SpecificName>Boadicea</SpecificName>
     <Gender>female</Gender>
-    <Icon>units/celt_hero_boudicca.png</Icon>
+    <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/boudicca.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Caratacos</SpecificName>
-    <Icon>units/celt_hero_caratacos.png</Icon>
+    <Icon>units/brit_hero_caratacos.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/caradoc.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
-    <Icon>units/celt_hero_cynvelin.png</Icon>
+    <Icon>units/brit_hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/cunobelin_horse.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <GenericName>Sacred Band Cavalry</GenericName>
     <SpecificName>Sacred Band of Astarte</SpecificName>
-    <Icon>units/cart_sacred_band_cavalry.png</Icon>
+    <Icon>units/cart_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_3.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <GenericName>North African War Elephant</GenericName>
     <SpecificName>Pil Malḥamit</SpecificName>
-    <Icon>units/cart_champion_cavalry.png</Icon>
+    <Icon>units/cart_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_2.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
@@ -5,7 +5,7 @@
     <GenericName>Gallic Noble Cavalry</GenericName>
     <SpecificName>Gallic Brihent</SpecificName>
     <SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_gaul.png</Icon>
+    <Icon>units/gaul_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_2.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
@@ -5,7 +5,7 @@
     <GenericName>Heavy Swordsman</GenericName>
     <SpecificName>Solduros</SpecificName>
     <SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_gaul.png</Icon>
+    <Icon>units/gaul_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_1.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brennus</SpecificName>
-    <Icon>units/celt_hero_brennus.png</Icon>
+    <Icon>units/gaul_hero_brennus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/brennus.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Vercingetorix</SpecificName>
-    <Icon>units/celt_hero_vercingetorix.png</Icon>
+    <Icon>units/gaul_hero_vercingetorix.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/vercingetorix_horse.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Britomartus</SpecificName>
-    <Icon>units/celt_hero_viridomarus.png</Icon>
+    <Icon>units/gaul_hero_viridomarus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/viridomarus.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hetaîros</SpecificName>
-    <Icon>units/hele_champion_cavalry_mace.png</Icon>
+    <Icon>units/mace_champion_cavalry.png</Icon>
     <SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Macedonian Shield Bearer</GenericName>
     <SpecificName>Hypaspistḗs</SpecificName>
-    <Icon>units/macedonian_hypaspist.png</Icon>
+    <Icon>units/mace_hypaspist.png</Icon>
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
@@ -9,7 +9,7 @@
   </Health>
   <Identity>
     <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
-    <Icon>units/macedonian_argyraspidai.png</Icon>
+    <Icon>units/mace_argyraspidai.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
@@ -10,7 +10,7 @@
     <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Babiruviya Ratha</SpecificName>
-    <Icon>units/pers_cavalry_archer.png</Icon>
+    <Icon>units/pers_chariot_archer.png</Icon>
     <Tooltip>Causes trample damage to enemy units.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
@@ -4,7 +4,7 @@
     <Civ>pers</Civ>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Hinduya Pila</SpecificName>
-    <Icon>units/pers_war_elephant.png</Icon>
+    <Icon>units/pers_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/war_elephant.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
@@ -3,10 +3,10 @@
   <Identity>
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Camel</VisibleClasses>
-    <SelectionGroupName>units/ptol_cavalry_archer_b</SelectionGroupName>
+    <SelectionGroupName>units/ptol_camel_archer</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
-    <Icon>units/ptol_cavalry_archer.png</Icon>
+    <Icon>units/ptol_camel_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Seleucid Cataphract</GenericName>
     <SpecificName>Seleukidón Kataphraktos</SpecificName>
-    <Icon>units/sele_champion_cataphract.png</Icon>
+    <Icon>units/sele_champion_cavalry.png</Icon>
     <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Silver Shield Pikeman</GenericName>
     <SpecificName>Phalangitès Argyraspis</SpecificName>
-    <Icon>units/sele_champion_infantry_pikeman.png</Icon>
+    <Icon>units/sele_champion_pikeman.png</Icon>
     <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
   </Identity>
   <VisualActor>