diff --git a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
index ec4de74d52..61c802cadd 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
@@ -24,7 +24,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/mace_hero_alexander.png</Icon>
+    <Icon>units/mace/hero_alexander.png</Icon>
   </Identity>
   <Resistance>
     <Entity>
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
index 9355499a4e..59ce87d950 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
+++ b/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/mace_hero_demetrius.png</Icon>
+    <Icon>units/mace/hero_demetrius.png</Icon>
   </Identity>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
index b841a018d9..118adda19d 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
@@ -24,7 +24,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/spart_hero_leonidas.png</Icon>
+    <Icon>units/spart/hero_leonidas.png</Icon>
   </Identity>
   <Resistance>
     <Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fruit/grapes.xml b/binaries/data/mods/public/simulation/templates/gaia/fruit/grapes.xml
index 1a6ea49794..c56fea8c97 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fruit/grapes.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fruit/grapes.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_gaia_fruit">
   <Identity>
     <SpecificName>Grapes</SpecificName>
-    <Icon>gaia/flora_bush_grapes.png</Icon>
   </Identity>
   <ResourceSupply>
     <Max>200</Max>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
index 920c490dcb..db9a3e7708 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
@@ -3,7 +3,7 @@
   <Identity>
     <SelectionGroupName>units/athen/cavalry_javelineer_b</SelectionGroupName>
     <SpecificName>Pródromos</SpecificName>
-    <Icon>units/athen_cavalry_javelinist.png</Icon>
+    <Icon>units/athen/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
index 404becf526..1797eacc1b 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
@@ -9,7 +9,7 @@
     <SelectionGroupName>units/athen/cavalry_swordsman_b</SelectionGroupName>
     <GenericName>Greek Cavalry</GenericName>
     <SpecificName>Hippeús</SpecificName>
-    <Icon>units/athen_cavalry_swordsman.png</Icon>
+    <Icon>units/athen/cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml
index 1cc8094b79..996ad62ab2 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>City Guard</GenericName>
     <SpecificName>Epílektos</SpecificName>
-    <Icon>units/athen_champion_infantry.png</Icon>
+    <Icon>units/athen/champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/infantry_spearman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml b/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
index dfa0156afe..fbdd5e56d2 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Athenian Marine</GenericName>
     <SpecificName>Epibátēs Athēnaîos</SpecificName>
-    <Icon>units/athen_champion_marine.png</Icon>
+    <Icon>units/athen/champion_marine.png</Icon>
     <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml b/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml
index f9be5c60a5..5d5f37686c 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Scythian Archer</GenericName>
     <SpecificName>Toxótēs Skythikós</SpecificName>
-    <Icon>units/athen_champion_ranged.png</Icon>
+    <Icon>units/athen/champion_ranged.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/infantry_archer_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml b/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
index a93bae4cbd..be3a55aba2 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
@@ -7,7 +7,7 @@
   <Identity>
     <GenericName>Iphicrates</GenericName>
     <SpecificName>Iphikratēs</SpecificName>
-    <Icon>units/athen_hero_iphicrates.png</Icon>
+    <Icon>units/athen/hero_iphicrates.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_javelinist_iphicrates.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml b/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
index 266a878899..255eed2d42 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
@@ -7,7 +7,7 @@
   <Identity>
     <GenericName>Pericles</GenericName>
     <SpecificName>Periklēs</SpecificName>
-    <Icon>units/athen_hero_pericles.png</Icon>
+    <Icon>units/athen/hero_pericles.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_spearman_pericles.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml b/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
index 40e583ccc4..a6700814c3 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
@@ -7,7 +7,7 @@
   <Identity>
     <GenericName>Themistocles</GenericName>
     <SpecificName>Themistoklēs</SpecificName>
-    <Icon>units/athen_hero_themistocles.png</Icon>
+    <Icon>units/athen/hero_themistocles.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_swordsman_themistocles.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml b/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
index a91c5f31c9..adc17ecc5e 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Xenophon</GenericName>
     <SpecificName>Xenophōn</SpecificName>
-    <Icon>units/athen_hero_xenophon.png</Icon>
+    <Icon>units/athen/hero_xenophon.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_javelinist_xenophon.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
index 6d37e6d029..e035e83504 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
@@ -4,7 +4,7 @@
     <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
-    <Icon>units/athen_infantry_javelinist.png</Icon>
+    <Icon>units/athen/infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
index 2f4e3714f0..74260067b8 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
@@ -4,7 +4,7 @@
     <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/mace_infantry_archer.png</Icon>
+    <Icon>units/mace/infantry_archer.png</Icon>
     <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml
index 481f3caf63..2a88ef980f 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml
@@ -4,7 +4,7 @@
     <SelectionGroupName>units/athen/infantry_slinger_b</SelectionGroupName>
     <GenericName>Athenian Slinger Militia</GenericName>
     <SpecificName>Psilòs Athēnaîos</SpecificName>
-    <Icon>units/athen_infantry_slinger.png</Icon>
+    <Icon>units/athen/infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/infantry_slinger_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
index 4aeef112d6..2b3efe40d7 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
@@ -4,7 +4,7 @@
     <SelectionGroupName>units/athen/infantry_spearman_b</SelectionGroupName>
     <GenericName>Athenian Hoplite</GenericName>
     <SpecificName>Hoplítēs Athēnaîos</SpecificName>
-    <Icon>units/athen_infantry_spearman.png</Icon>
+    <Icon>units/athen/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
index be4f076de2..5c5a4d80d1 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <GenericName>Penteconter</GenericName>
     <SpecificName>Pentēkóntoros</SpecificName>
-    <Icon>units/athen_ship_bireme.png</Icon>
+    <Icon>units/athen/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/pentekonter.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml
index 909b19ef8b..e95fe7317b 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <SpecificName>Ploîon Halieutikón</SpecificName>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml
index 915b5f2d56..acd655e53a 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
-    <Icon>units/hele_ship_merchant.png</Icon>
+    <Icon>units/hele/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
index 6c22573037..d7f4e9c914 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
     <GenericName>Athenian Trireme</GenericName>
-    <Icon>units/athen_ship_trireme.png</Icon>
+    <Icon>units/athen/ship_trireme.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml
index 2bcc45ce29..2b77d99e5c 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml
@@ -2,7 +2,7 @@
 <Entity parent="civ/athen|template_unit_siege_stonethrower">
   <Identity>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele/siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_lithobolos_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml
index 55b190d348..8910bfa630 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_lithobolos.png</Icon>
+    <Icon>units/hele/siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_lithobolos_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml
index 14e6a45a74..5f77a318fb 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml
@@ -2,7 +2,7 @@
 <Entity parent="civ/athen|template_unit_siege_boltshooter">
   <Identity>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele/siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_oxybeles_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml
index 86d64c9603..ed1d3e5a64 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="5.0" depth="9.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_oxybeles.png</Icon>
+    <Icon>units/hele/siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_oxybeles_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml
index 576b63665b..928a197574 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml
@@ -2,7 +2,7 @@
 <Entity parent="civ/athen|template_unit_siege_ram">
   <Identity>
     <SpecificName>Krios</SpecificName>
-    <Icon>units/athen_siege_ram.png</Icon>
+    <Icon>units/athen/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
index f2448e102e..44d2db0b8e 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
@@ -3,7 +3,7 @@
   <Identity>
     <SpecificName>Gýnē Athēnaía</SpecificName>
     <GenericName>Athenian Woman</GenericName>
-    <Icon>units/hele_support_female_citizen.png</Icon>
+    <Icon>units/hele/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml
index 2f40b2977d..2167e8d4c7 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
-    <Icon>units/hele_support_healer.png</Icon>
+    <Icon>units/hele/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml
index 20a12cb487..0080152a37 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml
@@ -2,7 +2,7 @@
 <Entity parent="civ/athen|template_unit_support_slave">
   <Identity>
     <SpecificName>Doûlos</SpecificName>
-    <Icon>units/global_slave.png</Icon>
+    <Icon>units/global/slave.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/global/slave.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml
index 5a418459db..da9724aa30 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <SpecificName>Émporos</SpecificName>
-    <Icon>units/hele_support_trader.png</Icon>
+    <Icon>units/hele/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml
index f3eaf077da..3b80cad704 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/brit/cavalry_javelineer_b</SelectionGroupName>
     <SpecificName>Marcacos</SpecificName>
     <GenericName>Raiding Cavalry</GenericName>
-    <Icon>units/brit_cavalry_javelinist.png</Icon>
+    <Icon>units/brit/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml
index ab78d8a44c..9a179a37fb 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/brit/cavalry_swordsman_b</SelectionGroupName>
     <SpecificName>Eporedos</SpecificName>
     <GenericName>Celtic Cavalry</GenericName>
-    <Icon>units/brit_cavalry_swordsman.png</Icon>
+    <Icon>units/brit/cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml
index b2aabcef10..0f2ead431a 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml
@@ -10,7 +10,7 @@
     <SpecificName>Essedon</SpecificName>
     <SelectionGroupName>units/brit/champion_chariot</SelectionGroupName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/brit_champion_chariot.png</Icon>
+    <Icon>units/brit/champion_chariot.png</Icon>
     <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
index 05d9f2c3a9..6498fec14f 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
@@ -4,7 +4,7 @@
     <Civ>brit</Civ>
     <GenericName>Brythonic Champion</GenericName>
     <SpecificName>Argos</SpecificName>
-    <Icon>units/brit_champion_infantry.png</Icon>
+    <Icon>units/brit/champion_infantry.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
index 7b06bf4c44..e18873a991 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
@@ -13,7 +13,7 @@
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/brit_hero_boudicca.png</Icon>
+    <Icon>units/brit/hero_boudicca.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml
index aafddc58c0..7804013de8 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml
@@ -8,7 +8,7 @@
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
     <Phenotype>female</Phenotype>
-    <Icon>units/brit_hero_boudicca.png</Icon>
+    <Icon>units/brit/hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_cavalry_javelinist_boudicca_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml b/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml
index 983d665e28..ca7dbb11a9 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml
@@ -8,7 +8,7 @@
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
     <Phenotype>female</Phenotype>
-    <Icon>units/brit_hero_boudicca.png</Icon>
+    <Icon>units/brit/hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_infantry_swordsman_boudicca.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml b/binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml
index 8434a2dbe4..f357181760 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml
@@ -7,7 +7,7 @@
     <Civ>brit</Civ>
     <GenericName>Caratacus</GenericName>
     <SpecificName>Caratacos</SpecificName>
-    <Icon>units/brit_hero_caratacos.png</Icon>
+    <Icon>units/brit/hero_caratacos.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_infantry_swordsman_caratacos.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml b/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml
index 30a7245608..e6c3c20a06 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml
@@ -7,7 +7,7 @@
     <Civ>brit</Civ>
     <GenericName>Cunobeline</GenericName>
     <SpecificName>Cunobelinos</SpecificName>
-    <Icon>units/brit_hero_cunobelin.png</Icon>
+    <Icon>units/brit/hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_cavalry_swordsman_cunobelin_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml b/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml
index 301e8a9a3b..541a1974ea 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml
@@ -7,7 +7,7 @@
     <Civ>brit</Civ>
     <GenericName>Cunobeline</GenericName>
     <SpecificName>Cunobelinos</SpecificName>
-    <Icon>units/brit_hero_cunobelin.png</Icon>
+    <Icon>units/brit/hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_infantry_swordsman_cunobelin.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml
index a9a7eec83a..04eb05d00d 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml
@@ -11,7 +11,7 @@
     <Civ>brit</Civ>
     <SelectionGroupName>units/brit/infantry_javelineer_b</SelectionGroupName>
     <SpecificName>Adretos</SpecificName>
-    <Icon>units/brit_infantry_javelinist.png</Icon>
+    <Icon>units/brit/infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/infantry_slinger_b.xml
index 4150992f11..dd186c8a4d 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/infantry_slinger_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/brit/infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Talmoris</SpecificName>
-    <Icon>units/gaul_infantry_slinger.png</Icon>
+    <Icon>units/gaul/infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit/infantry_slinger_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/infantry_spearman_b.xml
index 5e3b696bb3..0263948aaa 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/infantry_spearman_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/brit/infantry_spearman_b</SelectionGroupName>
     <GenericName>Celtic Spearman</GenericName>
     <SpecificName>Catucos</SpecificName>
-    <Icon>units/brit_infantry_spearman.png</Icon>
+    <Icon>units/brit/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/brit/ship_fishing.xml
index 96922a8895..dc6bbcd3ea 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Longos</SpecificName>
-    <Icon>units/celt_ship_fishing.png</Icon>
+    <Icon>units/celt/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/brit/ship_merchant.xml
index e5f1b2742c..51482c9c8d 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Nauson</SpecificName>
-    <Icon>units/celt_ship_merchant.png</Icon>
+    <Icon>units/celt/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/merchant_ship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
index 92f3effbf5..c456896dd9 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
@@ -16,7 +16,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Pontos</SpecificName>
-    <Icon>units/celt_ship_trireme.png</Icon>
+    <Icon>units/celt/ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml
index a94f391bd8..7f663a282f 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Molton</SpecificName>
-    <Icon>units/celt_siege_ram.png</Icon>
+    <Icon>units/celt/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml
index 4a47184d39..790e5fd407 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml
@@ -4,7 +4,7 @@
     <Civ>brit</Civ>
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
-    <Icon>units/celt_support_female_citizen.png</Icon>
+    <Icon>units/celt/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_healer_b.xml
index 26a15eb564..6550524244 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_healer_b.xml
@@ -4,7 +4,7 @@
     <Civ>brit</Civ>
     <GenericName>Druid</GenericName>
     <SpecificName>Druid</SpecificName>
