diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_cavalry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_xenophon.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_xenophon.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_xenophon.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_xenophon.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_cavalry_javelinist.png
deleted file mode 100644
index 8ebb913ae2..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_cavalry_javelinist.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b97d6942f6b9c9391268a7e7191a9fd4346933b9c53366d2867357d83b1c1921
-size 30995
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_cavalry_swordsman.png
deleted file mode 100644
index c0229c059e..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_cavalry_swordsman.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0f908b661f4ded620f559b3c9237c614d91866eb2b5a74fb8d581bb4f94dedb
-size 106040
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cunobelin.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cunobelin.png
deleted file mode 100644
index 8ef45da103..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cunobelin.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:543b6f21eed3f4709df992d8791b240565af3e875f9be2ecbd6ca9d5075baacd
-size 103915
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_javelinist.png
deleted file mode 100644
index 941c79e882..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_javelinist.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3dcb5faeb7b830b1fbfcad223ac2472883cc0409e59aa60b4f1666a6f760a65b
-size 97762
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_slinger.png
deleted file mode 100644
index bb5ab279a6..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_slinger.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d15e0a7145f07e318453c30e58bd01da0c6d1e6ba32c199fff81ce57392aab90
-size 102191
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_spearman.png
deleted file mode 100644
index e3875dfece..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_infantry_spearman.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01eed4121292e1049f7d6dba2b1d785f8e3e0101c26dcefc8ff4879a2af99cf2
-size 100417
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_merc_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_merc_infantry_archer.png
deleted file mode 100644
index b66a19948f..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_merc_infantry_archer.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4dffda576415e5c35c1e1bc009632f41c8e252dfdfa1155f5d32597ae2401fd1
-size 99023
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_fanatic.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_fanatic.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_fanatic.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_fanatic.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_slinger.png
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_alexander.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_alexander.png
deleted file mode 100644
index f15eca3f22..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_alexander.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:246cd9cf6700bade92a71e852dd59bcda630031e2345e785f943e076c074e555
-size 121112
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_demetrius.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_demetrius.png
deleted file mode 100644
index 1c9dde3401..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_demetrius.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:225f2286cec3debf7688eca64297fd6cfcabc31dcd7972a9f4c0cb187e685626
-size 32064
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_leonidas.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_leonidas.png
deleted file mode 100644
index 18e3e7e4a1..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_leonidas.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:680a006cef73c1127048ef676d9a7b607c797150c05f6ac8e65e6995740a888b
-size 33464
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_themistocles.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_themistocles.png
deleted file mode 100644
index c754e37f15..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_themistocles.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19ec187ef05e903c85ce21db80c26d839d13d58a834f58d5033d834db19ac18c
-size 108284
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_themistocles2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_themistocles2.png
deleted file mode 100644
index 8f13e52451..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_hero_themistocles2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a41c5707d665e47901d2538b8f670cc1c03953f0b0088366da0ba1bde21cd08e
-size 29760
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_slinger.png
deleted file mode 100644
index 9cc1229445..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_slinger.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92f66b53baa62e8f71beb34d9ef78d48ecad1be0e4f4226992978c403d4cee69
-size 96834
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_spearman.png
deleted file mode 100644
index 0101e82387..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_spearman.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4749a219de1d1a41982e70bb1744fe2e9401d00ba2e46c4faea7e62bf9225068
-size 104028
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_merc_hoplite.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_merc_hoplite.png
deleted file mode 100644
index b4138c0ec3..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_merc_hoplite.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a15826be7b25b3674e142860f2260a228b885c3629f80882346ec6c9eb513f9c
-size 94859
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_merc_camelry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_camel_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_merc_camelry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_camel_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_merc_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_merc_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camelry_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_camelry_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/rome_merc_infantry_2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_merc_infantry_2.png
deleted file mode 100644
index a38c113032..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_merc_infantry_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:150945c89b6ac5c2770f2a890268b2800dc534045e597e4fac0b490d24580c09
-size 99851
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 34ee584cc3..52267b7a59 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
@@ -27,7 +27,7 @@
Army of Alexander the Great.
Army of Alexander the Great
This is what an army would look like on the Strat Map.
- units/hele_hero_alexander.png
+ units/mace_hero_alexander.png
6.0
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 ba10d67da5..9355499a4e 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 @@
Army of Macedonia
Army of Macedon
This is what an army would look like on the Strat Map.
- units/hele_hero_demetrius.png
+ units/mace_hero_demetrius.png
6.0
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 885389c5bb..a6a8fd9d0e 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
@@ -27,7 +27,7 @@
Army of Leonidas I.
Army of Leonidas I
This is what an army would look like on the Strat Map.
- units/hele_hero_leonidas.png
+ units/spart_hero_leonidas.png
6.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
index 9dc4ce0bf0..6a456102b5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -25,7 +25,6 @@
Elephant
War Elephant
- gaia/fauna_elephant.png
pitch
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
index 28f992d0d1..b9e1a85e3e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -38,7 +38,6 @@
Slave Worker
Slave
- units/global_slave.png
Gatherer with a finite life span. Bonused at mining and lumbering.
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
index ceb4f0e7af..9af61e14ed 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
@@ -5,7 +5,7 @@
greek
units/athen_cavalry_javelinist_b
Pródromos
- units/hele_cavalry_javelinist.png
+ units/athen_cavalry_javelinist.png
units/athen_cavalry_javelinist_a
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 fab597a96d..eb1a1008f5 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
@@ -6,7 +6,7 @@
units/athen_cavalry_swordsman_b
Greek Cavalry
Hippeús
- units/hele_cavalry_swordsman.png
+ units/athen_cavalry_swordsman.png
phase_town
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 5f68d096f0..02602f8db4 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
@@ -5,7 +5,7 @@
greek
Xenophon
Xenophōn
- units/hele_hero_xenophon.png
+ units/athen_hero_xenophon.png
units/athenians/hero_infantry_javelinist_xenophon.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
index 378dfbcbb7..d26c846b70 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -22,7 +22,7 @@
units/athen_infantry_javelinist_b
Thracian Peltast
Peltastḗs Thrâx
- units/hele_infantry_javelinist.png
+ units/athen_infantry_javelinist.png
phase_town
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 0088dc407f..d11171252f 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
@@ -22,7 +22,7 @@
units/athen_infantry_marine_archer_b
Cretan Mercenary Archer
Toxótēs Krētikós
- units/hele_infantry_archer.png
+ units/mace_infantry_archer.png
hellenes/special_iphicratean_reforms
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 c9a1f06fbc..e7fb633e79 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
@@ -3,6 +3,7 @@
athen
Doûlos
+ units/global_slave.png
units/global/slave.xml
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 ca89f845ef..c9516f5dfd 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,6 @@
brit
Cunobelin
- units/brit_hero_cunobelin.png
units/britons/hero_cavalry_swordsman_cunobelin_m.xml
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 f5e1121eff..4f93a872c6 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
@@ -12,7 +12,7 @@
units/brit_infantry_slinger_b
Celtic Slinger
Iaosae
- units/celt_infantry_slinger.png
+ units/gaul_infantry_slinger.png
units/brit_infantry_slinger_a
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 61252e2a79..8052969a69 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
@@ -15,7 +15,7 @@
gaul
Naked Fanatic
Gaesata
- units/celt_fanatic.png
+ units/gaul_champion_fanatic.png
phase_town
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 8668e999fc..52e4283d2e 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
@@ -11,7 +11,7 @@
units/gaul_infantry_slinger_b
Celtic Slinger
Iaosae
- units/celt_infantry_slinger.png
+ units/gaul_infantry_slinger.png
phase_town
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
index 488538a65e..bc750f80c2 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
@@ -12,7 +12,7 @@
units/kush_cavalry_javelinist_merc_b
Blemmye Desert Raider
nhw Bulahau gml
- units/kush_merc_camelry.png
+ units/kush_camel_javelinist.png
phase_town
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
index 629e9427bc..53be83aaa7 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
@@ -21,7 +21,7 @@
units/kush_infantry_javelinist_merc_b
Nuba Skirmisher
nhw ‘h3w Noba
- units/kush_infantry_merc_javelinist.png
+ units/kush_infantry_javelinist.png
phase_town
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 1c7047c84f..f7a5ecdf7c 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
@@ -20,7 +20,7 @@
units/mace_infantry_archer_b
Cretan Mercenary Archer
Toxótēs Krētikós
- units/hele_infantry_archer.png
+ units/mace_infantry_archer.png
phase_town
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 d6de452910..d14624159d 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
@@ -6,7 +6,7 @@
units/ptol_cavalry_archer
Nabataean Camel Archer
Mutsābiq Gamal Nabatu
- units/ptol_camelry_archer.png
+ units/ptol_camel_archer.png
phase_village
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 7bde499ea1..64d534c5e4 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
@@ -20,7 +20,7 @@
units/ptol_infantry_archer_b
Cretan Mercenary Archer
Toxótēs Krētikós
- units/hele_infantry_archer.png
+ units/mace_infantry_archer.png
phase_town
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 9e8f400bf4..63c5c1c843 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
@@ -20,7 +20,7 @@
units/sele_infantry_archer_merc_b
Syrian Archer
Toxótēs Syrías
- units/hele_infantry_archer.png
+ units/sele_infantry_archer.png
phase_town