Index: binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
+++ binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <SpecificName>Great Pyramid</SpecificName>
-    <Icon>gaia/special_pyramid.png</Icon>
+    <Icon>structures/pyramid.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="59.0" depth="59.0"/>
Index: binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
+++ binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <SpecificName>Minor Pyramid</SpecificName>
-    <Icon>gaia/special_pyramid.png</Icon>
+    <Icon>structures/pyramid.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="34.0" depth="34.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml
@@ -41,7 +41,7 @@
     <Tooltip>Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Construct Warships and research technologies.</Tooltip>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Naval -City Town Shipyard</VisibleClasses>
-    <Icon>structures/uber_dock.png</Icon>
+    <Icon>structures/dock_super.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml
@@ -4,7 +4,7 @@
     <Civ>cart</Civ>
     <SpecificName>Low Wall</SpecificName>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Icon>structures/palisade_wall.png</Icon>
+    <Icon>structures/palisade.png</Icon>
   </Identity>
   <WallSet>
     <Templates>
Index: binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
@@ -22,7 +22,7 @@
   <Identity>
     <GenericName>Stoa</GenericName>
     <SpecificName>Hellenic Stoa</SpecificName>
-    <Icon>gaia/special_stoa.png</Icon>
+    <Icon>structures/stoa.png</Icon>
   </Identity>
   <Loot>
     <stone>50</stone>
Index: binaries/data/mods/public/simulation/templates/structures/iber/monument.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber/monument.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber/monument.xml
@@ -32,7 +32,7 @@
     <GenericName>Revered Monument</GenericName>
     <SpecificName>Gur Oroigarri</SpecificName>
     <VisibleClasses datatype="tokens">Monument</VisibleClasses>
-    <Icon>structures/iberian_bull.png</Icon>
+    <Icon>structures/iber_monument.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
Index: binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
@@ -24,7 +24,7 @@
   <Identity>
     <GenericName>Ishtar Gate of Babylon</GenericName>
     <Tooltip>Territory root.</Tooltip>
-    <Icon>structures/pers_gate.png</Icon>
+    <Icon>structures/ishtar_gate.png</Icon>
   </Identity>
   <Loot>
     <stone>50</stone>
Index: binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml
@@ -28,7 +28,7 @@
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">City Pyramid</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <Icon>structures/kush_pyramid_big.png</Icon>
+    <Icon>structures/kush_pyramid_large.png</Icon>
   </Identity>
   <Loot>
     <stone>90</stone>
Index: binaries/data/mods/public/simulation/templates/structures/maur/palace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/palace.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/palace.xml
@@ -20,7 +20,7 @@
     <Tooltip>Train Female Citizens, Champions, and Heroes.</Tooltip>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
-    <Icon>gaia/special_stoa.png</Icon>
+    <Icon>structures/stoa.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
Index: binaries/data/mods/public/simulation/templates/structures/maur/pillar_ashoka.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/pillar_ashoka.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/pillar_ashoka.xml
@@ -32,7 +32,7 @@
     <GenericName>Edict Pillar of Ashoka</GenericName>
     <SpecificName>Śāsana Stambha Aśokā</SpecificName>
     <VisibleClasses datatype="tokens">Pillar</VisibleClasses>
-    <Icon>structures/ashoka_pillar.png</Icon>
+    <Icon>structures/maur_pillar.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
Index: binaries/data/mods/public/simulation/templates/structures/obelisk.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/obelisk.xml
+++ binaries/data/mods/public/simulation/templates/structures/obelisk.xml
@@ -10,7 +10,7 @@
   <Identity>
     <GenericName>Obelisk</GenericName>
     <SpecificName>Egyptian Obelisk</SpecificName>
-    <Icon>gaia/special_obelisk.png</Icon>
+    <Icon>structures/obelisk.png</Icon>
   </Identity>
   <Loot>
     <stone>200</stone>
Index: binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
+++ binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
@@ -7,7 +7,7 @@
   </Footprint>
   <Identity>
     <GenericName>Wooden Tower</GenericName>
-    <Icon>structures/palisade_fort.png</Icon>
+    <Icon>structures/tower_wooden.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="9.0" depth="7.5"/>
Index: binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml
@@ -28,7 +28,7 @@
     <Tooltip>Train Champions and Heroes.</Tooltip>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
-    <Icon>structures/palace.png</Icon>
+    <Icon>structures/pers_palace.png</Icon>
   </Identity>
   <Loot>
     <stone>60</stone>
Index: binaries/data/mods/public/simulation/templates/structures/pers/tacara.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/tacara.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/tacara.xml
@@ -24,7 +24,7 @@
     <SpecificName>Taçara</SpecificName>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
-    <Icon>structures/palace.png</Icon>
+    <Icon>structures/pers_palace.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>
Index: binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
@@ -75,7 +75,7 @@
     <Tooltip>Build in neutral or enemy territory. Train Melee Infantry. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">City ArmyCamp</VisibleClasses>