-    <Icon>units/celt_support_healer.png</Icon>
+    <Icon>units/celt/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_trader.xml
index 4a7fd4638f..b78e84eb27 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Uogition</SpecificName>
-    <Icon>units/celt_support_trader.png</Icon>
+    <Icon>units/celt/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/war_dog.xml b/binaries/data/mods/public/simulation/templates/units/brit/war_dog.xml
index 161a0eb569..4179f007fd 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/war_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/war_dog.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Agrocuna</SpecificName>
-    <Icon>units/brit_war_dog.png</Icon>
+    <Icon>units/brit/war_dog.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/war_dog_mastiff_b.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml
index 7d92e8e301..83069d090a 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/cart/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Numidian Cavalry</GenericName>
     <SpecificName>Ḥayyāl Raḫūv Masili</SpecificName>
-    <Icon>units/cart_cavalry_javelinist.png</Icon>
+    <Icon>units/cart/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
index f6f7b5c7fe..0123ed5669 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
@@ -5,7 +5,7 @@
     <GenericName>Italic Cavalry</GenericName>
     <SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
     <SelectionGroupName>units/cart/cavalry_spearman_ital_b</SelectionGroupName>
-    <Icon>units/cart_cavalry_spearman.png</Icon>
+    <Icon>units/cart/cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
index c4b638ace8..967d0cf207 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
@@ -5,7 +5,7 @@
     <GenericName>Gallic Mercenary Cavalry</GenericName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
     <SelectionGroupName>units/cart/cavalry_swordsman_gaul_b</SelectionGroupName>
-    <Icon>units/cart_cavalry_swordsman_2.png</Icon>
+    <Icon>units/cart/cavalry_swordsman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
index 6112720c5e..b6996430e9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
@@ -10,7 +10,7 @@
     <GenericName>Iberian Heavy Cavalry</GenericName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
     <SelectionGroupName>units/cart/cavalry_swordsman_iber_b</SelectionGroupName>
-    <Icon>units/cart_cavalry_swordsman.png</Icon>
+    <Icon>units/cart/cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/cart/champion_cavalry.xml
index 38939cb446..18d539798e 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/champion_cavalry.xml
+++ b/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_champion_cavalry.png</Icon>
+    <Icon>units/cart/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
index c9cf9012bd..3d2ff3a961 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
@@ -5,7 +5,7 @@
     <GenericName>North African War Elephant</GenericName>
     <SpecificName>Pil Malḥamit</SpecificName>
     <Classes datatype="tokens">AfricanElephant</Classes>
-    <Icon>units/cart_champion_elephant.png</Icon>
+    <Icon>units/cart/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/elephantry_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/cart/champion_infantry.xml
index 539f2f3564..742cd2c5dc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/champion_infantry.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <GenericName>Sacred Band Infantry</GenericName>
     <SpecificName>Sacred Band of Ba'al</SpecificName>
-    <Icon>units/cart_champion_infantry.png</Icon>
+    <Icon>units/cart/champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_spearman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/champion_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/cart/champion_pikeman.xml
index dd86584377..2dd38c0ca6 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/champion_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/champion_pikeman.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <GenericName>Sacred Band Pikeman</GenericName>
     <SpecificName>Mašal</SpecificName>
-    <Icon>units/cart_champion_infantry.png</Icon>
+    <Icon>units/cart/champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_pikeman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml b/binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml
index c724e40ce3..a29c103cc4 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml
@@ -13,7 +13,7 @@
     <Civ>cart</Civ>
     <GenericName>Hamilcar Barca</GenericName>
     <SpecificName>Ḥimelqart Baraq</SpecificName>
-    <Icon>units/cart_hero_hamilcar.png</Icon>
+    <Icon>units/cart/hero_hamilcar.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/hero_cavalry_swordsman_hamilcar_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml b/binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml
index aba9905305..22041a3eb0 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml
@@ -7,7 +7,7 @@
     <Civ>cart</Civ>
     <GenericName>Hannibal Barca</GenericName>
     <SpecificName>Ḥannibaʿal Baraq</SpecificName>
-    <Icon>units/cart_hero_hannibal.png</Icon>
+    <Icon>units/cart/hero_hannibal.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/hero_elephantry_hannibal_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml b/binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml
index 1b8722b58e..d78d906cb2 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml
@@ -7,7 +7,7 @@
     <Civ>cart</Civ>
     <GenericName>Maharbal</GenericName>
     <SpecificName>Maharbaʿal</SpecificName>
-    <Icon>units/cart_hero_maharbal.png</Icon>
+    <Icon>units/cart/hero_maharbal.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/hero_cavalry_spearman_maharbal_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml
index 982115ddbe..1b007e09fc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml
@@ -13,7 +13,7 @@
     <SelectionGroupName>units/cart/infantry_archer_b</SelectionGroupName>
     <GenericName>Mauritanian Archer</GenericName>
     <SpecificName>Qešet</SpecificName>
-    <Icon>units/cart_infantry_archer.png</Icon>
+    <Icon>units/cart/infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart/infantry_archer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
index 454cf6a1c9..3d639f83bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
@@ -13,7 +13,7 @@
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
     <SelectionGroupName>units/cart/infantry_javelineer_iber_b</SelectionGroupName>
-    <Icon>units/cart_infantry_javelinist.png</Icon>
+    <Icon>units/cart/infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
index b7d3b32eb4..2b4e1ffbcf 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
@@ -13,7 +13,7 @@
     <GenericName>Balearic Slinger</GenericName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
     <SelectionGroupName>units/cart/infantry_slinger_iber_b</SelectionGroupName>
-    <Icon>units/cart_infantry_slinger.png</Icon>
+    <Icon>units/cart/infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml
index 65eb5c3e23..9d82642b98 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml
@@ -13,7 +13,7 @@
     <SelectionGroupName>units/cart/infantry_spearman_b</SelectionGroupName>
     <GenericName>Libyan Spearman</GenericName>
     <SpecificName>Sǝḫīr Ḥanīt</SpecificName>
-    <Icon>units/cart_infantry_spearman.png</Icon>
+    <Icon>units/cart/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
index 38682a0b2a..154fb0a87f 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
@@ -13,7 +13,7 @@
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
     <SelectionGroupName>units/cart/infantry_swordsman_gaul_b</SelectionGroupName>
-    <Icon>units/cart_infantry_swordsman.png</Icon>
+    <Icon>units/cart/infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
index 6c1bdb7715..c8277742dc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
@@ -13,7 +13,7 @@
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
     <SelectionGroupName>units/cart/infantry_swordsman_ital_b</SelectionGroupName>
-    <Icon>units/cart_infantry_swordsman_2.png</Icon>
+    <Icon>units/cart/infantry_swordsman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
index 5a70e2d5fe..0e4004b4a1 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
@@ -8,7 +8,7 @@
     <Civ>cart</Civ>
     <GenericName>Bireme</GenericName>
     <SpecificName>Du-Mašōt</SpecificName>
-    <Icon>units/cart_ship_bireme.png</Icon>
+    <Icon>units/cart/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/carthaginians/bireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/cart/ship_fishing.xml
index ae48206daf..cceb88f494 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Noon-Mašōt</SpecificName>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml
index 932f63d7ca..8b2781a752 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml
@@ -8,7 +8,7 @@
     <Civ>cart</Civ>
     <SpecificName>Seḥer</SpecificName>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures. Carthaginians have +25% sea trading bonus.</Tooltip>
-    <Icon>units/cart_ship_merchant.png</Icon>
+    <Icon>units/cart/ship_merchant.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Selectable>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml
index 50e576dcb7..95bf256272 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <GenericName>Quinquereme</GenericName>
     <SpecificName>Ḥameš-Mašōt</SpecificName>
-    <Icon>units/cart_ship_quinquereme.png</Icon>
+    <Icon>units/cart/ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/carthaginians/quinquereme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml
index 9d4199ae6f..247b811009 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml
@@ -8,7 +8,7 @@
     <Civ>cart</Civ>
     <GenericName>Trireme</GenericName>
     <SpecificName>Tlat-Mašōt</SpecificName>
-    <Icon>units/cart_ship_trireme.png</Icon>
+    <Icon>units/cart/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/carthaginians/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_packed.xml b/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_packed.xml
index 19a749ee4c..e8517ed704 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Ballista</SpecificName>
-    <Icon>units/cart_siege_ballista_packed.png</Icon>
+    <Icon>units/cart/siege_ballista_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_ballista_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml
index 3f3fa72ee1..7db8a3d712 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/cart_siege_ballista.png</Icon>
+    <Icon>units/cart/siege_ballista.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_ballista_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml
index 009fd78ed0..0fb35092bc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/cart_siege_oxybeles_packed.png</Icon>
+    <Icon>units/cart/siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_oxybeles_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml
index 1085e03909..b7c0cc2570 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="5.0" depth="9.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/cart_siege_oxybeles.png</Icon>
+    <Icon>units/cart/siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_oxybeles_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml
index 437f9042d7..0ecd688e3d 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_siege_ram">
   <Identity>
     <Civ>cart</Civ>
-    <Icon>units/iber_siege_ram.png</Icon>
+    <Icon>units/iber/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml
index 9b4ffc2064..941565ca88 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml
@@ -12,7 +12,7 @@
     <Civ>cart</Civ>
     <SpecificName>Aštāh</SpecificName>
     <GenericName>Carthaginian Woman</GenericName>
-    <Icon>units/cart_support_female_citizen.png</Icon>
+    <Icon>units/cart/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/cart/support_healer_b.xml
index bbde1c5e64..ee787441d9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/support_healer_b.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <Phenotype>female</Phenotype>
     <SpecificName>Kehinit</SpecificName>
-    <Icon>units/cart_support_healer.png</Icon>
+    <Icon>units/cart/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/cart/support_trader.xml
index 0b04841b1e..8ee7692ecc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Mekir</SpecificName>
-    <Icon>units/cart_support_trader.png</Icon>
+    <Icon>units/cart/support_trader.png</Icon>
   </Identity>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml
index 270368d17e..95cdac51f7 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml
@@ -4,7 +4,7 @@
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/cavalry_javelineer_b</SelectionGroupName>
     <SpecificName>Marcacos</SpecificName>
-    <Icon>units/gaul_cavalry_javelinist.png</Icon>
+    <Icon>units/gaul/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/gaul/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml
index c8bec95a59..fc99c3e6be 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml
@@ -4,7 +4,7 @@
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/cavalry_swordsman_b</SelectionGroupName>
     <SpecificName>Eporedos</SpecificName>
-    <Icon>units/gaul_cavalry_swordsman.png</Icon>
+    <Icon>units/gaul/cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry.xml
index 1c6ff8b659..7545ce69e2 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry.xml
@@ -5,7 +5,7 @@
     <GenericName>Gallic Noble Cavalry</GenericName>
     <SpecificName>Uerouicos</SpecificName>
     <SelectionGroupName>units/gaul/champion_cavalry</SelectionGroupName>
-    <Icon>units/gaul_champion_cavalry.png</Icon>
+    <Icon>units/gaul/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/gauls/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml
index 0e6028718b..cc7e9b4b27 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml
@@ -11,7 +11,7 @@
     <Civ>gaul</Civ>
     <GenericName>Naked Fanatic</GenericName>
     <SpecificName>Bariogaisatos</SpecificName>
-    <Icon>units/gaul_champion_fanatic.png</Icon>
+    <Icon>units/gaul/champion_fanatic.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
index 34799a3791..77112c6b68 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Soliduros</SpecificName>
-    <Icon>units/gaul_champion_infantry.png</Icon>
+    <Icon>units/gaul/champion_infantry.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_trumpeter.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_trumpeter.xml
index fa68fde551..08ee30e50e 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_trumpeter.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_trumpeter.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Carnucos</SpecificName>
-    <Icon>units/gaul_champion_swordsman_carnyx.png</Icon>
+    <Icon>units/gaul/champion_swordsman_carnyx.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/gauls/infantry_carnyx_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml b/binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml
index 659da24277..06402265fe 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml
@@ -7,7 +7,7 @@
     <Civ>gaul</Civ>
     <GenericName>Brennus</GenericName>
     <SpecificName>Brennos</SpecificName>
-    <Icon>units/gaul_hero_brennus.png</Icon>
+    <Icon>units/gaul/hero_brennus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/gauls/hero_infantry_swordsman_brennus.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml
index 3e16778e10..b47726e838 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml
@@ -7,7 +7,7 @@
     <Civ>gaul</Civ>
     <GenericName>Vercingetorix</GenericName>
     <SpecificName>Uercingetorix</SpecificName>
-    <Icon>units/gaul_hero_vercingetorix.png</Icon>
+    <Icon>units/gaul/hero_vercingetorix.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/gauls/hero_cavalry_swordsman_vercingetorix_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml b/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml
index ad2c32ec52..d0d6ca140b 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml
@@ -7,7 +7,7 @@
     <Civ>gaul</Civ>
     <GenericName>Vercingetorix</GenericName>
     <SpecificName>Uercingetorix</SpecificName>
-    <Icon>units/gaul_hero_vercingetorix.png</Icon>
+    <Icon>units/gaul/hero_vercingetorix.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/gauls/hero_infantry_swordsman_vercingetorix.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml b/binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml
index 9500b5b50a..d7929e31f0 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml
@@ -7,7 +7,7 @@
     <Civ>gaul</Civ>
     <GenericName>Viridomarus</GenericName>
     <SpecificName>Britomaros</SpecificName>
-    <Icon>units/gaul_hero_viridomarus.png</Icon>
+    <Icon>units/gaul/hero_viridomarus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/gauls/hero_infantry_spearman_viridomarus.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
index 3b6874de6b..e877ec7775 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
@@ -9,7 +9,7 @@
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_javelineer_b</SelectionGroupName>
     <SpecificName>Adretos</SpecificName>
-    <Icon>units/gaul_infantry_javelinist.png</Icon>
+    <Icon>units/gaul/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/gaul/infantry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
index df7fd11422..2cacb88fae 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
@@ -9,7 +9,7 @@
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_slinger_b</SelectionGroupName>
     <SpecificName>Talmoris</SpecificName>
