diff --git a/binaries/data/mods/official/entities/structures/hele_ho_b1.xml b/binaries/data/mods/official/entities/structures/hele_ho_b1.xml
index 7a0825e597..849ba376a4 100755
--- a/binaries/data/mods/official/entities/structures/hele_ho_b1.xml
+++ b/binaries/data/mods/official/entities/structures/hele_ho_b1.xml
@@ -3,14 +3,14 @@
 <Entity Tag="hele_ho_b1" Parent="ho">
 	<Traits>
 		<Id
-			generic="House"
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
 			specific="Metathron"
-			icon="structure_heleho"
-			class2="Structure"
-			class3="Economic"
 			history="Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia."
 		/>
 	</Traits>
 	<Actor>Hellenes House 1</Actor>
-	<Footprint Width="12.0" Height="12.0"/>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml
index 93f7fd776d..c019f92d95 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Civilian Centre"
 
+			icon_cell="48"
+
 			rollover="The heart of the player's empire. Trains economic units, and can only be built on settlements."
 			
 			type.structure.group.housing="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_hc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_hc.xml
index 007b067a9a..7a4bed3b58 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_hc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_hc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Temple"
 
+			icon_cell="59"
+
 			rollover="The Temple trains physicians, researches medical technologies, and provides healing to nearby allied organic units."
 			
 			type.structure.phase.tp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_ho.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_ho.xml
index b4454b9d57..7abe2b4159 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_ho.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_ho.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="House"
 
+			icon_cell="49"
+
 			rollover="A civic building that increases the player's population."
 			
 			type.structure.group.housing="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_tf.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_tf.xml
index 7b5f5cc690..3293a7de5f 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_tf.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_tf.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Outpost"
 
+			icon_cell="54"
+
 			rollover="Outposts can be built anywhere on a player's land, and garrisoned to provide reconnaissance and defense against attackers."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wc.xml
index dc068224f0..284fb40121 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Wall"
 
+			icon_cell="55"
+
 			rollover="Build walls to protect a town, close off choke points, and defend resource sites."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wg.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wg.xml
index 8c50233539..20eab30d69 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wg.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wg.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Gate"
 
+			icon_cell="57"
+
 			rollover="Gates allow allied units access through a wall, but are also its most vulnerable point."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wt.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wt.xml
index ce1709ffb0..afca81fa52 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wt.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_wt.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Tower"
 
+			icon_cell="56"
+
 			rollover="Towers can be garrisoned to defend a city wall against attackers."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_economic_fc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_economic_fc.xml
index 0d195b5db0..34d22ffd78 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_economic_fc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_economic_fc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Farmstead"
 
+			icon_cell="50"
+
 			rollover="The Farmstead is the centre for food gathering operations. Fields and Corrals must be built at lots adjacent to it."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_economic_rc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_economic_rc.xml
index b1ec0efcdc..f88064ab84 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_economic_rc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_economic_rc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Mill"
 
+			icon_cell="53"
+
 			rollover="A Mill must be constructed near a source of Wood, Stone or Ore in order to collect them. It also provides technologies that improve gathering of these resources."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_economic_tc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_economic_tc.xml
index a985cbfff5..14c1b0d47e 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_economic_tc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_economic_tc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Market"
 
+			icon_cell="61"
+
 			rollover="The Market creates trade units and allows resources to be bartered. Traders travel between Markets, generating resources on a successful round-trip."
 			
 			type.structure.phase.tp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_military_ff.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_military_ff.xml
index fec048eb71..4a3a1acd8f 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_military_ff.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_military_ff.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Fortress"
 
+			icon_cell="62"
+
 			rollover="The Fortress represents the pinnacle of a civilisation's military prowess. Heroes, powerful advanced units, and unique technologies are available from this structure."
 			
 			type.structure.phase.cp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_military_mc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_military_mc.xml
index a8129235ec..c84a413d91 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_military_mc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_military_mc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Barracks"
 
+			icon_cell="60"
+
 			rollover="The Barracks trains military units. Technologies may also be researched to improve their equipment."
 			
 			type.structure.phase.tp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_military_pc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_military_pc.xml
index 113c217cc4..03a7e4c4ff 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_military_pc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_military_pc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Dock"
 
+			icon_cell="58"
+
 			rollover="Naval vessels are manufactured at this building. A Dock must be built on the shoreline of a body of water."
 			
 			type.structure.phase.tp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_special_sb.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_special_sb.xml
index b9652c8bc0..8332f1c43a 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_norm_special_sb.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_norm_special_sb.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Special Building"
 
+			icon_cell="63"
+
 			rollover="This is a special building unique to a particular civilisation."
 			
 			type.structure.phase.cp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fc.xml b/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fc.xml
index 4a1457f2d9..1ba69afa22 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fc.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fc.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Corral"
 
+			icon_cell="52"
+
 			rollover="Herd domestic animals into a Corral, and they will provide Food for your civilisation."
 			
 			type.structure.phase.vp="true"
diff --git a/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fv.xml b/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fv.xml
index 4cca9a0d57..b66955c869 100755
--- a/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fv.xml
+++ b/binaries/data/mods/official/entities/structures/template_structure_resource_economic_fv.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Field"
 
+			icon_cell="51"
+
 			rollover="Assign an economic unit to a Field to harvest grain and generate Food."
 			
 			type.structure.phase.vp="true"