diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index 9aa9a2b385..93fdf5f8da 100644
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@@ -1080,7 +1080,7 @@ g_SelectionPanels.Upgrade = {
 			if (data.item.cost)
 				tooltip += "\n" + getEntityCostTooltip(data.item);
 
-			tooltip += formatLimitString(limits.entLimit, limits.entCount, limits.entLimitChangers);
+			tooltip += "\n" + formatLimitString(limits.entLimit, limits.entCount, limits.entLimitChangers);
 			if (!technologyEnabled)
 				tooltip += "\n" + sprintf(translate("Requires %(technology)s"), {
 					"technology": getEntityNames(GetTechnologyData(data.item.requiredTechnology))
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
index 66cdc83aad..686f823418 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
@@ -12,8 +12,8 @@
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>200</BuildTime>
     <Resources>
-      <wood>0</wood>
-      <stone>300</stone>
+      <wood>50</wood>
+      <stone>250</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_wooden_tower.xml b/binaries/data/mods/public/simulation/templates/structures/iber_wooden_tower.xml
index be2295658e..0717673d7f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_wooden_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_wooden_tower.xml
@@ -3,6 +3,14 @@
   <Identity>
     <Civ>iber</Civ>
   </Identity>
+  <Upgrade>
+    <Tower>
+      <Cost>
+        <stone>250</stone>
+      </Cost>
+      <Time>120</Time>
+    </Tower>
+  </Upgrade>
   <VisualActor>
     <Actor>structures/iberians/wooden_tower.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml
index 4a2255cbb5..1ebf53492f 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml
@@ -14,13 +14,6 @@
       <MinRange>4.0</MinRange>
     </Ranged>
   </Attack>
-  <BuildRestrictions>
-    <Category>DefenseTower</Category>
-    <Distance>
-      <FromClass>DefenseTower</FromClass>
-      <MinDistance>40</MinDistance>
-    </Distance>
-  </BuildRestrictions>
   <Capturable>
     <CapturePoints>800</CapturePoints>
   </Capturable>
@@ -68,6 +61,18 @@
     <HeightOffset>18.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence disable=""/>
+  <Upgrade>
+    <Tower>
+      <Entity>structures/{civ}_defense_tower</Entity>
+      <Tooltip>Enforce with stone and upgrade to a defense tower.</Tooltip>
+      <RequiredTechnology>phase_town</RequiredTechnology>
+      <Cost>
+        <wood>50</wood>
+        <stone>100</stone>
+      </Cost>
+      <Time>100</Time>
+    </Tower>
+  </Upgrade>
   <VisualActor>
     <Actor>props/special/palisade_rocks_fort.xml</Actor>
   </VisualActor>