-    <Icon>units/gaul_infantry_slinger.png</Icon>
+    <Icon>units/gaul/infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
index 38e0e692fa..3b0f267528 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
@@ -9,7 +9,7 @@
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_spearman_b</SelectionGroupName>
     <SpecificName>Catucos</SpecificName>
-    <Icon>units/gaul_infantry_spearman.png</Icon>
+    <Icon>units/gaul/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/gaul/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/gaul/ship_fishing.xml
index fb67f27e39..3ab8864081 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Longos</SpecificName>
-    <Icon>units/celt_ship_fishing.png</Icon>
+    <Icon>units/celt/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/gaul/ship_merchant.xml
index 64e8649eb1..7e22ae776b 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Nauson</SpecificName>
-    <Icon>units/celt_ship_merchant.png</Icon>
+    <Icon>units/celt/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/merchant_ship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
index a5201edc3e..bf1d7e5faf 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
@@ -16,7 +16,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Pontos</SpecificName>
-    <Icon>units/celt_ship_trireme.png</Icon>
+    <Icon>units/celt/ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml
index 0aac4c5364..55444d7a8a 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Molton</SpecificName>
-    <Icon>units/celt_siege_ram.png</Icon>
+    <Icon>units/celt/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
index 1406558cc5..f2c0f25843 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
@@ -9,7 +9,7 @@
     <Civ>gaul</Civ>
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
-    <Icon>units/celt_support_female_citizen.png</Icon>
+    <Icon>units/celt/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_healer_b.xml
index 8564c8d5df..eb062eed44 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_healer_b.xml
@@ -4,7 +4,7 @@
     <Civ>gaul</Civ>
     <GenericName>Druid</GenericName>
     <SpecificName>Druid</SpecificName>
-    <Icon>units/celt_support_healer.png</Icon>
+    <Icon>units/celt/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/gaul/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_trader.xml
index 3636df66f7..0655499331 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Uogition</SpecificName>
-    <Icon>units/celt_support_trader.png</Icon>
+    <Icon>units/celt/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml
index fb73e0d018..0991f32539 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml
@@ -2,8 +2,9 @@
 <Entity parent="template_unit_siege_ram">
   <Identity>
     <SpecificName>Gōngchéng Chuí</SpecificName>
-    <Icon>units/athen_siege_ram.png</Icon>
+    <Icon>units/athen/siege_ram.png</Icon>
   </Identity>
+  <!-- Needs new battering ram model -->
   <VisualActor>
     <Actor>structures/athenians/siege_ram.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml
index a9e3dcbf3f..5c1dad88e7 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml
@@ -4,7 +4,7 @@
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/cavalry_javelineer_b</SelectionGroupName>
     <SpecificName>Kantabriako Zaldun</SpecificName>
-    <Icon>units/iber_cavalry_javelinist.png</Icon>
+    <Icon>units/iber/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/iber/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml
index 2e0eb9708f..77b919ceed 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml
@@ -4,7 +4,7 @@
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/cavalry_spearman_b</SelectionGroupName>
     <SpecificName>Lantzari</SpecificName>
-    <Icon>units/iber_cavalry_spearman.png</Icon>
+    <Icon>units/iber/cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry.xml
index 0087857e63..58a9a06aa0 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry.xml
@@ -25,7 +25,7 @@
     <Civ>iber</Civ>
     <SpecificName>Leial Zalduneria</SpecificName>
     <SelectionGroupName>units/iber/champion_cavalry</SelectionGroupName>
-    <Icon>units/iber_champion_cavalry.png</Icon>
+    <Icon>units/iber/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/cavalry_javelinist_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
index 644b67d6e8..15f9016297 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
@@ -8,7 +8,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Leial Ezpatari</SpecificName>
-    <Icon>units/iber_champion_infantry.png</Icon>
+    <Icon>units/iber/champion_infantry.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml b/binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml
index aa692caa61..fb5ed9e995 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Caros</SpecificName>
-    <Icon>units/iber_hero_caros.png</Icon>
+    <Icon>units/iber/hero_caros.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_infantry_swordsman_caros.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml b/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml
index b3efe35a89..22f28867d8 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Indibil</SpecificName>
-    <Icon>units/iber_hero_indibil.png</Icon>
+    <Icon>units/iber/hero_indibil.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_cavalry_spearman_indibil_h.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml b/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml
index a365a3a1f1..8c1ebc0011 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Indibil</SpecificName>
-    <Icon>units/iber_hero_indibil.png</Icon>
+    <Icon>units/iber/hero_indibil.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_infantry_spearman_indibil.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml b/binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml
index 4363a49b08..a416a930f2 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Viriato</SpecificName>
-    <Icon>units/iber_hero_viriato.png</Icon>
+    <Icon>units/iber/hero_viriato.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_infantry_swordsman_viriato.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml
index 0c707877dd..8978030f13 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml
@@ -9,7 +9,7 @@
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_javelineer_b</SelectionGroupName>
     <SpecificName>Lusitano Ezpatari</SpecificName>
-    <Icon>units/iber_infantry_javelinist.png</Icon>
+    <Icon>units/iber/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/iber/infantry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml
index cc5575f10b..0b56c07cbd 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml
@@ -9,7 +9,7 @@
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_slinger_b</SelectionGroupName>
     <SpecificName>Habailari</SpecificName>
-    <Icon>units/iber_infantry_slinger.png</Icon>
+    <Icon>units/iber/infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml
index 8b74a2a701..4679848e20 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml
@@ -9,7 +9,7 @@
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_spearman_b</SelectionGroupName>
     <SpecificName>Ezkutari</SpecificName>
-    <Icon>units/iber_infantry_spearman.png</Icon>
+    <Icon>units/iber/infantry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml
index f75dbe78c0..0b82ed8c73 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml
@@ -14,7 +14,7 @@
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_swordsman_b</SelectionGroupName>
     <SpecificName>Ezpatari</SpecificName>
-    <Icon>units/iber_infantry_swordsman.png</Icon>
+    <Icon>units/iber/infantry_swordsman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/iber/infantry_swordsman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/ship_fire.xml b/binaries/data/mods/public/simulation/templates/units/iber/ship_fire.xml
index 7a43cd0d45..e4a815327e 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/ship_fire.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Iberian Fire Ship</SpecificName>
-    <Icon>units/iber_ship_fire.png</Icon>
+    <Icon>units/iber/ship_fire.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/fireship_fire.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/iber/ship_fishing.xml
index a0793d7561..32cdf4d68b 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Arrantza Ontzi</SpecificName>
-    <Icon>units/iber_ship_fishing.png</Icon>
+    <Icon>units/iber/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/fishing_ship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml
index 173e9cf4c4..14365af2e5 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Merkataritza Itsasontzi</SpecificName>
-    <Icon>units/iber_ship_merchant.png</Icon>
+    <Icon>units/iber/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
index c6b045110a..e90726fcb4 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
@@ -16,7 +16,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Ponti</SpecificName>
-    <Icon>units/celt_ship_trireme.png</Icon>
+    <Icon>units/celt/ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml
index 60ec9480b8..6a97c14251 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Ahariburu</SpecificName>
-    <Icon>units/iber_siege_ram.png</Icon>
+    <Icon>units/iber/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml
index 85a470f31b..6b6bd9aa34 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml
@@ -9,7 +9,7 @@
     <Civ>iber</Civ>
     <SpecificName>Emazteki</SpecificName>
     <GenericName>Iberian Woman</GenericName>
-    <Icon>units/iber_support_female_citizen.png</Icon>
+    <Icon>units/iber/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/support_healer_b.xml
index 6f1ac12c21..93ce0a3818 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Phenotype>female</Phenotype>
     <GenericName>Priestess of Ataekina</GenericName>
     <SpecificName>Emakumezko Apaiz de Ataekina</SpecificName>
-    <Icon>units/iber_support_healer.png</Icon>
+    <Icon>units/iber/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/iber/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/iber/support_trader.xml
index ee77ac2baa..cf522a7b0b 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Merkatari</SpecificName>
-    <Icon>units/iber_support_trader.png</Icon>
+    <Icon>units/iber/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml
index e0a5204706..798ee2ea8b 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml
@@ -7,7 +7,7 @@
     <SpecificName>iry hr ssmwtt</SpecificName>
     <GenericName>Napatan Light Cavalry</GenericName>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Icon>units/kush_cavalry_javelinist.png</Icon>
+    <Icon>units/kush/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/kush/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
index 9eba987ab6..5241d2cd80 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
@@ -17,7 +17,7 @@
     <GenericName>Blemmye Desert Raider</GenericName>
     <SpecificName>nhw Bulahau gml</SpecificName>
     <VisibleClasses datatype="tokens">Camel</VisibleClasses>
-    <Icon>units/kush_camel_javelinist.png</Icon>
+    <Icon>units/kush/camel_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml
index 39c9b76051..362fb98e4e 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/kush/cavalry_spearman_b</SelectionGroupName>
     <GenericName>Meroitic Heavy Cavalry</GenericName>
     <SpecificName>Htr</SpecificName>
-    <Icon>units/kush_cavalry_spearman.png</Icon>
+    <Icon>units/kush/cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_cavalry.xml
index d75c648819..459f30be20 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_cavalry.xml
@@ -5,7 +5,7 @@
     <Lang>napatan</Lang>
     <GenericName>Noble Cavalry</GenericName>
     <SpecificName>Htr Msʿ n mh-ib</SpecificName>
-    <Icon>units/kush_champion_cavalry.png</Icon>
+    <Icon>units/kush/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
index 58fb16053d..48f2cf30ae 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
@@ -6,7 +6,7 @@
     <GenericName>Meroitic War Elephant</GenericName>
     <SpecificName>Abore ʿhȝ</SpecificName>
     <Classes datatype="tokens">AfricanElephant</Classes>
-    <Icon>units/kush_champion_elephant.png</Icon>
+    <Icon>units/kush/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/elephantry_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_amun.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_amun.xml
index 96181fc558..7eed12a5d0 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_amun.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_amun.xml
@@ -11,7 +11,7 @@
     <Classes datatype="tokens">AmunGuard</Classes>
     <GenericName>Napatan Temple Guard</GenericName>
     <SpecificName>rs ʿImn</SpecificName>
-    <Icon>units/kush_champion_amun.png</Icon>
+    <Icon>units/kush/champion_amun.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/infantry_swordsman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_apedemak.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_apedemak.xml
index 4d1f2b733a..4b4633ab3d 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_apedemak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_apedemak.xml
@@ -6,7 +6,7 @@
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ʿIprmk</SpecificName>
     <Classes datatype="tokens">ApedemakGuard</Classes>
-    <Icon>units/kush_champion_apedemak.png</Icon>
+    <Icon>units/kush/champion_apedemak.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/infantry_axeman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
index f71db89056..71d355d685 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
@@ -5,7 +5,7 @@
     <Lang>napatan</Lang>
     <GenericName>Noble Archer</GenericName>
     <SpecificName>Hry pdty</SpecificName>
-    <Icon>units/kush_champion_archer.png</Icon>
+    <Icon>units/kush/champion_archer.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml b/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
index 5141a23f1d..9a709abb36 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
@@ -14,7 +14,7 @@
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/kush_hero_amanirenas.png</Icon>
+    <Icon>units/kush/hero_amanirenas.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml b/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml
index 1133d40d3c..8ab2b506dd 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml
@@ -9,7 +9,7 @@
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
     <Phenotype>female</Phenotype>
-    <Icon>units/kush_hero_amanirenas.png</Icon>
+    <Icon>units/kush/hero_amanirenas.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_infantry_archer_amanirenas.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml b/binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml
index 6fca89a7cc..8c8318ea93 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml
@@ -10,7 +10,7 @@
     <Lang>napatan</Lang>
     <GenericName>Arakamani</GenericName>
     <SpecificName>I͗rk-k-I͗mn H̱nm-ı͗-Rʿ</SpecificName>
-    <Icon>units/kush_hero_arakamani.png</Icon>
+    <Icon>units/kush/hero_arakamani.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_elephantry_arakamani_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml b/binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml
index 0bc87f90ea..15a9b7bc9a 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml
@@ -4,7 +4,7 @@
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
     <SpecificName>Ḥr-sȝ-it.f Sȝ-mrı͗-I͗mn</SpecificName>
-    <Icon>units/kush_hero_harsiotef.png</Icon>
+    <Icon>units/kush/hero_harsiotef.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_cavalry_spearman_harsiotef_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml b/binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml
index 67c97fa539..9ce7f645d5 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml
@@ -9,7 +9,7 @@
     <Lang>napatan</Lang>
     <GenericName>Nastasen</GenericName>
     <SpecificName>N-ı͗-s-tȝ-s-nn Kȝ-ʿnḫ-Rʿ</SpecificName>
-    <Icon>units/kush_hero_nastasen.png</Icon>
+    <Icon>units/kush/hero_nastasen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_cavalry_spearman_nastasen_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml
index 70812f7c8c..d4fba29146 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml
@@ -15,7 +15,7 @@
     <GenericName>Nubian Archer</GenericName>
     <SpecificName>Pdty Nhsyw</SpecificName>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Icon>units/kush_infantry_archer.png</Icon>
+    <Icon>units/kush/infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/kush/infantry_archer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
index 7388ea4576..77f1f724a2 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
@@ -14,7 +14,7 @@
     <SelectionGroupName>units/kush/infantry_javelineer_merc_b</SelectionGroupName>
     <GenericName>Noba Skirmisher</GenericName>
     <SpecificName>nhw ʿhȝw Noba</SpecificName>
-    <Icon>units/kush_infantry_javelinist.png</Icon>
+    <Icon>units/kush/infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
index e7af886f92..38ac1c12fc 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
@@ -14,7 +14,7 @@
     <SelectionGroupName>units/kush/infantry_maceman_b</SelectionGroupName>
     <GenericName>Noba Maceman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
