diff --git a/data/multiplayer/factions/alliance_of_darkness.cfg b/data/multiplayer/factions/alliance_of_darkness.cfg
index 4126a36527e..9f5cfc3a448 100644
--- a/data/multiplayer/factions/alliance_of_darkness.cfg
+++ b/data/multiplayer/factions/alliance_of_darkness.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Alliance of Darkness
-    name={MENU_IMG_TXT "undead-necromancers/dark-sorcerer.png~RC(magenta>red)" (_"Alliance of Darkness")}
+    name={MENU_IMG_TXT "units/undead-necromancers/dark-sorcerer.png~RC(magenta>red)" (_"Alliance of Darkness")}
     type=Dark Sorcerer
     leader=Dark Sorcerer,Revenant,Bone Shooter,Deathblade,Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer,Rogue,Bandit,Trapper,Saurian Oracle,Saurian Soothsayer
     random_leader=Dark Sorcerer,Revenant,Bone Shooter,Deathblade,Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer,Rogue,Bandit,Trapper
diff --git a/data/multiplayer/factions/alliance_of_light.cfg b/data/multiplayer/factions/alliance_of_light.cfg
index 6132d0b4570..f7243f407a6 100644
--- a/data/multiplayer/factions/alliance_of_light.cfg
+++ b/data/multiplayer/factions/alliance_of_light.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Alliance of Light
-    name={MENU_IMG_TXT "human-magi/white-mage.png" (_"Alliance of Light")}
+    name={MENU_IMG_TXT "units/human-magi/white-mage.png" (_"Alliance of Light")}
     type=White Mage
     leader=White Mage,Red Mage,Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Lieutenant,Pikeman,Swordsman,Javelineer,Shock Trooper,Longbowman,Dwarvish Steelclad,Dwarvish Stalwart,Dwarvish Thunderguard
     random_leader=White Mage,Red Mage,Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Lieutenant,Pikeman,Swordsman,Javelineer,Longbowman,Dwarvish Steelclad,Dwarvish Thunderguard
diff --git a/data/multiplayer/factions/drakes-aoh.cfg b/data/multiplayer/factions/drakes-aoh.cfg
index dc6c5d092bb..06cbe5c9d46 100644
--- a/data/multiplayer/factions/drakes-aoh.cfg
+++ b/data/multiplayer/factions/drakes-aoh.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Drakes
-    name={MENU_IMG_TXT "drakes/flameheart.png" _"Drakes"}
+    name={MENU_IMG_TXT "units/drakes/flameheart.png" _"Drakes"}
     type=Drake Flameheart
     leader=Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Drake Blademaster,Saurian Soothsayer,Saurian Oracle
     random_leader=Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Drake Blademaster
diff --git a/data/multiplayer/factions/drakes-default.cfg b/data/multiplayer/factions/drakes-default.cfg
index 895fe8b07ee..ea208169acb 100644
--- a/data/multiplayer/factions/drakes-default.cfg
+++ b/data/multiplayer/factions/drakes-default.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Drakes
-    name={MENU_IMG_TXT "drakes/flare.png" _"Drakes"}
+    name={MENU_IMG_TXT "units/drakes/flare.png" _"Drakes"}
     type=Drake Flare
     leader=Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake Warrior,Saurian Oracle,Saurian Soothsayer
     random_leader=Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake Warrior
diff --git a/data/multiplayer/factions/knalgans-aoh.cfg b/data/multiplayer/factions/knalgans-aoh.cfg
index 2757a4acad0..4feadeef4d8 100644
--- a/data/multiplayer/factions/knalgans-aoh.cfg
+++ b/data/multiplayer/factions/knalgans-aoh.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Knalgan Alliance
-    name={MENU_IMG_TXT "dwarves/lord.png~RC(magenta>red)" (_"Knalgan Alliance")}
+    name={MENU_IMG_TXT "units/dwarves/lord.png~RC(magenta>red)" (_"Knalgan Alliance")}
     type=Dwarvish Lord
     leader=Dwarvish Lord,Dwarvish Dragonguard,Dwarvish Sentinel,Assassin,Huntsman,Ranger
     random_leader=Dwarvish Lord,Dwarvish Dragonguard,Assassin,Huntsman,Ranger
diff --git a/data/multiplayer/factions/knalgans-default.cfg b/data/multiplayer/factions/knalgans-default.cfg
index 12777be5e2c..0dd437e5b7b 100644
--- a/data/multiplayer/factions/knalgans-default.cfg
+++ b/data/multiplayer/factions/knalgans-default.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Knalgan Alliance
-    name={MENU_IMG_TXT "dwarves/steelclad.png~RC(magenta>red)" (_"Knalgan Alliance")}
+    name={MENU_IMG_TXT "units/dwarves/steelclad.png~RC(magenta>red)" (_"Knalgan Alliance")}
     type=Dwarvish Steelclad
     leader=Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Stalwart,Rogue,Trapper
     random_leader=Dwarvish Steelclad,Dwarvish Thunderguard,Rogue,Trapper
diff --git a/data/multiplayer/factions/loyalists-aoh.cfg b/data/multiplayer/factions/loyalists-aoh.cfg
index c0e152158d2..1cc00835c68 100644
--- a/data/multiplayer/factions/loyalists-aoh.cfg
+++ b/data/multiplayer/factions/loyalists-aoh.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Loyalists
-    name={MENU_IMG_TXT "human-loyalists/general.png~RC(magenta>red)" _"Loyalists"}
+    name={MENU_IMG_TXT "units/human-loyalists/general.png~RC(magenta>red)" _"Loyalists"}
     type=General
     leader=General,Royal Guard,Halberdier,Iron Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage,Javelineer
     random_leader=General,Royal Guard,Halberdier,Master Bowman,Arch Mage,Silver Mage
