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 d50bb5314c..89b34ccfd6 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
@@ -19,7 +19,7 @@
     <SinkAccel>9.8</SinkAccel>
   </Decay>
   <Footprint>
-    <Circle radius="12.0"/>
+    <Circle radius="8.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
@@ -29,6 +29,13 @@
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
     <Icon>units/mace_hero_alexander.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="16.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
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 d354bcbce6..03b3eca1cf 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
@@ -19,7 +19,7 @@
     <SinkAccel>9.8</SinkAccel>
   </Decay>
   <Footprint>
-    <Circle radius="12.0"/>
+    <Circle radius="8.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
@@ -29,6 +29,13 @@
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
     <Icon>units/spart_hero_leonidas.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="16.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 53493b2520..efa715d51c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -26,7 +26,7 @@
   </Decay>
   <Footprint>
     <Circle radius="1.5"/>
-    <Height>2.5</Height>
+    <Height>4.0</Height>
   </Footprint>
   <Garrisonable/>
   <Guard/>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 47d01d96b6..0ffc2a92fe 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -29,8 +29,8 @@
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Square width="4" depth="6"/>
-    <Height>7.5</Height>
+    <Square width="3.0" depth="6.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Cavalry</GenericName>
@@ -89,7 +89,7 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
index 66bc3db32b..0f734db78e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -14,9 +14,9 @@
       <metal>100</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>5.0</Height>
+  <Footprint replace="">
+    <Square width="3.0" depth="6.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>240</Max>
@@ -50,7 +50,7 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
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 60737c4373..507ef42cfb 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
@@ -13,9 +13,9 @@
       <metal>200</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="3.5"/>
-    <Height>6.0</Height>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>750</Max>
@@ -44,7 +44,7 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>10.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
index 22589f4a76..8ee45479db 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -25,9 +25,9 @@
       <food>100</food>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
+  <Footprint replace="">
+    <Square width="1.5" depth="3"/>
+    <Height>1.5</Height>
   </Footprint>
   <Health>
     <Max>110</Max>
@@ -66,7 +66,7 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>2.5</HeightOffset>
   </StatusBars>
   <TrainingRestrictions>
     <Category>WarDog</Category>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index 5f3471cd8c..b7e06e9981 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -13,9 +13,9 @@
       <metal>250</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>5.0</Height>
+  <Footprint replace="">
+    <Square width="3.0" depth="6.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
@@ -28,6 +28,13 @@
       special/formations/wedge
     </Formations>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="3.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
@@ -37,7 +44,7 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
index 7cdce3b396..0d1d610412 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -22,10 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
index b467579f3e..29c67ddc39 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -25,8 +25,8 @@
       <metal>500</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="3.0"/>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
@@ -35,6 +35,13 @@
   <Identity>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
@@ -49,6 +56,9 @@
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>10.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.95</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
index 657c9736c6..f23017d246 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
@@ -36,6 +36,9 @@
   </Position>
   <Selectable>
     <Overlay>
+      <Shape>
+        <Circle radius="2.0"/>
+      </Shape>
       <Texture>
         <MainTexture>128x128/star.png</MainTexture>
         <MainTextureMask>128x128/star_mask.png</MainTextureMask>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index d0a930cb88..9058556ee3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -13,10 +13,6 @@
       <metal>150</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Health>
     <Max>1000</Max>
   </Health>
@@ -29,6 +25,9 @@
   </Position>
   <Selectable>
     <Overlay>
+      <Shape>
+        <Circle radius="2.0"/>
+      </Shape>
       <Texture>
         <MainTexture>128x128/star.png</MainTexture>
         <MainTextureMask>128x128/star_mask.png</MainTextureMask>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 2176559d69..d28bc4aee1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -56,10 +56,6 @@
       <metal>0</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Health>
     <Max>80</Max>
   </Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
index 8e210cc723..fb5353692e 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
   <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
+    <Square width="5.0" depth="10.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Essedon</SpecificName>
     <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
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 0c018ab325..086bd0d576 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
@@ -4,17 +4,24 @@
     units/heroes/brit_hero_boudicca
   </Auras>
   <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>5.0</Height>