-    <Icon>units/kush_infantry_maceman.png</Icon>
+    <Icon>units/kush/infantry_maceman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml
index 266e6ee280..af67dcd1c7 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml
@@ -14,7 +14,7 @@
     <SelectionGroupName>units/kush/infantry_pikeman_b</SelectionGroupName>
     <GenericName>Meroitic Pikeman</GenericName>
     <SpecificName>siȝwrd</SpecificName>
-    <Icon>units/kush_infantry_pikeman.png</Icon>
+    <Icon>units/kush/infantry_pikeman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml
index 8817922c3b..56d81e2e91 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml
@@ -15,7 +15,7 @@
     <GenericName>Nubian Spearman</GenericName>
     <SpecificName>iry-rdwy Nhsyw</SpecificName>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Icon>units/kush_infantry_spearman.png</Icon>
+    <Icon>units/kush/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/kush/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml
index 291493e999..299fd3c1b4 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml
@@ -14,7 +14,7 @@
     <SelectionGroupName>units/kush/infantry_swordsman_b</SelectionGroupName>
     <GenericName>Meroitic Swordsman</GenericName>
     <SpecificName>knw hps</SpecificName>
-    <Icon>units/kush_infantry_swordsman.png</Icon>
+    <Icon>units/kush/infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
index 03925c6d24..d2806cc241 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
-    <Icon>units/kush_ship_bireme.png</Icon>
+    <Icon>units/kush/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/kushites/bireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml
index d50932cdc6..3241325c1b 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml
@@ -8,7 +8,7 @@
     <Civ>kush</Civ>
     <GenericName>Fishing Boat</GenericName>
     <SpecificName>Whʿ-rmw</SpecificName>
-    <Icon>units/ptol_ship_fishing.png</Icon>
+    <Icon>units/ptol/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/kushites/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml
index 61446c6d1b..32ee4e4faa 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml
@@ -8,7 +8,7 @@
     <Civ>kush</Civ>
     <GenericName>Nile Trading Barge</GenericName>
     <SpecificName>Dȝy sbt</SpecificName>
-    <Icon>units/ptol_ship_merchant.png</Icon>
+    <Icon>units/ptol/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/merchant_ship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
index 72eac5ad44..24a70e4640 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
@@ -9,7 +9,7 @@
     <Classes datatype="tokens">KushTrireme</Classes>
     <GenericName>Ptolemaic Mercenary Trireme</GenericName>
     <SpecificName>shry ʿȝ</SpecificName>
-    <Icon>units/kush_ship_trireme.png</Icon>
+    <Icon>units/kush/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/kushites/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml
index 70ffac3f25..c527b6d4d6 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml
@@ -16,7 +16,7 @@
   </GarrisonHolder>
   <Identity>
     <Civ>kush</Civ>
-    <Icon>units/pers_siege_ram.png</Icon>
+    <Icon>units/pers/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/siege_tower.xml b/binaries/data/mods/public/simulation/templates/units/kush/siege_tower.xml
index 604fd60e36..677ae4eb1a 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/siege_tower.xml
@@ -4,7 +4,7 @@
     <Civ>kush</Civ>
     <GenericName>Kushite Siege Tower</GenericName>
     <SpecificName>iwn n ms</SpecificName>
-    <Icon>units/hele_siege_tower.png</Icon>
+    <Icon>units/hele/siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/siege_tower.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml
index 0b0f2f7e57..a42af46e1d 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml
@@ -13,7 +13,7 @@
     <Lang>napatan</Lang>
     <SpecificName>Shmt</SpecificName>
     <GenericName>Kushite Woman</GenericName>
-    <Icon>units/kush_support_female_citizen.png</Icon>
+    <Icon>units/kush/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/support_healer_b.xml
index e64f29dcb6..f591390e6a 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Lang>napatan</Lang>
     <GenericName>Priest</GenericName>
     <SpecificName>wʿb nsw</SpecificName>
-    <Icon>units/kush_support_healer.png</Icon>
+    <Icon>units/kush/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/kush/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/kush/support_trader.xml
index f41d45e063..1225ef71c3 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/support_trader.xml
@@ -9,7 +9,7 @@
     <Lang>napatan</Lang>
     <GenericName>Nilotic Merchant</GenericName>
     <SpecificName>rmt sbt</SpecificName>
-    <Icon>units/kush_support_trader.png</Icon>
+    <Icon>units/kush/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
index b7067f1e4f..5734d57fa1 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/mace/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Odrysian Skirmish Cavalry</GenericName>
     <SpecificName>Hippakontistḕs Odrysós</SpecificName>
-    <Icon>units/mace_cavalry_javelinist.png</Icon>
+    <Icon>units/mace/cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml
index 4af23d10dc..f96980d766 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/mace/cavalry_spearman_b</SelectionGroupName>
     <GenericName>Thessalian Lancer</GenericName>
     <SpecificName>Xystophóros Thessalikós</SpecificName>
-    <Icon>units/mace_cavalry_spearman.png</Icon>
+    <Icon>units/mace/cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/mace/cavalry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry.xml
index 90226f5ba3..079b9132e0 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry.xml
+++ b/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/mace_champion_cavalry.png</Icon>
+    <Icon>units/mace/champion_cavalry.png</Icon>
     <SelectionGroupName>units/mace/champion_cavalry</SelectionGroupName>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
index c93d37f2dd..b3eab2e297 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
@@ -4,7 +4,7 @@
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <SpecificName>Gastraphetophoros</SpecificName>
-    <Icon>units/mace_champion_infantry_crossbowman.png</Icon>
+    <Icon>units/mace/champion_infantry_crossbowman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/infantry_crossbowman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
index beb04172cc..2e553d0de7 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
@@ -6,7 +6,7 @@
     <GenericName>Macedonian Shield Bearer</GenericName>
     <SpecificName>Hypaspistḗs</SpecificName>
     <SelectionGroupName>units/mace/champion_infantry_spearman</SelectionGroupName>
-    <Icon>units/mace_hypaspist.png</Icon>
+    <Icon>units/mace/hypaspist.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml
index 543ba7b406..cc0995cb7a 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml
@@ -13,7 +13,7 @@
   </Health>
   <Identity>
     <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
-    <Icon>units/mace_argyraspidai.png</Icon>
+    <Icon>units/mace/argyraspidai.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
index e70d07ccd3..94be1af285 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
@@ -10,7 +10,7 @@
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
-    <Icon>units/thracian_rhomphaia.png</Icon>
+    <Icon>units/thrac/champion_infantry_swordsman.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml b/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
index b23c25446a..b3dbb437d9 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
@@ -21,7 +21,7 @@
     <GenericName>Alexander III the Great</GenericName>
     <SpecificName>Alexandros ho Megas</SpecificName>
     <Tooltip>Counters: 1.2× vs Heroes.</Tooltip>
-    <Icon>units/mace_hero_alexander.png</Icon>
+    <Icon>units/mace/hero_alexander.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_cavalry_swordsman_alexander_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml b/binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml
index 35e4d0ecf8..b92285f386 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml
@@ -13,7 +13,7 @@
     <Lang>greek</Lang>
     <GenericName>Craterus</GenericName>
     <SpecificName>Krateros</SpecificName>
-    <Icon>units/mace_hero_craterus.png</Icon>
+    <Icon>units/mace/hero_craterus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_infantry_swordsman_craterus.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml b/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
index c898fd7062..c3d5ec9930 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
@@ -13,7 +13,7 @@
     <Lang>greek</Lang>
     <GenericName>Demetrius I the Besieger</GenericName>
     <SpecificName>Dēmētrios Poliorkētēs</SpecificName>
-    <Icon>units/mace_hero_demetrius.png</Icon>
+    <Icon>units/mace/hero_demetrius.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_infantry_swordsman_demetrius.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml b/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
index 234794af86..aa48122243 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Philip II of Macedon</GenericName>
     <SpecificName>Philippos B' ho Makedōn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
+    <Icon>units/mace/hero_philip.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_cavalry_spearman_philip_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml b/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
index ab2115b06a..f69e56e65f 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Philip II of Macedon</GenericName>
     <SpecificName>Philippos B' ho Makedōn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
+    <Icon>units/mace/hero_philip.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_infantry_pikeman_philip.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml b/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
index 8fa972619b..6b76157fae 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Pyrrhus I of Epirus</GenericName>
     <SpecificName>Pyrrhos ho Epeiros</SpecificName>
-    <Icon>units/mace_hero_pyrrhus.png</Icon>
+    <Icon>units/mace/hero_pyrrhus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_cavalry_spearman_pyrrhus_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
index cb1f376fbb..36d5e4ef17 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/mace/infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/mace_infantry_archer.png</Icon>
+    <Icon>units/mace/infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml
index e363a8aaba..a38705c75d 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/mace/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Agrianian Peltast</GenericName>
     <SpecificName>Peltastḗs Agrías</SpecificName>
-    <Icon>units/mace_infantry_javelinist.png</Icon>
+    <Icon>units/mace/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/mace/infantry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml
index 075619ff2b..5f5da77949 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/mace/infantry_pikeman_b</SelectionGroupName>
     <GenericName>Foot Companion</GenericName>
     <SpecificName>Pezétairos</SpecificName>
-    <Icon>units/mace_infantry_pikeman.png</Icon>
+    <Icon>units/mace/infantry_pikeman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/mace/infantry_pikeman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
index adfb1b9a83..1d93195df5 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/mace/infantry_slinger_b</SelectionGroupName>
     <GenericName>Rhodian Slinger</GenericName>
     <SpecificName>Sphendonḗtēs Rhódios</SpecificName>
-    <Icon>units/mace_infantry_slinger.png</Icon>
+    <Icon>units/mace/infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml
index 7dba95d530..e37d466713 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Hemiolos</SpecificName>
-    <Icon>units/hele_ship_bireme.png</Icon>
+    <Icon>units/hele/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/pentekonter.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/mace/ship_fishing.xml
index 085b37076a..deea940e6f 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml
index 03611d9d18..607fcea6bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
-    <Icon>units/hele_ship_merchant.png</Icon>
+    <Icon>units/hele/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
index c5d340a796..a0d22584dd 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
@@ -8,7 +8,7 @@
     <Civ>mace</Civ>
     <SpecificName>Triḗrēs Makedonikḗ</SpecificName>
     <GenericName>Macedonian Trireme</GenericName>
-    <Icon>units/mace_ship_trireme.png</Icon>
+    <Icon>units/mace/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_packed.xml
index f990ccb3c0..5035c292e6 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele/siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/mace/siege_lithobolos_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml
index 0bad5699da..c747b66905 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_lithobolos.png</Icon>
+    <Icon>units/hele/siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/mace/siege_lithobolos_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_packed.xml
index a3fc36ea01..8a0eef36d2 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele/siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/mace/siege_oxybeles_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml
index 16d509244a..c0d18be81a 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="5.0" depth="9.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_oxybeles.png</Icon>
+    <Icon>units/hele/siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/mace/siege_oxybeles_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml
index 88ebf59a74..0ca1ed6697 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Krios</SpecificName>
-    <Icon>units/mace_siege_ram.png</Icon>
+    <Icon>units/mace/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/siege_tower.xml b/binaries/data/mods/public/simulation/templates/units/mace/siege_tower.xml
index 04f1a520c8..dd0ac63170 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/siege_tower.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Helépolis</SpecificName>
-    <Icon>units/hele_siege_tower.png</Icon>
+    <Icon>units/hele/siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/siege_tower.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml
index b1345085e2..ed35dbfa68 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml
@@ -4,7 +4,7 @@
     <Civ>mace</Civ>
     <SpecificName>Gýnē Makedonikḗ</SpecificName>
     <GenericName>Macedonian Woman</GenericName>
-    <Icon>units/hele_support_female_citizen.png</Icon>
+    <Icon>units/hele/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/mace/support_healer_b.xml
index 9d30e4be41..09e1caec7b 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
-    <Icon>units/hele_support_healer.png</Icon>
+    <Icon>units/hele/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/mace/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/mace/support_trader.xml
index 561eaed51e..42702f19d7 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/support_trader.xml
@@ -8,7 +8,7 @@
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <SpecificName>Émporos</SpecificName>
-    <Icon>units/hele_support_trader.png</Icon>
+    <Icon>units/hele/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml
index 52d14c77bf..57fb272278 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/maur/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Indian Light Cavalry</GenericName>
     <SpecificName>Ashwarohi</SpecificName>
-    <Icon>units/maur_cavalry_javelinist.png</Icon>
+    <Icon>units/maur/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/maur/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml
index f745d8ed13..e729a384c2 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/maur/cavalry_swordsman_b</SelectionGroupName>
     <GenericName>Indian Raiding Cavalry</GenericName>
     <SpecificName>Aśvārohagaṇaḥ</SpecificName>
-    <Icon>units/maur_cavalry_swordsman.png</Icon>
+    <Icon>units/maur/cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml
index 9e0acb5a7f..eb17140964 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml
@@ -10,7 +10,7 @@
     <SpecificName>Rath</SpecificName>
     <SelectionGroupName>units/maur/champion_chariot</SelectionGroupName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/maur_champion_chariot.png</Icon>
+    <Icon>units/maur/champion_chariot.png</Icon>
     <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
index ecbdc5a9c8..24c1e50c95 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
@@ -5,7 +5,7 @@
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Gajendra</SpecificName>
     <Classes datatype="tokens">IndianElephant</Classes>
-    <Icon>units/maur_champion_elephant.png</Icon>
+    <Icon>units/maur/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/elephantry_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
index 75e72afe5e..0e11f1a004 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
@@ -5,7 +5,7 @@
     <GenericName>Warrior</GenericName>
     <SpecificName>Yōddha</SpecificName>
     <SelectionGroupName>units/maur/champion_infantry</SelectionGroupName>
-    <Icon>units/maur_champion_maceman.png</Icon>
+    <Icon>units/maur/champion_maceman.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden.xml
index 203385ff16..cad1a008b2 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden.xml
@@ -6,7 +6,7 @@
     <GenericName>Maiden Guard</GenericName>
     <SpecificName>Visha Kanya</SpecificName>
     <SelectionGroupName>units/maur/champion_maiden</SelectionGroupName>