-    <Icon>structures/roman_camp.png</Icon>
+    <Icon>structures/rome_camp.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
+++ binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
@@ -4,7 +4,7 @@
     <GenericName>Palisade</GenericName>
     <Tooltip>Wall off an area. Build in own or neutral territory.</Tooltip>
     <VisibleClasses datatype="tokens">-Wall Palisade</VisibleClasses>
-    <Icon>structures/palisade_wall.png</Icon>
+    <Icon>structures/palisade.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <WallSet>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -28,7 +28,7 @@
     <SelectionGroupName>template_structure_civic_stoa</SelectionGroupName>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Town Stoa</VisibleClasses>
-    <Icon>gaia/special_stoa.png</Icon>
+    <Icon>structures/stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
@@ -18,7 +18,7 @@
     <SelectionGroupName>template_structure_defensive_palisade</SelectionGroupName>
     <Tooltip>Wall off an area. Build in own or neutral territory.</Tooltip>
     <VisibleClasses datatype="tokens">Palisade</VisibleClasses>
-    <Icon>gaia/special_palisade.png</Icon>
+    <Icon>structures/palisade.png</Icon>
   </Identity>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -31,7 +31,7 @@
     <SelectionGroupName>template_structure_defensive_tower_sentry</SelectionGroupName>
     <Tooltip>Garrison Infantry for additional arrows. Needs the “Murder Holes” technology to protect its foot.</Tooltip>
     <VisibleClasses datatype="tokens">Village SentryTower</VisibleClasses>
-    <Icon>structures/sentry_tower.png</Icon>
+    <Icon>structures/tower_sentry.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
@@ -32,7 +32,7 @@
     <SelectionGroupName>template_structure_defensive_tower_stone</SelectionGroupName>
     <Tooltip>Garrison Infantry for additional arrows. Needs the “Murder Holes” technology to protect its foot.</Tooltip>
     <VisibleClasses datatype="tokens">Town StoneTower</VisibleClasses>
-    <Icon>structures/defense_tower.png</Icon>
+    <Icon>structures/tower_stone.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
@@ -23,7 +23,7 @@
     <SelectionGroupName>template_structure_defensive_wall_gate</SelectionGroupName>
     <Tooltip>Allow units access through Walls. Can be locked to prevent access.</Tooltip>
     <VisibleClasses datatype="tokens">Gate</VisibleClasses>
-    <Icon>structures/gate.png</Icon>
+    <Icon>structures/wall_gate.png</Icon>
   </Identity>
   <Loot>
     <wood>2</wood>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -52,7 +52,7 @@
     <SelectionGroupName>template_structure_defensive_wall_tower</SelectionGroupName>
     <Tooltip>Garrison Infantry for additional arrows.</Tooltip>
     <Classes datatype="tokens">WallTower</Classes>
-    <Icon>structures/tower.png</Icon>
+    <Icon>structures/wall_tower.png</Icon>
   </Identity>
   <Loot>
     <stone>18</stone>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
@@ -26,7 +26,7 @@
     <SelectionGroupName>template_structure_military_arsenal</SelectionGroupName>
     <Tooltip>Train Champion Infantry Crossbowmen, construct Siege Engines, and research Siege Engine technologies.</Tooltip>
     <VisibleClasses datatype="tokens">City Arsenal</VisibleClasses>
-    <Icon>structures/siege_workshop.png</Icon>
+    <Icon>structures/arsenal.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -27,7 +27,7 @@
     <SelectionGroupName>template_structure_military_barracks</SelectionGroupName>
     <Tooltip>Train Infantry and research Infantry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
-    <Icon>structures/pers_barracks.png</Icon>
+    <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
@@ -24,7 +24,7 @@
     <Tooltip>Research attack and resistance technologies.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Town Forge</VisibleClasses>
-    <Icon>structures/blacksmith.png</Icon>
+    <Icon>structures/forge.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -24,7 +24,7 @@
     <SelectionGroupName>template_structure_military_stable</SelectionGroupName>
     <Tooltip>Train Cavalry and research Cavalry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Stable</VisibleClasses>
-    <Icon>structures/pers_stable.png</Icon>
+    <Icon>structures/stable.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
@@ -25,7 +25,7 @@
     <GenericName>Library</GenericName>
     <SelectionGroupName>template_structure_special_library</SelectionGroupName>
     <VisibleClasses datatype="tokens">Library</VisibleClasses>
-    <Icon>structures/library_scroll.png</Icon>
+    <Icon>structures/library.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
Index: binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -22,7 +22,7 @@
     <GenericName>Rotary Mill</GenericName>
     <SelectionGroupName>template_structure_special_rotarymill</SelectionGroupName>
     <VisibleClasses datatype="tokens">RotaryMill</VisibleClasses>
-    <Icon>structures/rotarymill.png</Icon>
+    <Icon>structures/rotary_mill.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>