+    <Square width="5.0" depth="10.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Phenotype>female</Phenotype>
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
-    <Phenotype>female</Phenotype>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/britons/hero_chariot_javelinist_boudicca_m.xml</Actor>
   </VisualActor>
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 bc750f80c2..3868d2ab40 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
@@ -6,6 +6,9 @@
       <metal op="add">25</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Height>7.5</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
@@ -25,6 +28,9 @@
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>8.5</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>units/kushites/camelry_javelinist_b_m.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml b/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
index bb92440a15..a15a50e672 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
@@ -3,13 +3,25 @@
   <Auras datatype="tokens">
     units/heroes/kush_hero_amanirenas
   </Auras>
+  <Footprint replace="">
+    <Square width="6.0" depth="14.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
+    <Phenotype>female</Phenotype>
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
-    <Phenotype>female</Phenotype>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/kush_hero_amanirenas.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/kushites/hero_chariot_archer_amanirenas_m.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
index e92e7e6c29..7a025e886c 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
-    <Square width="5.5" depth="10.0"/>
-    <Height>5.0</Height>
+    <Square width="8.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>War Chariot</GenericName>
     <SpecificName>Rath</SpecificName>
     <SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
index b272359080..503ee4b505 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -23,8 +23,8 @@
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Circle radius="3.5"/>
-    <Height>8.0</Height>
+    <Square width="4.5" depth="9.0"/>
+    <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max op="mul">2</Max>
@@ -47,14 +47,6 @@
     <Entity>units/maur_elephant_archer_a</Entity>
   </Promotion>
   <ResourceGatherer disable=""/>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>256x256/ellipse.png</MainTexture>
-        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
@@ -64,6 +56,9 @@
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>10.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
index aaeb422435..44eed28a3c 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
@@ -4,18 +4,24 @@
     units/heroes/maur_hero_ashoka
   </Auras>
   <Footprint replace="">
-    <Square width="6.0" depth="12.0"/>
-    <Height>5.0</Height>
+    <Square width="8.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <Classes datatype="tokens">Ashoka</Classes>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Ashoka the Great</GenericName>
     <SpecificName>Aśoka Devānāmpriya</SpecificName>
+    <Classes datatype="tokens">Ashoka</Classes>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_hero_ashoka.png</Icon>
-    <Tooltip>Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/mauryas/hero_chariot_archer_ashoka_m.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
index 440567117d..01aba050bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
@@ -14,9 +14,9 @@
       <food>150</food>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="4.0"/>
-    <Height>6.0</Height>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>300</Max>
@@ -47,8 +47,8 @@
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>256x256/ellipse.png</MainTexture>
-        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
@@ -62,6 +62,9 @@
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
index 3570da87d8..209c4c32fe 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
-    <Square width="8" depth="16"/>
-    <Height>6</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Raθa Bābiruviya</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_chariot_archer.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
index f8ff361593..bf435db40f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
@@ -4,17 +4,24 @@
     units/heroes/pers_hero_darius
   </Auras>
   <Footprint replace="">
-    <Square width="6.0" depth="12.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Darius I the Great</GenericName>
     <SpecificName>Dārayavahuš</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_hero_darius.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/persians/hero_chariot_archer_darius_m.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
index ac6b2ef1e1..849b3bd7c3 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
@@ -4,17 +4,24 @@
     units/heroes/pers_hero_xerxes
   </Auras>
   <Footprint replace="">
-    <Square width="6.0" depth="12.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_hero_xerxes.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/persians/hero_chariot_archer_xerxes_m.xml</Actor>
   </VisualActor>
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 d14624159d..f5646132d9 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
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
+  <Footprint>
+    <Height>7.5</Height>
+  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Camel</VisibleClasses>
@@ -19,6 +22,9 @@
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>8.5</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>units/ptolemies/camelry_archer_b_m.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
index 4fcc8ae917..280b1f19b1 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
-    <Square width="7.5" depth="15.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Scythed Chariot</GenericName>
     <SpecificName>Drepanèphoros</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/sele_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>