-    <Icon>units/maur_champion_maiden.png</Icon>
+    <Icon>units/maur/champion_maiden.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/infantry_swordsman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml
index b7eba267fa..c877d15f91 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml
@@ -19,7 +19,7 @@
     <Phenotype>female</Phenotype>
     <GenericName>Maiden Guard Archer</GenericName>
     <SpecificName>Visha Kanya</SpecificName>
-    <Icon>units/maur_champion_maiden_archer.png</Icon>
+    <Icon>units/maur/champion_maiden_archer.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/infantry_archer_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml
index ec19f2c470..c80d2fd620 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml
@@ -5,7 +5,7 @@
     <GenericName>Elephant Archer</GenericName>
     <SpecificName>Vachii Gaja</SpecificName>
     <SelectionGroupName>units/maur/elephant_archer_b</SelectionGroupName>
-    <Icon>units/maur_elephant_archer.png</Icon>
+    <Icon>units/maur/elephant_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
index 44eed28a3c..ef5242364d 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
@@ -13,7 +13,7 @@
     <SpecificName>Aśoka Devānāmpriya</SpecificName>
     <Classes datatype="tokens">Ashoka</Classes>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/maur_hero_ashoka.png</Icon>
+    <Icon>units/maur/hero_ashoka.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml
index ed7122783b..ee50f0cf7d 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml
@@ -7,7 +7,7 @@
     <Civ>maur</Civ>
     <GenericName>Ashoka the Great</GenericName>
     <SpecificName>Aśoka Devānāmpriya</SpecificName>
-    <Icon>units/maur_hero_ashoka.png</Icon>
+    <Icon>units/maur/hero_ashoka.png</Icon>
     <Tooltip>Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_bindusara_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_bindusara_infantry.xml
index 534d22735f..f96f64b761 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/hero_bindusara_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_bindusara_infantry.xml
@@ -4,7 +4,7 @@
     <Civ>maur</Civ>
     <GenericName>Bindusara</GenericName>
     <SpecificName>Bindusara</SpecificName>
-    <Icon>units/maur_hero_chandragupta.png</Icon>
+    <Icon>units/maur/hero_chandragupta.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/hero_infantry_swordsman_bindusara.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml
index 2588c514f7..d7aaf37201 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml
@@ -8,7 +8,7 @@
     <Civ>maur</Civ>
     <GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chāṇakya</SpecificName>
-    <Icon>units/maur_hero_chanakya.png</Icon>
+    <Icon>units/maur/hero_chanakya.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/hero_healer_chanakya.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml
index dcfb13612f..fa537cc6f5 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml
@@ -4,7 +4,7 @@
     <Civ>maur</Civ>
     <GenericName>Chandragupta Maurya</GenericName>
     <SpecificName>Chandragupta Maurya</SpecificName>
-    <Icon>units/maur_hero_chandragupta.png</Icon>
+    <Icon>units/maur/hero_chandragupta.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/hero_elephant_chandragupta_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml
index b37165ea01..a91acabde1 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml
@@ -4,7 +4,7 @@
     <Civ>maur</Civ>
     <GenericName>Chandragupta Maurya</GenericName>
     <SpecificName>Chandragupta Maurya</SpecificName>
-    <Icon>units/maur_hero_chandragupta.png</Icon>
+    <Icon>units/maur/hero_chandragupta.png</Icon>
   </Identity>
   <Upgrade>
     <Mount>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
index 069dc0793b..094b7e20dd 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/maur/infantry_archer_b</SelectionGroupName>
     <GenericName>Longbowman</GenericName>
     <SpecificName>Dhanurdhar</SpecificName>
-    <Icon>units/maur_infantry_archer.png</Icon>
+    <Icon>units/maur/infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/maur/infantry_archer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
index 5bab629ec8..838eae31a9 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/maur/infantry_spearman_b</SelectionGroupName>
     <GenericName>Bamboo Spearman</GenericName>
     <SpecificName>Kauntika</SpecificName>
-    <Icon>units/maur_infantry_spearman.png</Icon>
+    <Icon>units/maur/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/maur/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
index 4f402400e8..1119b1649d 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
@@ -16,7 +16,7 @@
     <SelectionGroupName>units/maur/infantry_swordsman_b</SelectionGroupName>
     <GenericName>Indian Swordsman</GenericName>
     <SpecificName>Khadagdhari</SpecificName>
-    <Icon>units/maur_infantry_swordsman.png</Icon>
+    <Icon>units/maur/infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml
index 23266d25b7..97384e8e88 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
-    <Icon>units/maur_ship_bireme.png</Icon>
+    <Icon>units/maur/ship_bireme.png</Icon>
   </Identity>
   <Selectable replace="">
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/maur/ship_fishing.xml
index ccb13e30c5..479e6a4637 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/ship_fishing.xml
@@ -8,7 +8,7 @@
     <Civ>maur</Civ>
     <GenericName>Fisherman</GenericName>
     <SpecificName>Matsyapalak</SpecificName>
-    <Icon>units/maur_ship_fishing.png</Icon>
+    <Icon>units/maur/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/mauryas/fishing_ship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/maur/ship_merchant.xml
index f9ef0cde25..380918c636 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/ship_merchant.xml
@@ -8,7 +8,7 @@
     <Civ>maur</Civ>
     <GenericName>Trading Ship</GenericName>
     <SpecificName>Vanijyik Nauka</SpecificName>
-    <Icon>units/maur_ship_merchant.png</Icon>
+    <Icon>units/maur/ship_merchant.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
index 2f87b0f161..2c2ba42d97 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
@@ -16,7 +16,7 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
-    <Icon>units/maur_ship_trireme.png</Icon>
+    <Icon>units/maur/ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/maur/siege_ram.xml
index f042d371c5..243a6e41b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/siege_ram.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <Icon>units/maur_siege_ram.png</Icon>
+    <Icon>units/maur/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/mauryas/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
index 104098c4b7..4228196f8c 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Karmākara Gaja</SpecificName>
-    <Icon>units/maur_support_elephant.png</Icon>
+    <Icon>units/maur/support_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/support_elephant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
index 92ece24bcb..be2f4e35cf 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
@@ -10,7 +10,7 @@
     <Civ>maur</Civ>
     <SpecificName>Naari</SpecificName>
     <GenericName>Indian Woman</GenericName>
-    <Icon>units/maur_support_female_citizen.png</Icon>
+    <Icon>units/maur/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_healer_b.xml
index ab8a40b181..346303b774 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_healer_b.xml
@@ -4,7 +4,7 @@
     <Civ>maur</Civ>
     <GenericName>Brahmin Priest</GenericName>
     <SpecificName>Brāhmaṇa Pujari</SpecificName>
-    <Icon>units/maur_support_healer.png</Icon>
+    <Icon>units/maur/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/maur/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_trader.xml
index 30b373cc20..67f6f9616e 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Vaishya</SpecificName>
-    <Icon>units/maur_support_trader.png</Icon>
+    <Icon>units/maur/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
index 13ebd610e6..603a7f33a0 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -9,7 +9,7 @@
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiophoros</SpecificName>
-    <Icon>units/sele_infantry_swordsman.png</Icon>
+    <Icon>units/thrac/champion_infantry_swordsman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/infantry_swordsman_c_thracian.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
index c146cc1b52..cb9325c131 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -11,7 +11,7 @@
     <Lang>greek</Lang>
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
-    <Icon>units/mace_thorakites.png</Icon>
+    <Icon>units/mace/thorakites.png</Icon>
   </Identity>
   <Resistance>
     <Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
index 6a3e09536e..fe05716fd2 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -4,7 +4,7 @@
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
     <SpecificName>Thyreophoros</SpecificName>
-    <Icon>units/mace_thureophoros.png</Icon>
+    <Icon>units/mace/thureophoros.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_c_thureophoros.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml b/binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml
index 1b38aaf40f..b58f328df1 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml
@@ -12,7 +12,7 @@
     <Lang>persian</Lang>
     <GenericName>Persian Apple Bearer</GenericName>
     <SpecificName>Arštibara</SpecificName>
-    <Icon>units/pers_arstibara.png</Icon>
+    <Icon>units/pers/arstibara.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
index 9907cf1267..7a1c4cdad6 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/cavalry_archer_b</SelectionGroupName>
     <GenericName>Parthian Horse Archer</GenericName>
     <SpecificName>Asabāra Parθava</SpecificName>
-    <Icon>units/pers_cavalry_archer.png</Icon>
+    <Icon>units/pers/cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
index ade4d55298..76a1af252e 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/cavalry_axeman_b</SelectionGroupName>
     <GenericName>Hyrcanian Cavalry</GenericName>
     <SpecificName>Asabāra Varkaniya</SpecificName>
-    <Icon>units/pers_cavalry_axeman.png</Icon>
+    <Icon>units/pers/cavalry_axeman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
index 3ec8dce3a3..f8f61baa1b 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Median Light Cavalry</GenericName>
     <SpecificName>Asabāra Māda</SpecificName>
-    <Icon>units/pers_cavalry_javelinist.png</Icon>
+    <Icon>units/pers/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
index 15f3ebfaf5..2fdff39a20 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/cavalry_spearman_b</SelectionGroupName>
     <GenericName>Cappadocian Cavalry</GenericName>
     <SpecificName>Asabāra Katpatuka</SpecificName>
-    <Icon>units/pers_cavalry_spearman.png</Icon>
+    <Icon>units/pers/cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml
index 6e19d5ad5f..8e5db789cf 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml
@@ -5,7 +5,7 @@
     <Lang>persian</Lang>
     <GenericName>Bactrian Heavy Lancer</GenericName>
     <SpecificName>Asabāra Baxtriš</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
+    <Icon>units/pers/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml
index 9c1b95fd15..5a1b3b543f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml
@@ -5,7 +5,7 @@
     <Lang>persian</Lang>
     <GenericName>Bactrian Heavy Cavalry Archer</GenericName>
     <SpecificName>Asabāra Baxtriš</SpecificName>
-    <Icon>units/pers_champion_cavalry_archer.png</Icon>
+    <Icon>units/pers/champion_cavalry_archer.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/cavalry_archer_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
index 4fca2bec7a..b957a83248 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
@@ -10,7 +10,7 @@
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Raθa Bābiruviya</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/pers_chariot_archer.png</Icon>
+    <Icon>units/pers/chariot_archer.png</Icon>
     <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
index 885cc8b2b8..f5a93f2d08 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
@@ -6,7 +6,7 @@
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Pila Hinduya</SpecificName>
     <Classes datatype="tokens">IndianElephant</Classes>
-    <Icon>units/pers_champion_elephant.png</Icon>
+    <Icon>units/pers/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/elephantry_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
index 2b54f116fa..279ba1b350 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
@@ -9,7 +9,7 @@
     <GenericName>Persian Immortal</GenericName>
     <SpecificName>Anušiya</SpecificName>
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
-    <Icon>units/pers_champion_infantry.png</Icon>
+    <Icon>units/pers/champion_infantry.png</Icon>
   </Identity>
   <Resistance>
     <Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
index 2e6b99ba0d..b2212fd0cd 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
@@ -9,7 +9,7 @@
     <GenericName>Persian Immortal</GenericName>
     <SpecificName>Anušiya</SpecificName>
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
-    <Icon>units/pers_champion_infantry_archer.png</Icon>
+    <Icon>units/pers/champion_infantry_archer.png</Icon>
   </Identity>
   <Upgrade>
     <Immortal_spearman>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml b/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
index b237a079b2..22df938b64 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
@@ -8,7 +8,7 @@
     <Lang>persian</Lang>
     <GenericName>Cyrus II The Great</GenericName>
     <SpecificName>Kuruš</SpecificName>
-    <Icon>units/pers_hero_cyrus.png</Icon>
+    <Icon>units/pers/hero_cyrus.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml b/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
index a034add659..5892fcdce5 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
@@ -13,7 +13,7 @@
     <GenericName>Darius I the Great</GenericName>
     <SpecificName>Dārayavahuš</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/pers_hero_darius.png</Icon>
+    <Icon>units/pers/hero_darius.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml b/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
index 604b912c4e..0e1fd0e942 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
@@ -8,7 +8,7 @@
     <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
-    <Icon>units/pers_hero_xerxes.png</Icon>
+    <Icon>units/pers/hero_xerxes.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/hero_infantry_archer_xerxes.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
index b4fba522d3..9ceef0a92b 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
@@ -13,7 +13,7 @@
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/pers_hero_xerxes.png</Icon>
+    <Icon>units/pers/hero_xerxes.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
index 04362243d4..cda59093a8 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/infantry_archer_b</SelectionGroupName>
     <GenericName>Sogdian Archer</GenericName>
     <SpecificName>Θanuvaniya Suguda</SpecificName>
-    <Icon>units/pers_infantry_archer.png</Icon>
+    <Icon>units/pers/infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_archer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
index 37190d3a26..28cc7d115a 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Lydian Auxiliary</GenericName>
     <SpecificName>Pastiš Spardiya</SpecificName>
-    <Icon>units/pers_infantry_javelinist.png</Icon>
+    <Icon>units/pers/infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
index d83e975056..0a1a92f7fd 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/pers/infantry_spearman_b</SelectionGroupName>
     <GenericName>Shield Bearer</GenericName>
     <SpecificName>Sparabara</SpecificName>
-    <Icon>units/pers_infantry_spearman.png</Icon>
+    <Icon>units/pers/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml b/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
index be6e6ff316..273895cf64 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
@@ -5,7 +5,7 @@
     <Lang>persian</Lang>
     <GenericName>Cardaces Hoplite</GenericName>
     <SpecificName>Hoplites Kardakes</SpecificName>
-    <Icon>units/pers_kardakes.png</Icon>
+    <Icon>units/pers/kardakes.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_c3.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
index 3b8c2113f3..1c09e9f529 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
@@ -5,7 +5,7 @@
     <Lang>persian</Lang>
     <GenericName>Cardaces Skirmisher</GenericName>
     <SpecificName>Peltastes Kardakes</SpecificName>
