diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
index ee7ffb7881..ad48bf5df7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="20.0" depth="15.0"/>
-    <Height>8.0</Height>
+    <Square width="18.0" depth="13.0"/>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x2</SpawnEntityOnDeath>
@@ -12,7 +11,7 @@
     <SpecificName>Sitobólion</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="18.0" depth="16.0"/>
+    <Static width="16.0" depth="11.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/farmstead.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
index c40ccccdaf..6ae8d230fa 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
@@ -3,11 +3,21 @@
   <Cost>
     <PopulationBonus>2</PopulationBonus>
   </Cost>
+  <Footprint>
+    <Square width="12.0" depth="12.0"/>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+  </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Ffermdy</SpecificName>
   </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="10.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/britons/farmstead.xml</Actor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml
index 90943d5b4d..8f35127bca 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="18" depth="19"/>
-    <Height>6.0</Height>
+    <Square width="17.0" depth="19.0"/>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Aḥuzāh</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="16.0" depth="17"/>
+    <Static width="15.0" depth="17.0"/>
   </Obstruction>
   <VisualActor>
     <FoundationActor>structures/carthaginians/fndn_farmstead.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
index f0f2aab8d9..38c1c94bf7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
@@ -4,18 +4,16 @@
     <PopulationBonus>2</PopulationBonus>
   </Cost>
   <Footprint>
-    <Square width="20" depth="20"/>
-    <Height>8.0</Height>
+    <Square width="19.0" depth="18.0"/>
   </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Ffermdy</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="21" depth="20"/>
+    <Static width="17.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
     <Actor>structures/gauls/farmstead.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/iber_farmstead.xml
index c3b19760c2..bd8ae5773f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_farmstead.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
+  <Footprint>
+    <Square width="12.0" depth="13.0"/>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+  </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Baserri</SpecificName>
   </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="11.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/farmstead.xml</Actor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml
index 71af955721..fde4ea0be0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="20.0" depth="15.0"/>
-    <Height>8.0</Height>
+    <Square width="18.0" depth="13.0"/>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x2</SpawnEntityOnDeath>
@@ -12,7 +11,7 @@
     <SpecificName>Sitobólion</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="18.0" depth="16.0"/>
+    <Static width="16.0" depth="11.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/farmstead.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/maur_farmstead.xml
index e38606837a..7938239aa7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_farmstead.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
     <Square width="12.0" depth="16.0"/>
-    <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
@@ -12,7 +11,7 @@
     <SpecificName>Kantu</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="18.0" depth="18.0"/>
+    <Static width="10.0" depth="14.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/mauryans/farmstead.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/pers_farmstead.xml
index 7ac49604e0..be3afcb516 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_farmstead.xml
@@ -2,11 +2,7 @@
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
     <Square width="20.0" depth="20.0"/>
-    <Height>8.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Kaštašta</SpecificName>
@@ -16,6 +12,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/persians/farmstead.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml
index 8c5551a11d..cc77a88af5 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml
@@ -7,22 +7,19 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="20.0" depth="17.0"/>
-    <Height>8.0</Height>
+    <Square width="20.0" depth="18.0"/>
   </Footprint>
   <Health>
     <Max>400</Max>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>pr-n-t</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="18.0" depth="18.0"/>
+    <Static width="18.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/ptolemies/farmstead.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/rome_farmstead.xml
index 56bfd0b1d6..8ed76af73e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_farmstead.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="24.0" depth="20.0"/>
-    <Height>8.0</Height>
+    <Square width="22.0" depth="18.0"/>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Villa</SpecificName>
@@ -16,6 +12,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/romans/farmstead.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/sele_farmstead.xml
index 59c6c2ffa5..a95e63a032 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_farmstead.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="20.0" depth="15.0"/>
-    <Height>8.0</Height>
+    <Square width="20.0" depth="17.0"/>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x2</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Sītobólion</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="18.0" depth="16.0"/>
+    <Static width="18.0" depth="15.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/seleucids/farmstead.xml</Actor>
-    <FoundationActor>structures/fndn_4x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml
index 57c06fec98..7f4d9e842f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="20.0" depth="15.0"/>
-    <Height>8.0</Height>
+    <Square width="18.0" depth="13.0"/>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x2</SpawnEntityOnDeath>
@@ -12,7 +11,7 @@
     <SpecificName>Sitobólion</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="18.0" depth="16.0"/>
+    <Static width="16.0" depth="11.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/farmstead.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
index 6ee281e48e..b05a79c43f 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -13,12 +13,11 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="14.0" depth="14.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>900</Max>
-    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Farmstead</GenericName>
@@ -30,9 +29,6 @@
   <Loot>
     <food>100</food>
   </Loot>
-  <Obstruction>
-    <Static width="12.0" depth="12.0"/>
-  </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
@@ -63,6 +59,6 @@
     <Range>20</Range>
   </Vision>
   <VisualActor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>