diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
index eb60a00bc7..274cb73d3e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
@@ -23,7 +23,7 @@
   <Identity>
     <GenericName>Wolfhound</GenericName>
     <SpecificName>Canis lupus familiaris</SpecificName>
-    <Icon>units/brit_wolfhound.png</Icon>
+    <Icon>units/brit/wolfhound.png</Icon>
   </Identity>
   <Loot>
     <xp>8</xp>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
index 05e2c5b562..d649617ccf 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_cavalry">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_cavalry_javelinist.png</Icon>
+    <Icon>units/athen/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
index 7076e9fea3..f791624832 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_infantry_spearman.png</Icon>
+    <Icon>units/athen/infantry_spearman.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
index 04a6c09c7f..d9e20d9e06 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
@@ -2,13 +2,13 @@
 <Entity parent="template_unit_infantry_ranged">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_infantry_slinger.png</Icon>
+    <Icon>units/rome/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
     <general>units/{civ}/infantry_javelineer_b</general>
   </SkirmishReplacer>
   <VisualActor>
-    <Actor>units/athenians/infantry_slinger_b.xml</Actor>
+    <Actor>units/romans/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
index 9b15528c4b..94cb1eb47d 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_ship_trireme.png</Icon>
+    <Icon>units/athen/ship_trireme.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/ship_trireme</general>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
index 0b9e8812e5..1d379f9122 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/spart_siege_ram.png</Icon>
+    <Icon>units/spart/siege_ram.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/siege_ram</general>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
index 3d48b60b90..91cc4873d1 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/hele_support_female_citizen.png</Icon>
+    <Icon>units/hele/support_female_citizen.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/support_female_citizen</general>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
index 55622daa90..dbaadf291e 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/maur_support_elephant.png</Icon>
+    <Icon>units/maur/support_elephant.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer/>