diff --git a/data/multiplayer/factions/loyalists-default.cfg b/data/multiplayer/factions/loyalists-default.cfg
index d657da7afd5..4ba3dad2bb1 100644
--- a/data/multiplayer/factions/loyalists-default.cfg
+++ b/data/multiplayer/factions/loyalists-default.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Loyalists
-    name={MENU_IMG_TXT "human-loyalists/lieutenant.png~RC(magenta>red)" _"Loyalists"}
+    name={MENU_IMG_TXT "units/human-loyalists/lieutenant.png~RC(magenta>red)" _"Loyalists"}
     type=Lieutenant
     leader=Lieutenant,Swordsman,Pikeman,Javelineer,Shock Trooper,Longbowman,White Mage,Red Mage
     random_leader=Lieutenant,Swordsman,Pikeman,Javelineer,Longbowman,Red Mage
diff --git a/data/multiplayer/factions/northerners-aoh.cfg b/data/multiplayer/factions/northerners-aoh.cfg
index 03c26c5771a..0cb78774194 100644
--- a/data/multiplayer/factions/northerners-aoh.cfg
+++ b/data/multiplayer/factions/northerners-aoh.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Northerners
-    name={MENU_IMG_TXT "orcs/warlord.png~RC(magenta>red)" _"Northerners"}
+    name={MENU_IMG_TXT "units/orcs/warlord.png~RC(magenta>red)" _"Northerners"}
     type=Orcish Warlord
     leader=Orcish Warlord,Troll Warrior,Orcish Slurbow,Orcish Slayer
     random_leader=Orcish Warlord,Troll Warrior,Orcish Slurbow
diff --git a/data/multiplayer/factions/northerners-default.cfg b/data/multiplayer/factions/northerners-default.cfg
index 5cfa3c54285..581a5546a08 100644
--- a/data/multiplayer/factions/northerners-default.cfg
+++ b/data/multiplayer/factions/northerners-default.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Northerners
-    name={MENU_IMG_TXT "orcs/warrior.png~RC(magenta>red)" _"Northerners"}
+    name={MENU_IMG_TXT "units/orcs/warrior.png~RC(magenta>red)" _"Northerners"}
     type=Orcish Warrior
     leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer
     recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish Assassin,Naga Fighter,Goblin Spearman
diff --git a/data/multiplayer/factions/rebels-aoh.cfg b/data/multiplayer/factions/rebels-aoh.cfg
index 7ce385c0dca..fd77a153531 100644
--- a/data/multiplayer/factions/rebels-aoh.cfg
+++ b/data/multiplayer/factions/rebels-aoh.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Rebels
-    name={MENU_IMG_TXT "elves-wood/marshal.png~RC(magenta>red)" _"Rebels"}
+    name={MENU_IMG_TXT "units/elves-wood/marshal.png~RC(magenta>red)" _"Rebels"}
     type=Elvish Marshal
     leader=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Mage of Light,Arch Mage,Silver Mage,Elvish Shyde,Elvish Enchantress,Ancient Wose
     random_leader=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Arch Mage,Silver Mage,Elvish Shyde,Elvish Enchantress
diff --git a/data/multiplayer/factions/rebels-default.cfg b/data/multiplayer/factions/rebels-default.cfg
index 700c1ac544b..bc38f4d6e00 100644
--- a/data/multiplayer/factions/rebels-default.cfg
+++ b/data/multiplayer/factions/rebels-default.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Rebels
-    name={MENU_IMG_TXT "elves-wood/captain.png~RC(magenta>red)" _"Rebels"}
+    name={MENU_IMG_TXT "units/elves-wood/captain.png~RC(magenta>red)" _"Rebels"}
     type=Elvish Captain
     leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage,Elder Wose
     random_leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Red Mage
diff --git a/data/multiplayer/factions/undead-aoh.cfg b/data/multiplayer/factions/undead-aoh.cfg
index d14af2c90ab..117081290b4 100644
--- a/data/multiplayer/factions/undead-aoh.cfg
+++ b/data/multiplayer/factions/undead-aoh.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Undead
-    name={MENU_IMG_TXT "undead-necromancers/lich.png~RC(magenta>red)" _"Undead"}
+    name={MENU_IMG_TXT "units/undead-necromancers/lich.png~RC(magenta>red)" _"Undead"}
     type=Lich
     leader=Lich,Necromancer,Draug,Banebow,Necrophage,Deathblade
     random_leader=Lich,Necromancer,Draug,Banebow
diff --git a/data/multiplayer/factions/undead-default.cfg b/data/multiplayer/factions/undead-default.cfg
index fa9a26ec59c..afecf42e57c 100644
--- a/data/multiplayer/factions/undead-default.cfg
+++ b/data/multiplayer/factions/undead-default.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-multiplayer
 [multiplayer_side]
     id=Undead
-    name={MENU_IMG_TXT "undead-necromancers/dark-sorcerer.png~RC(magenta>red)" _"Undead"}
+    name={MENU_IMG_TXT "units/undead-necromancers/dark-sorcerer.png~RC(magenta>red)" _"Undead"}
     type=Dark Sorcerer
     leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage
     random_leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage