Index: ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
@@ -27,7 +27,7 @@
     <GenericName>Army of Alexander the Great.</GenericName>
     <SpecificName>Army of Alexander the Great</SpecificName>
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
-    <Icon>units/hele_hero_alexander.png</Icon>
+    <Icon>units/mace_hero_alexander.png</Icon>
   </Identity>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
@@ -19,7 +19,7 @@
     <GenericName>Army of Macedonia</GenericName>
     <SpecificName>Army of Macedon</SpecificName>
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
-    <Icon>units/hele_hero_demetrius.png</Icon>
+    <Icon>units/mace_hero_demetrius.png</Icon>
   </Identity>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
@@ -27,7 +27,7 @@
     <GenericName>Army of Leonidas I.</GenericName>
     <SpecificName>Army of Leonidas I</SpecificName>
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
-    <Icon>units/hele_hero_leonidas.png</Icon>
+    <Icon>units/spart_hero_leonidas.png</Icon>
   </Identity>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -25,7 +25,6 @@
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>War Elephant</GenericName>
-    <Icon>gaia/fauna_elephant.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -38,7 +38,6 @@
   <Identity>
     <VisibleClasses datatype="tokens">Slave Worker</VisibleClasses>
     <GenericName>Slave</GenericName>
-    <Icon>units/global_slave.png</Icon>
     <Tooltip>Gatherer with a finite life span. Bonused at mining and lumbering.</Tooltip>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <SelectionGroupName>units/athen_cavalry_javelinist_b</SelectionGroupName>
     <SpecificName>Pródromos</SpecificName>
-    <Icon>units/hele_cavalry_javelinist.png</Icon>
+    <Icon>units/athen_cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen_cavalry_javelinist_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/athen_cavalry_swordsman_b</SelectionGroupName>
     <GenericName>Greek Cavalry</GenericName>
     <SpecificName>Hippeús</SpecificName>
-    <Icon>units/hele_cavalry_swordsman.png</Icon>
+    <Icon>units/athen_cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Xenophon</GenericName>
     <SpecificName>Xenophōn</SpecificName>
-    <Icon>units/hele_hero_xenophon.png</Icon>
+    <Icon>units/athen_hero_xenophon.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_javelinist_xenophon.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -22,7 +22,7 @@
     <SelectionGroupName>units/athen_infantry_javelinist_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
-    <Icon>units/hele_infantry_javelinist.png</Icon>
+    <Icon>units/athen_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -22,7 +22,7 @@
     <SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/hele_infantry_archer.png</Icon>
+    <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_slave.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Doûlos</SpecificName>
+    <Icon>units/global_slave.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/global/slave.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,6 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
-    <Icon>units/brit_hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_cavalry_swordsman_cunobelin_m.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
@@ -12,7 +12,7 @@
     <SelectionGroupName>units/brit_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Iaosae</SpecificName>
-    <Icon>units/celt_infantry_slinger.png</Icon>
+    <Icon>units/gaul_infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit_infantry_slinger_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -15,7 +15,7 @@
     <Civ>gaul</Civ>
     <GenericName>Naked Fanatic</GenericName>
     <SpecificName>Gaesata</SpecificName>
-    <Icon>units/celt_fanatic.png</Icon>
+    <Icon>units/gaul_champion_fanatic.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <UnitMotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/gaul_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Iaosae</SpecificName>
-    <Icon>units/celt_infantry_slinger.png</Icon>
+    <Icon>units/gaul_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
@@ -12,7 +12,7 @@
     <SelectionGroupName>units/kush_cavalry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Blemmye Desert Raider</GenericName>
     <SpecificName>nhw Bulahau gml</SpecificName>
-    <Icon>units/kush_merc_camelry.png</Icon>
+    <Icon>units/kush_camel_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
@@ -21,7 +21,7 @@
     <SelectionGroupName>units/kush_infantry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Nuba Skirmisher</GenericName>
     <SpecificName>nhw ‘h3w Noba</SpecificName>
-    <Icon>units/kush_infantry_merc_javelinist.png</Icon>
+    <Icon>units/kush_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
@@ -20,7 +20,7 @@
     <SelectionGroupName>units/mace_infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/hele_infantry_archer.png</Icon>
+    <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
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
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/ptol_cavalry_archer</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
-    <Icon>units/ptol_camelry_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/ptol_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -20,7 +20,7 @@
     <SelectionGroupName>units/ptol_infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/hele_infantry_archer.png</Icon>
+    <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
@@ -20,7 +20,7 @@
     <SelectionGroupName>units/sele_infantry_archer_merc_b</SelectionGroupName>
     <GenericName>Syrian Archer</GenericName>
     <SpecificName>Toxótēs Syrías</SpecificName>
-    <Icon>units/hele_infantry_archer.png</Icon>
+    <Icon>units/sele_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>