-    <Icon>units/pers_kardakes_skirmisher.png</Icon>
+    <Icon>units/pers/kardakes_skirmisher.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_javelinist_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml
index 901722bebb..51b0542f94 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml
@@ -9,7 +9,7 @@
     <Lang>persian</Lang>
     <GenericName>Cypriot Galley</GenericName>
     <SpecificName>Hamaraniyanava</SpecificName>
-    <Icon>units/pers_ship_bireme.png</Icon>
+    <Icon>units/pers/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/bireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml
index d3b66b8023..b63a85787d 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml
@@ -8,7 +8,7 @@
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SpecificName>Masiyakara</SpecificName>
-    <Icon>units/pers_ship_fishing.png</Icon>
+    <Icon>units/pers/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/fishship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml
index 55725d358a..29b194acc9 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml
@@ -9,7 +9,7 @@
     <Lang>persian</Lang>
     <GenericName>Ionian Trade Ship</GenericName>
     <SpecificName>Nauš Yauna</SpecificName>
-    <Icon>units/pers_ship_merchant.png</Icon>
+    <Icon>units/pers/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml
index a64b7133b6..9d6e844b9d 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml
@@ -9,7 +9,7 @@
     <Lang>persian</Lang>
     <GenericName>Phoenician Trireme</GenericName>
     <SpecificName>Hamaraniyanava Vazarka</SpecificName>
-    <Icon>units/pers_ship_trireme.png</Icon>
+    <Icon>units/pers/ship_trireme.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml
index cd99c73325..b4b13dc83b 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml
@@ -19,7 +19,7 @@
     <Lang>persian</Lang>
     <GenericName>Assyrian Siege Ram</GenericName>
     <SpecificName>Hamaranakuba Aθuriya</SpecificName>
-    <Icon>units/pers_siege_ram.png</Icon>
+    <Icon>units/pers/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
index 8e1ef91506..950e955fdb 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
@@ -5,7 +5,7 @@
     <Lang>persian</Lang>
     <SpecificName>Banu Miyanrudani</SpecificName>
     <GenericName>Mesopotamian Woman</GenericName>
-    <Icon>units/pers_support_female_citizen.png</Icon>
+    <Icon>units/pers/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml
index f831354d3a..4534c240be 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Lang>persian</Lang>
     <GenericName>Median Magus</GenericName>
     <SpecificName>Maguš Māda</SpecificName>
-    <Icon>units/pers_support_healer.png</Icon>
+    <Icon>units/pers/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml
index 696b6276d9..5de8d5a1e7 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml
@@ -9,7 +9,7 @@
     <Lang>persian</Lang>
     <GenericName>Aramaean Merchant</GenericName>
     <SpecificName>Tamkarum Arami</SpecificName>
-    <Icon>units/pers_support_trader.png</Icon>
+    <Icon>units/pers/support_trader.png</Icon>
     <Tooltip>Trade resources between your own markets and those of your allies. Persians have a +25% land trading bonus.</Tooltip>
   </Identity>
   <Sound>
diff --git a/binaries/data/mods/public/simulation/templates/units/plane.xml b/binaries/data/mods/public/simulation/templates/units/plane.xml
index b0eed84405..e441aeeab5 100644
--- a/binaries/data/mods/public/simulation/templates/units/plane.xml
+++ b/binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -46,7 +46,7 @@
   <Identity>
     <SpecificName>P-51 Mustang</SpecificName>
     <Tooltip>A World War II American fighter plane.</Tooltip>
-    <Icon>units/global_mustang.png</Icon>
+    <Icon>units/global/mustang.png</Icon>
   </Identity>
   <Obstruction disable=""/>
   <Position>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
index 5c3c276921..9b864cd7ce 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
@@ -16,7 +16,7 @@
     <SelectionGroupName>units/ptol/cavalry_archer</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
-    <Icon>units/ptol_camel_archer.png</Icon>
+    <Icon>units/ptol/camel_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
index 77f1908a76..f0010a3bc7 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/ptol/cavalry_javelineer_merc_b</SelectionGroupName>
     <GenericName>Tarantine Settler Cavalry</GenericName>
     <SpecificName>Hippeús Tarantînos</SpecificName>
-    <Icon>units/tarentine_cavalry_e.png</Icon>
+    <Icon>units/hele/tarentine_cavalry_e.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
index c3c0c2f609..5201018f3d 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
@@ -5,7 +5,7 @@
     <SelectionGroupName>units/ptol/cavalry_spearman_merc_b</SelectionGroupName>
     <GenericName>Macedonian Settler Cavalry</GenericName>
     <SpecificName>Hippeús Makedonikós</SpecificName>
-    <Icon>units/ptol_cavalry_spearman.png</Icon>
+    <Icon>units/ptol/cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_cavalry.xml
index 79de00d7d4..6eb3353d3b 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_cavalry.xml
@@ -4,7 +4,7 @@
     <Civ>ptol</Civ>
     <GenericName>Royal Guard Cavalry</GenericName>
     <SpecificName>Ágēma Basiléōs</SpecificName>
-    <Icon>units/ptol_champion_cavalry.png</Icon>
+    <Icon>units/ptol/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
index ce79779736..66c3847ed7 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
@@ -5,7 +5,7 @@
     <GenericName>Towered War Elephant</GenericName>
     <SpecificName>Polémou Eléphantos</SpecificName>
     <Classes datatype="tokens">AfricanElephant</Classes>
-    <Icon>units/ptol_champion_elephant.png</Icon>
+    <Icon>units/ptol/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/elephantry_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
index f45882a765..09e5b2a22a 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Royal Guard Infantry</GenericName>
     <SpecificName>Phalangitès Agema</SpecificName>
-    <Icon>units/ptol_champion_infantry.png</Icon>
+    <Icon>units/ptol/champion_infantry.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
index 3ee611c785..ff5c8d0ff4 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
@@ -23,7 +23,7 @@
     <Classes datatype="tokens">Juggernaut</Classes>
     <GenericName>Juggernaut</GenericName>
     <SpecificName>Tessarakonterēs</SpecificName>
-    <Icon>units/rome_ship_quinquereme.png</Icon>
+    <Icon>units/rome/ship_quinquereme.png</Icon>
   </Identity>
   <Loot>
     <xp>400</xp>
@@ -33,6 +33,18 @@
   <TrainingRestrictions>
     <Category>Juggernaut</Category>
   </TrainingRestrictions>
+  <TurretHolder>
+    <TurretPoints>
+      <Siege>
+        <Template>units/ptol/siege_juggernaut</Template>
+        <Ejectable>false</Ejectable>
+        <X>0</X>
+        <Y>4.0</Y>
+        <Z>-15.5</Z>
+        <Angle>0</Angle>
+      </Siege>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/romans/quinquereme.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml b/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
index 87a01eab32..acca5399a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
@@ -10,7 +10,7 @@
     <Phenotype>female</Phenotype>
     <GenericName>Cleopatra VII</GenericName>
     <SpecificName>Kleopatra H' Philopatōr</SpecificName>
-    <Icon>units/ptol_hero_cleopatra.png</Icon>
+    <Icon>units/ptol/hero_cleopatra.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/hero_infantry_archer_cleopatra.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml b/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
index a1596c47b8..c26b2b9586 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
@@ -8,7 +8,7 @@
     <Civ>ptol</Civ>
     <GenericName>Ptolemy I</GenericName>
     <SpecificName>Ptolemaios A' Sōter</SpecificName>
-    <Icon>units/ptol_hero_ptolemy_I.png</Icon>
+    <Icon>units/ptol/hero_ptolemy_I.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/hero_elephantry_ptolemy_I_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml b/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
index a2d6f2965e..31eff38038 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
@@ -8,7 +8,7 @@
     <Classes datatype="tokens">PtolemyIV</Classes>
     <GenericName>Ptolemy IV</GenericName>
     <SpecificName>Ptolemaios D' Philopatōr</SpecificName>
-    <Icon>units/ptol_hero_ptolemy_IV.png</Icon>
+    <Icon>units/ptol/hero_ptolemy_IV.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
index 7777f53dcd..80f209c29e 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/mace_infantry_archer.png</Icon>
+    <Icon>units/mace/infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
index 659e819c12..72f4038ca1 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Skirmisher</GenericName>
     <SpecificName>Thureophóros Akrobolistḗs</SpecificName>
-    <Icon>units/ptol_infantry_javelinist_merc.png</Icon>
+    <Icon>units/ptol/infantry_javelinist_merc.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
index 62785e292b..80416ae623 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_pikeman_b</SelectionGroupName>
     <GenericName>Egyptian Pikeman</GenericName>
     <SpecificName>Phalaggomákhimos</SpecificName>
-    <Icon>units/ptol_infantry_spearman.png</Icon>
+    <Icon>units/ptol/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/ptol/infantry_pikeman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
index e2c9db9f72..23a0a23837 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_slinger_b</SelectionGroupName>
     <GenericName>Judean Slinger</GenericName>
     <SpecificName>Hebraikós Sphendonḗtēs</SpecificName>
-    <Icon>units/ptol_infantry_slinger.png</Icon>
+    <Icon>units/ptol/infantry_slinger.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
index f29be7a45d..e00a7ec0a2 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_spearman_merc_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Spearman</GenericName>
     <SpecificName>Thureophóros Misthophóros</SpecificName>
-    <Icon>units/ptol_infantry_spearman_2.png</Icon>
+    <Icon>units/ptol/infantry_spearman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
index 89c2c1ebf1..4891b282b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
@@ -11,7 +11,7 @@
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Gallikós Mistophorós</SpecificName>
     <SelectionGroupName>units/ptol/infantry_swordsman_merc_b</SelectionGroupName>
-    <Icon>units/cart_infantry_swordsman.png</Icon>
+    <Icon>units/cart/infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml
index be31117949..6b9a46dfee 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml
@@ -8,7 +8,7 @@
     <Civ>ptol</Civ>
     <GenericName>Bireme</GenericName>
     <SpecificName>Dierēs</SpecificName>
-    <Icon>units/ptol_ship_bireme.png</Icon>
+    <Icon>units/ptol/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/bireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/ptol/ship_fishing.xml
index 52d6873a16..859c9a06c8 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
-    <Icon>units/ptol_ship_fishing.png</Icon>
+    <Icon>units/ptol/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/ptol/ship_merchant.xml
index 105ecaf539..883eab960e 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
-    <Icon>units/ptol_ship_merchant.png</Icon>
+    <Icon>units/ptol/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/merchant_ship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml
index 0ba489a71f..518e07adb4 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Octḗrēs</SpecificName>
-    <Icon>units/ptol_ship_quinquereme.png</Icon>
+    <Icon>units/ptol/ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/quinquereme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml
index 0eb2dbabee..4c9f899c4b 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Pentḗrēs</SpecificName>
-    <Icon>units/ptol_ship_trireme.png</Icon>
+    <Icon>units/ptol/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_juggernaut.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_juggernaut.xml
new file mode 100644
index 0000000000..f9a37e749a
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_juggernaut.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol/siege_lithobolos_packed">
+  <Cost disable=""/>
+  <Footprint disable=""/>
+  <Garrisonable disable=""/>
+  <Guard disable=""/>
+  <Health disable=""/>
+  <Identity>
+    <Icon>units/hele/siege_lithobolos.png</Icon>
+    <Formations disable=""/>
+    <Undeletable>true</Undeletable>
+  </Identity>
+  <Loot disable=""/>
+  <Minimap disable=""/>
+  <Obstruction disable=""/>
+  <Pack disable=""/>
+  <Repairable disable=""/>
+  <Resistance disable=""/>
+  <StatusBars disable=""/>
+  <StatusEffectsReceiver disable=""/>
+  <TreasureCollecter disable=""/>
+  <Turretable/>
+  <UnitMotion disable=""/>
+  <VisualActor>
+    <Actor>units/ptolemies/siege_lithobolos_med.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_packed.xml
index fca462ac7a..7b15dcebb2 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele/siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_lithobolos_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml
index be337edf71..3596555f2c 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_lithobolos.png</Icon>
+    <Icon>units/hele/siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_lithobolos_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml
index 895170638a..ef8c25266a 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml
@@ -17,7 +17,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Polybolos</SpecificName>
-    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele/siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_polybolos_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml
index 2c429eb1a7..ba3babe804 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="6.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_oxybeles.png</Icon>
+    <Icon>units/hele/siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_polybolos_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml
index 7052586ecf..4503432677 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Krios</SpecificName>
-    <Icon>units/mace_siege_ram.png</Icon>
+    <Icon>units/mace/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/siege_tower.xml b/binaries/data/mods/public/simulation/templates/units/ptol/siege_tower.xml
index aa1e1e9a67..997db95a4c 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/siege_tower.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Helépolis</SpecificName>
-    <Icon>units/hele_siege_tower.png</Icon>
+    <Icon>units/hele/siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/siege_tower.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
index 75052644af..fd3e359e3a 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
@@ -10,7 +10,7 @@
     <Civ>ptol</Civ>
     <SpecificName>Gýnē Aigýptia</SpecificName>
     <GenericName>Egyptian Woman</GenericName>
-    <Icon>units/ptol_support_female_citizen.png</Icon>
+    <Icon>units/ptol/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_healer_b.xml
index c71be2cdb2..6090674954 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_healer_b.xml
@@ -4,7 +4,7 @@
     <Civ>ptol</Civ>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
-    <Icon>units/ptol_support_healer.png</Icon>
+    <Icon>units/ptol/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/ptol/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml
index fe8745a234..a637558ad1 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Émporos</SpecificName>
-    <Icon>units/pers_support_trader.png</Icon>
+    <Icon>units/pers/support_trader.png</Icon>
   </Identity>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml
index 4591a4d35a..d0b1499b24 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <GenericName>Allied Cavalry</GenericName>
     <SpecificName>Eques Socius</SpecificName>
     <SelectionGroupName>units/rome/cavalry_javelineer_b</SelectionGroupName>
