diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png
new file mode 100644
index 0000000000..eca43bb4d0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43d9f30795c2dce1cbceca1c86f6112998e9b1a6f86358b0e53c0e62b3fdae89
+size 120777
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png
deleted file mode 100644
index d42439ae98..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34b03353c968da95e24c0de50399ac4b3d1b502e120e50ffb388f5ebaf50fd74
-size 141928
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
index 1866db0826..1f10f528cc 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
@@ -9,8 +9,8 @@
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Carbanto</SpecificName>
-    <SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_brit.png</Icon>
+    <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
+    <Icon>units/brit_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_4.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
index 579b2a164b..cb61ea1bc7 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
@@ -5,7 +5,7 @@
     <GenericName>Brythonic Longswordsman</GenericName>
     <SpecificName>Delamokludda</SpecificName>
     <SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_brit.png</Icon>
+    <Icon>units/brit_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_3.xml</Actor>
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 3d13ea1715..14783152a4 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 (Chariot)</GenericName>
     <SpecificName>Boadicea</SpecificName>
     <Gender>female</Gender>
-    <Icon>units/celt_hero_boudicca.png</Icon>
+    <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
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 27d44b0df0..159334ed40 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 (Sword)</GenericName>
     <SpecificName>Boadicea</SpecificName>
     <Gender>female</Gender>
-    <Icon>units/celt_hero_boudicca.png</Icon>
+    <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/boudicca.xml</Actor>
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 f4c4ab054a..22c2df8e77 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
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Caratacos</SpecificName>
-    <Icon>units/celt_hero_caratacos.png</Icon>
+    <Icon>units/brit_hero_caratacos.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/caradoc.xml</Actor>
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 6a3fefd138..16cb31a6b1 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
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
-    <Icon>units/celt_hero_cynvelin.png</Icon>
+    <Icon>units/brit_hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/cunobelin_horse.xml</Actor>
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 30a219a6a8..8d5d2f5485 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_sacred_band_cavalry.png</Icon>
+    <Icon>units/cart_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_3.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 20e7ab413a..85d1bde8ca 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
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <GenericName>North African War Elephant</GenericName>
     <SpecificName>Pil Malḥamit</SpecificName>
-    <Icon>units/cart_champion_cavalry.png</Icon>
+    <Icon>units/cart_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_2.xml</Actor>
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 dde6abf7a3..815f4c5c42 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>Gallic Brihent</SpecificName>
     <SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_gaul.png</Icon>
+    <Icon>units/gaul_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_2.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
index d7292ca7b3..ef03da4098 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
@@ -5,7 +5,7 @@
     <GenericName>Heavy Swordsman</GenericName>
     <SpecificName>Solduros</SpecificName>
     <SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_gaul.png</Icon>
+    <Icon>units/gaul_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_1.xml</Actor>
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 036b5f44e4..7fa8e5bbf1 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
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brennus</SpecificName>
-    <Icon>units/celt_hero_brennus.png</Icon>
+    <Icon>units/gaul_hero_brennus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/brennus.xml</Actor>
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 0720b2a1c1..0a8f9f2d88 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
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Vercingetorix</SpecificName>
-    <Icon>units/celt_hero_vercingetorix.png</Icon>
+    <Icon>units/gaul_hero_vercingetorix.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/vercingetorix_horse.xml</Actor>
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 3390682e94..f29bfa6835 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
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Britomartus</SpecificName>
-    <Icon>units/celt_hero_viridomarus.png</Icon>
+    <Icon>units/gaul_hero_viridomarus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/viridomarus.xml</Actor>
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 3847a4d3fd..88230bf9ff 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/hele_champion_cavalry_mace.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_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
index 81a0c08c05..f67b6e0110 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
@@ -5,7 +5,7 @@
     <Lang>greek</Lang>
     <GenericName>Macedonian Shield Bearer</GenericName>
     <SpecificName>Hypaspistḗs</SpecificName>
-    <Icon>units/macedonian_hypaspist.png</Icon>
+    <Icon>units/mace_hypaspist.png</Icon>
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
index 7855b72d6f..bb5b65e8d2 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
@@ -9,7 +9,7 @@
   </Health>
   <Identity>
     <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
-    <Icon>units/macedonian_argyraspidai.png</Icon>
+    <Icon>units/mace_argyraspidai.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
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 b47d4edb71..d3b6dda5c5 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
@@ -10,7 +10,7 @@
     <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Babiruviya Ratha</SpecificName>
-    <Icon>units/pers_cavalry_archer.png</Icon>
+    <Icon>units/pers_chariot_archer.png</Icon>
     <Tooltip>Causes trample damage to enemy units.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
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 06f0728cf5..34832ecb28 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
@@ -4,7 +4,7 @@
     <Civ>pers</Civ>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Hinduya Pila</SpecificName>
-    <Icon>units/pers_war_elephant.png</Icon>
+    <Icon>units/pers_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/war_elephant.xml</Actor>
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 ea41a1fea7..1a2d0a9ab0 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
@@ -3,10 +3,10 @@
   <Identity>
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Camel</VisibleClasses>
-    <SelectionGroupName>units/ptol_cavalry_archer_b</SelectionGroupName>
+    <SelectionGroupName>units/ptol_camel_archer</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
-    <Icon>units/ptol_cavalry_archer.png</Icon>
+    <Icon>units/ptol_camel_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
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 85e0a29b89..72ccd0cc34 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_cataphract.png</Icon>
+    <Icon>units/sele_champion_cavalry.png</Icon>
     <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
   </Identity>
   <VisualActor>
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 bd0829ede1..dff56dad44 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 Pikeman</GenericName>
     <SpecificName>Phalangitès Argyraspis</SpecificName>
-    <Icon>units/sele_champion_infantry_pikeman.png</Icon>
+    <Icon>units/sele_champion_pikeman.png</Icon>
     <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
   </Identity>
   <VisualActor>