-    <Icon>units/rome_cavalry_javelinist.png</Icon>
+    <Icon>units/rome/cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml
index 155781559e..91f8553621 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/rome/cavalry_spearman_b</SelectionGroupName>
     <GenericName>Roman Cavalry</GenericName>
     <SpecificName>Eques Rōmānus</SpecificName>
-    <Icon>units/rome_cavalry_spearman.png</Icon>
+    <Icon>units/rome/cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome/cavalry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry.xml
index b23d0901a6..49e586155c 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry.xml
@@ -5,7 +5,7 @@
     <Lang>latin</Lang>
     <SpecificName>Eques Cōnsulāris</SpecificName>
     <GenericName>Consular Bodyguard</GenericName>
-    <Icon>units/rome_champion_cavalry.png</Icon>
+    <Icon>units/rome/champion_cavalry.png</Icon>
     <SelectionGroupName>units/rome/champion_cavalry</SelectionGroupName>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml
index 0f4c74f967..795b5f0d74 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml
@@ -20,7 +20,7 @@
     <GenericName>Gladiator Spearman</GenericName>
     <SpecificName>Hoplomachus</SpecificName>
     <Rank>Elite</Rank>
-    <Icon>units/rome_champion_infantry_gladiator_spear.png</Icon>
+    <Icon>units/rome/champion_infantry_gladiator_spear.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion disable=""/>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml
index 9fd7855295..c20f1c7341 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml
@@ -20,7 +20,7 @@
     <GenericName>Gladiator Swordsman</GenericName>
     <SpecificName>Murmillo</SpecificName>
     <Rank>Elite</Rank>
-    <Icon>units/rome_champion_infantry_gladiator_sword.png</Icon>
+    <Icon>units/rome/champion_infantry_gladiator_sword.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion disable=""/>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
index 0204b1fe29..9bda88aab4 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
@@ -12,7 +12,7 @@
     <GenericName>Italic Heavy Infantry</GenericName>
     <SpecificName>Extrāōrdinārius</SpecificName>
     <SelectionGroupName>units/rome/champion_infantry_swordsman</SelectionGroupName>
-    <Icon>units/rome_champion_infantry.png</Icon>
+    <Icon>units/rome/champion_infantry.png</Icon>
     <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml
index d1b3195702..4cbdc67931 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Marian Legionary</GenericName>
     <SpecificName>Legiōnārius</SpecificName>
-    <Icon>units/rome_champion_legion_marian.png</Icon>
+    <Icon>units/rome/champion_legion_marian.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome/champion_infantry_swordsman_03</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_03.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_03.xml
index 9ec5985ede..e38f7b24cc 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_03.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_03.xml
@@ -10,7 +10,7 @@
   <Identity>
     <GenericName>Marian Legionary</GenericName>
     <SpecificName>Legiōnārius</SpecificName>
-    <Icon>units/rome_champion_legion_imperial.png</Icon>
+    <Icon>units/rome/champion_legion_imperial.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome/champion_infantry_swordsman_04</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_04.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_04.xml
index 096387a4b5..88c9c61cf7 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_04.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_04.xml
@@ -13,7 +13,7 @@
   <Identity>
     <GenericName>Roman Centurion</GenericName>
     <SpecificName>Centuriō</SpecificName>
-    <Icon>units/rome_champion_legion_centurio.png</Icon>
+    <Icon>units/rome/champion_legion_centurio.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_05.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_05.xml
index fcd7d9e5a5..13f6e0e1e6 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_05.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_05.xml
@@ -13,7 +13,7 @@
   <Identity>
     <GenericName>Praetorian Guard</GenericName>
     <SpecificName>Praetorianus</SpecificName>
-    <Icon>units/rome_champion_legion_centurio.png</Icon>
+    <Icon>units/rome/champion_legion_centurio.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml b/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml
index 1403b9e512..4427b67902 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml
@@ -8,7 +8,7 @@
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Mārcus Claudius Mārcellus</SpecificName>
-    <Icon>units/rome_hero_marcellus.png</Icon>
+    <Icon>units/rome/hero_marcellus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/hero_cavalry_swordsman_marcellus_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml b/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml
index aca5f42f2c..b65ed6213a 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml
@@ -8,7 +8,7 @@
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Mārcus Claudius Mārcellus</SpecificName>
-    <Icon>units/rome_hero_marcellus.png</Icon>
+    <Icon>units/rome/hero_marcellus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/hero_infantry_swordsman_marcellus.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml b/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml
index 70a7dcf11b..de9959d2af 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml
@@ -7,7 +7,7 @@
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Quīntus Fabius Maximus Verrūcōsus Cūnctātor</SpecificName>
-    <Icon>units/rome_hero_maximus.png</Icon>
+    <Icon>units/rome/hero_maximus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/hero_cavalry_swordsman_maximus_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml b/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml
index 9219b4a917..6c7164c84c 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml
@@ -7,7 +7,7 @@
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Quīntus Fabius Maximus Verrūcōsus Cūnctātor</SpecificName>
-    <Icon>units/rome_hero_maximus.png</Icon>
+    <Icon>units/rome/hero_maximus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/hero_infantry_swordsman_maximus.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml b/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml
index 7381a4c17e..6efd9b8a0f 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml
@@ -7,7 +7,7 @@
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Pūblius Cornēlius Scīpiō Āfricānus</SpecificName>
-    <Icon>units/rome_hero_scipio.png</Icon>
+    <Icon>units/rome/hero_scipio.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/hero_cavalry_swordsman_scipio_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio_infantry.xml b/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio_infantry.xml
index 34e112c836..35bef476ef 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/hero_scipio_infantry.xml
@@ -7,7 +7,7 @@
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Pūblius Cornēlius Scīpiō Āfricānus</SpecificName>
-    <Icon>units/rome_hero_scipio.png</Icon>
+    <Icon>units/rome/hero_scipio.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/hero_infantry_swordsman_scipio.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml
index e007d0c2dc..f43573f80b 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml
@@ -12,7 +12,7 @@
     <SelectionGroupName>units/rome/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Roman Skirmisher</GenericName>
     <SpecificName>Vēles</SpecificName>
-    <Icon>units/rome_infantry_javelinist.png</Icon>
+    <Icon>units/rome/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome/infantry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml
index 390ea154fb..69c38bd060 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml
@@ -18,7 +18,7 @@
     <SelectionGroupName>units/rome/infantry_spearman_b</SelectionGroupName>
     <GenericName>Veteran Spearman</GenericName>
     <SpecificName>Triārius</SpecificName>
-    <Icon>units/rome_infantry_spearman.png</Icon>
+    <Icon>units/rome/infantry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml
index 16d28e719a..4035f63f3c 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml
@@ -18,7 +18,7 @@
     <SelectionGroupName>units/rome/infantry_swordsman_b</SelectionGroupName>
     <GenericName>Roman Swordsman</GenericName>
     <SpecificName>Hastātus</SpecificName>
-    <Icon>units/rome_infantry_swordsman.png</Icon>
+    <Icon>units/rome/infantry_swordsman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome/infantry_swordsman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml b/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml
index 03a86b6a39..19416d0e00 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml
@@ -18,7 +18,7 @@
     <SelectionGroupName>units/rome/infantry_swordsman_servus</SelectionGroupName>
     <GenericName>Slave</GenericName>
     <SpecificName>Servus</SpecificName>
-    <Icon>units/rome_infantry_swordsman.png</Icon>
+    <Icon>units/rome/infantry_swordsman.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml
index 1af8e36ff0..1a75cdf9d6 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Liburna</SpecificName>
-    <Icon>units/rome_ship_bireme.png</Icon>
+    <Icon>units/rome/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/romans/bireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/rome/ship_fishing.xml
index 2927ab7f70..a206d12526 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Nāvicula Piscātōria</SpecificName>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/rome/ship_merchant.xml
index 57bd20355c..3b3e3498d0 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Corbīta</SpecificName>
-    <Icon>units/rome_ship_merchant.png</Icon>
+    <Icon>units/rome/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/romans/merchantman.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml
index 3cae952acf..055b8790db 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml
@@ -4,7 +4,7 @@
     <Civ>rome</Civ>
     <SpecificName>Quīnquerēmis Rōmāna</SpecificName>
     <GenericName>Roman Quinquereme</GenericName>
-    <Icon>units/rome_ship_quinquereme.png</Icon>
+    <Icon>units/rome/ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/romans/quinquereme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml
index 9844c8b056..3c5440cc21 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml
@@ -7,7 +7,7 @@
     <Civ>rome</Civ>
     <SpecificName>Trirēmis Rōmāna</SpecificName>
     <GenericName>Roman Trireme</GenericName>
-    <Icon>units/rome_ship_trireme.png</Icon>
+    <Icon>units/rome/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/romans/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml b/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml
index 536ead0456..e1c35e7480 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml
@@ -14,7 +14,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Ballista</SpecificName>
-    <Icon>units/rome_siege_ballista_packed.png</Icon>
+    <Icon>units/rome/siege_ballista_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome/siege_ballista_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml
index 6cbd029001..619ae02b73 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/rome_siege_ballista.png</Icon>
+    <Icon>units/rome/siege_ballista.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome/siege_ballista_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml b/binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml
index 2c5d3850c0..b12da4db99 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml
@@ -24,7 +24,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Onager</SpecificName>
-    <Icon>units/rome_siege_onager.png</Icon>
+    <Icon>units/rome/siege_onager.png</Icon>
   </Identity>
   <Pack disable=""/>
   <UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml
index 74a143f1d7..042d1f13ce 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml
@@ -13,7 +13,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Ariēs</SpecificName>
-    <Icon>units/rome_siege_ram.png</Icon>
+    <Icon>units/rome/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml b/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
index 1cf979d198..6e78c8d173 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Scorpiō</SpecificName>
-    <Icon>units/rome_siege_scorpio_packed.png</Icon>
+    <Icon>units/rome/siege_scorpio_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome/siege_scorpio_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_unpacked.xml
index 8242fb24e5..75b854152d 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_unpacked.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome/siege_scorpio_packed">
   <Identity>
-    <Icon>units/rome_siege_scorpio.png</Icon>
+    <Icon>units/rome/siege_scorpio.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome/siege_scorpio_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml
index 92aadd3b26..3b1c326a43 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml
@@ -11,7 +11,7 @@
     <Lang>latin</Lang>
     <SpecificName>Rōmāna</SpecificName>
     <GenericName>Roman Woman</GenericName>
-    <Icon>units/rome_support_female_citizen.png</Icon>
+    <Icon>units/rome/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/support_healer_b.xml
index 82a52980ee..c4a2243038 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Lang>latin</Lang>
     <GenericName>Doctor</GenericName>
     <SpecificName>Medicus</SpecificName>
-    <Icon>units/rome_support_healer.png</Icon>
+    <Icon>units/rome/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/rome/support_trader.xml
index f73e76c961..2b6a5504b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome/support_trader.xml
@@ -9,7 +9,7 @@
     <Lang>latin</Lang>
     <GenericName>Plebeian Merchant</GenericName>
     <SpecificName>Mercātor</SpecificName>
-    <Icon>units/rome_support_trader.png</Icon>
+    <Icon>units/rome/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
index d0efb81fb3..4ede03633d 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Samnite Skirmisher</GenericName>
     <SpecificName>Samnite Skirmisher</SpecificName>
-    <Icon>units/samnite_skirmisher.png</Icon>
+    <Icon>units/samn/skirmisher.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_javelinist_c_samnite.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
index 22697b75de..7564a99de2 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Samnite Spearman</GenericName>
     <SpecificName>Samnite Spearman</SpecificName>
-    <Icon>units/samnite_spearman.png</Icon>
+    <Icon>units/samn/spearman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_spearman_c_samnite.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
index 81a5c3b503..cd0b5f523e 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
@@ -3,7 +3,7 @@
   <Identity>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Samnite Swordsman</SpecificName>
-    <Icon>units/samnite_swordsman.png</Icon>
+    <Icon>units/samn/swordsman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_swordsman_b.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
index e257072c86..9c9c25bef7 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/cavalry_archer_b</SelectionGroupName>
     <GenericName>Dahae Horse Archer</GenericName>
     <SpecificName>Hippotoxotès Dahae</SpecificName>
-    <Icon>units/pers_cavalry_archer.png</Icon>
+    <Icon>units/pers/cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml
index 66770c5f99..b93502cd5a 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Militia Cavalry</GenericName>
     <SpecificName>Hippakontistès Politès</SpecificName>
-    <Icon>units/sele_cavalry_javelinist.png</Icon>
+    <Icon>units/sele/cavalry_militia.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/sele/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
index a1370a1239..0716e45d9e 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/cavalry_spearman_merc_b</SelectionGroupName>
     <GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hippos Hetairike</SpecificName>
-    <Icon>units/sele_cavalry_spearman_merc.png</Icon>
+    <Icon>units/sele/cavalry_spearman_merc.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_cavalry.xml
index b035f49d00..eefab39af2 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/champion_cavalry.xml
+++ b/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_cavalry.png</Icon>
+    <Icon>units/sele/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
index c407d3db38..9424947f26 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
@@ -10,7 +10,7 @@
     <GenericName>Scythed Chariot</GenericName>
     <SpecificName>Drepanèphoros</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/sele_champion_chariot.png</Icon>
+    <Icon>units/sele/champion_chariot.png</Icon>
     <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
index 369e45a43b..4a8f41177a 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
@@ -6,7 +6,7 @@
     <GenericName>Armored War Elephant</GenericName>
     <SpecificName>Thorakisménos Eléphantos</SpecificName>
     <Classes datatype="tokens">IndianElephant</Classes>
-    <Icon>units/sele_champion_elephant.png</Icon>
+    <Icon>units/sele/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/elephantry_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml
index b7a949c3c3..4f2943fc30 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Silver Shield</GenericName>
     <SpecificName>Argyraspis</SpecificName>
-    <Icon>units/sele_champion_pikeman.png</Icon>
+    <Icon>units/sele/champion_pikeman.png</Icon>
     <RequiredTechnology>traditional_army_sele</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml
index 21cff5b2bd..e2e65f7471 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Romanized Heavy Swordsman</GenericName>
     <SpecificName>Thorakitès Rhomaïkós</SpecificName>
-    <Icon>units/sele_champion_swordsman.png</Icon>
+    <Icon>units/sele/champion_swordsman.png</Icon>
     <RequiredTechnology>reformed_army_sele</RequiredTechnology>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml b/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
index acd7219706..15fe6e7695 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Antiochus III the Great</GenericName>
     <SpecificName>Antiokhos G' Megas</SpecificName>
-    <Icon>units/sele_hero_antiochus_the_great.png</Icon>
+    <Icon>units/sele/hero_antiochus_the_great.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/hero_cavalry_spearman_antiochus_the_great_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml b/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
index c8c3c67a69..4fda15c64c 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Antiochus IV</GenericName>
     <SpecificName>Antiokhos D' Epiphanēs</SpecificName>
-    <Icon>units/sele_hero_antiochus_the_righteous.png</Icon>
+    <Icon>units/sele/hero_antiochus_the_righteous.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/hero_cavalry_swordsman_antiochus_IV_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml b/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
index 3ecf69fb1b..3f4fe133a2 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Seleucus I</GenericName>
     <SpecificName>Seleukos A' Nikatōr</SpecificName>
-    <Icon>units/sele_hero_seleucus.png</Icon>
+    <Icon>units/sele/hero_seleucus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/hero_elephantry_seleucus_victor_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
index c1cd851784..51bf1e9a55 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/infantry_archer_merc_b</SelectionGroupName>
     <GenericName>Syrian Archer</GenericName>
     <SpecificName>Toxótēs Syrías</SpecificName>
-    <Icon>units/sele_infantry_archer.png</Icon>
+    <Icon>units/sele/infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml
index 6cac0b7385..bde1b9bfb9 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Arab Javelineer</GenericName>
     <SpecificName>Pezakontistès Aravikós</SpecificName>
-    <Icon>units/sele_infantry_javelinist.png</Icon>
+    <Icon>units/sele/infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml
index 82aedafd2a..ee6c77caea 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/infantry_pikeman_b</SelectionGroupName>
     <GenericName>Phalangite</GenericName>
     <SpecificName>Phalangitēs</SpecificName>
-    <Icon>units/sele_infantry_spearman.png</Icon>
+    <Icon>units/sele/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/sele/infantry_pikeman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml
index c247d94f51..f33c0b0b1e 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/infantry_spearman_b</SelectionGroupName>
     <GenericName>Militia Thureos Spearman</GenericName>
     <SpecificName>Thureophóros Politès</SpecificName>
-    <Icon>units/sele_infantry_spearman_2.png</Icon>
+    <Icon>units/sele/infantry_spearman_2.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/sele/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
index 1801d9ae76..d4751990c4 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
@@ -11,7 +11,7 @@
     <SelectionGroupName>units/sele/infantry_swordsman_merc_b</SelectionGroupName>
     <GenericName>Thracian Mercenary Swordsman</GenericName>
     <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
-    <Icon>units/sele_infantry_swordsman.png</Icon>
+    <Icon>units/sele/infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml
index 7f01861e8e..9b21c45fba 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml
@@ -8,7 +8,7 @@
     <Civ>sele</Civ>
     <GenericName>Bireme</GenericName>
     <SpecificName>Dierēs</SpecificName>
-    <Icon>units/ptol_ship_bireme.png</Icon>
+    <Icon>units/ptol/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/bireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/sele/ship_fishing.xml
index 9a656197ab..57635557d1 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml
index 9d9d6dc3cc..09516a2014 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
-    <Icon>units/hele_ship_merchant.png</Icon>
+    <Icon>units/hele/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml
index 906cfa7efd..bdcc046e9d 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Pentères</SpecificName>
-    <Icon>units/ptol_ship_quinquereme.png</Icon>
+    <Icon>units/ptol/ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/quinquereme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml
index 0d293c25c3..ce50747605 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml
@@ -8,7 +8,7 @@
     <Civ>sele</Civ>
     <SpecificName>Seleukidó̱n Triērēs</SpecificName>
     <GenericName>Seleucid Trireme</GenericName>
-    <Icon>units/hele_ship_trireme.png</Icon>
+    <Icon>units/hele/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_packed.xml
index c317a60dd2..31b4b96f95 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele/siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/sele/siege_lithobolos_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml
index a8490292e6..1c27f7e6ef 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml
@@ -4,7 +4,7 @@
     <Square width="6.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Icon>units/hele_siege_lithobolos.png</Icon>
+    <Icon>units/hele/siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/sele/siege_lithobolos_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml
index 559e4b3fb0..b8ec158c5e 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Krios</SpecificName>
-    <Icon>units/mace_siege_ram.png</Icon>
+    <Icon>units/mace/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/siege_tower.xml b/binaries/data/mods/public/simulation/templates/units/sele/siege_tower.xml
index 7e4a1f83ad..5f28446576 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/siege_tower.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Helépolis</SpecificName>
-    <Icon>units/hele_siege_tower.png</Icon>
+    <Icon>units/hele/siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/seleucids/siege_tower.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml
index d83014b087..570352d59a 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <SpecificName>Syrías Gýnē</SpecificName>
     <GenericName>Syrian Woman</GenericName>
-    <Icon>units/sele_support_female.png</Icon>
+    <Icon>units/sele/support_female.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/female_citizen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_healer_b.xml
index 24ed722c79..37ee1cbd41 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
-    <Icon>units/hele_support_healer.png</Icon>
+    <Icon>units/hele/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/sele/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml
index abffef71ff..c497da9497 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml
@@ -8,7 +8,7 @@
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SpecificName>Émporos</SpecificName>
-    <Icon>units/pers_support_trader.png</Icon>
+    <Icon>units/pers/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml
index 13b0806e9b..b1cdb39a46 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/spart/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Perioikoi Cavalryman</GenericName>
     <SpecificName>Pródromos Perioïkós</SpecificName>
-    <Icon>units/spart_cavalry_javelinist.png</Icon>
+    <Icon>units/spart/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/spart/cavalry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml
index d45e5dab3e..2888560cb0 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/spart/cavalry_spearman_b</SelectionGroupName>
     <GenericName>Greek Allied Cavalry</GenericName>
     <SpecificName>Hippeús Symmakhikós</SpecificName>
-    <Icon>units/spart_cavalry_spearman.png</Icon>
+    <Icon>units/spart/cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_pike.xml b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_pike.xml
index 00735a78d8..e933639c9c 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_pike.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_pike.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Spartan Pikeman</GenericName>
     <SpecificName>Phalangites Spartiatis</SpecificName>
-    <Icon>units/spart_champion_infantry_pike.png</Icon>
+    <Icon>units/spart/champion_infantry_pike.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/infantry_pikeman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml
index e5cb296965..13dd19b516 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Spartan Hoplite</GenericName>
     <SpecificName>Spartiátēs</SpecificName>
-    <Icon>units/spart_champion_infantry_spear.png</Icon>
+    <Icon>units/spart/champion_infantry_spear.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/infantry_spearman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
index 2300a37d6f..a0981df26b 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
@@ -17,7 +17,7 @@
     <GenericName>Skiritai Commando</GenericName>
     <SpecificName>Ékdromos Skirítēs</SpecificName>
     <Rank>Elite</Rank>
-    <Icon>units/spart_champion_infantry_sword.png</Icon>
+    <Icon>units/spart/champion_infantry_sword.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml b/binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml
index 07ccabec74..3cfc3984a5 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Agis III</GenericName>
     <SpecificName>Agis</SpecificName>
-    <Icon>units/spart_hero_agis.png</Icon>
+    <Icon>units/spart/hero_agis.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/hero_infantry_spearman_agis.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml b/binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml
index a4a18749ba..f1d375799f 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Brasidas</GenericName>
     <SpecificName>Brasidas</SpecificName>
-    <Icon>units/spart_hero_brasidas.png</Icon>
+    <Icon>units/spart/hero_brasidas.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/hero_infantry_swordsman_brasidas.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml
index d67ec3c292..424834ab62 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml
@@ -8,7 +8,7 @@
     <Lang>greek</Lang>
     <GenericName>Leonidas I</GenericName>
     <SpecificName>Leōnidēs</SpecificName>
-    <Icon>units/spart_hero_leonidas.png</Icon>
+    <Icon>units/spart/hero_leonidas.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/hero_infantry_spearman_leonidas.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas_300.xml b/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas_300.xml
index 5099fdf5d2..c994b88d13 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas_300.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas_300.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/spart/hero_leonidas">
   <Identity>
-    <Icon>units/spart_hero_leonidas_300.png</Icon>
+    <Icon>units/spart/hero_leonidas_300.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/hero_infantry_spearman_leonidas_300.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml
index 1c88037e28..22b101c83f 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml
@@ -12,7 +12,7 @@
     <SelectionGroupName>units/spart/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Helot Skirmisher</GenericName>
     <SpecificName>Akontistḗs Heílōs</SpecificName>
-    <Icon>units/spart_infantry_javelinist.png</Icon>
+    <Icon>units/spart/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/spart/infantry_javelineer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml
index 4e58e192f6..9e7391aa53 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml
@@ -12,7 +12,7 @@
     <SelectionGroupName>units/spart/infantry_spearman_b</SelectionGroupName>
     <GenericName>Perioikoi Hoplite</GenericName>
     <SpecificName>Hoplítēs Períoikos</SpecificName>
-    <Icon>units/spart_infantry_spearman.png</Icon>
+    <Icon>units/spart/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/spart/infantry_spearman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml
index 60ecf4b742..cf88b1b714 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Pentēkóntoros</SpecificName>
-    <Icon>units/hele_ship_bireme.png</Icon>
+    <Icon>units/hele/ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/pentekonter.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/spart/ship_fishing.xml
index 448edbdeb3..e314efb182 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/ship_fishing.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml
index 32e8db722f..e36f8cf308 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
-    <Icon>units/hele_ship_merchant.png</Icon>
+    <Icon>units/hele/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml
index 056b098e71..96bd3ed904 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml
@@ -8,7 +8,7 @@
     <Civ>spart</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
     <GenericName>Spartan Trireme</GenericName>
-    <Icon>units/hele_ship_trireme.png</Icon>
+    <Icon>units/hele/ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_packed.xml
index a6ea2dab61..43c1987031 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_packed.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele/siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/spart/siege_oxybeles_unpacked</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_unpacked.xml
index 8332f8f993..e7b3933429 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/siege_oxybeles_unpacked.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/spart/siege_oxybeles_packed">
   <Identity>
-    <Icon>units/hele_siege_oxybeles.png</Icon>
+    <Icon>units/hele/siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/spart/siege_oxybeles_packed</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml
index 5a87725dfc..108d0a8250 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Krios</SpecificName>
-    <Icon>units/spart_siege_ram.png</Icon>
+    <Icon>units/spart/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/siege_ram.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
index 882564ebce..42c76eae54 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
@@ -24,7 +24,7 @@
     <Lang>greek</Lang>
     <GenericName>Spartan Woman</GenericName>
     <SpecificName>Spartiâtis</SpecificName>
-    <Icon>units/spart_support_female_citizen.png</Icon>
+    <Icon>units/spart/support_female_citizen.png</Icon>
   </Identity>
   <UnitAI>
     <CanPatrol>true</CanPatrol>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/spart/support_healer_b.xml
index 4fdfd8bfbd..cfb134c68f 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/support_healer_b.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
-    <Icon>units/hele_support_healer.png</Icon>
+    <Icon>units/hele/support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/spart/support_healer_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/spart/support_trader.xml
index 9729c5d67f..18b85472bc 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Émporos Períoikos</SpecificName>
-    <Icon>units/hele_support_trader.png</Icon>
+    <Icon>units/hele/support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/trader.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/theb_sacred_band.xml b/binaries/data/mods/public/simulation/templates/units/theb_sacred_band.xml
index a9de6e0acc..f86c820647 100644
--- a/binaries/data/mods/public/simulation/templates/units/theb_sacred_band.xml
+++ b/binaries/data/mods/public/simulation/templates/units/theb_sacred_band.xml
@@ -5,7 +5,7 @@
     <GenericName>Theban Sacred Band Hoplite</GenericName>
     <SpecificName>Hieroû Thebaíou Lókhou Hoplítai</SpecificName>
     <Tooltip>Champion Spearman.</Tooltip>
-    <Icon>units/thebes_sacred_band_hoplitai.png</Icon>
+    <Icon>units/theb/champion_infantry_hoplite.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/thebans/infantry_spearman_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml b/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
index 14353bba91..3bb7ea6d72 100644
--- a/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ b/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -7,7 +7,7 @@
   <Identity>
     <GenericName>Fire Raiser</GenericName>
     <SpecificName>Pyrobolos</SpecificName>
-    <Icon>units/hele_siege_lithobolos.png</Icon>
+    <Icon>units/theb/siege_fireraiser.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/units/thesp_melanochitones.xml b/binaries/data/mods/public/simulation/templates/units/thesp_melanochitones.xml
index b919de4429..4f2dcc5e60 100644
--- a/binaries/data/mods/public/simulation/templates/units/thesp_melanochitones.xml
+++ b/binaries/data/mods/public/simulation/templates/units/thesp_melanochitones.xml
@@ -4,7 +4,7 @@
     <Lang>greek</Lang>
     <GenericName>Thespian Black Cloak</GenericName>
     <SpecificName>Melanochitones</SpecificName>
-    <Icon>units/thespian_melanochitones.png</Icon>
+    <Icon>units/theb/champion_infantry_swordsman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/thebans/infantry_swordsman_c.xml</Actor>