diff --git a/binaries/data/mods/public/art/textures/skins/gaia/pine.dds b/binaries/data/mods/public/art/textures/skins/gaia/pine.dds
index dd039613db..cd36447f82 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/pine.dds
+++ b/binaries/data/mods/public/art/textures/skins/gaia/pine.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec745a4ee386c10ec4bd153bf572cc0d09b36454aa0468061a657819cea90871
+oid sha256:69ae1e0b08af67f0b13c67f94aa4d01b9b3c59e7004dd1ff9664af712b0010ea
 size 349680
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/pine_a.dds b/binaries/data/mods/public/art/textures/skins/gaia/pine_a.dds
index e36e2f1b97..4033baf43d 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/pine_a.dds
+++ b/binaries/data/mods/public/art/textures/skins/gaia/pine_a.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de2f34941fa2085caf9c80218fcca9b0212309aa38a9a7e6d512bc034dd0d8da
-size 262272
+oid sha256:c94140a9045a34a9fba878667bee183b3a183db6b3c7244ab0ac2bca145c868a
+size 349680
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_rock.dds b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_rock.dds
index ecbf32df7b..77a5b5302f 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_rock.dds
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_rock.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5cf857858e3fa5677f9b528d07e299d865fe75b1b6084e4310cd1728c87cb03
-size 65664
+oid sha256:e873d4adfcdbfb5c4b3067252c8b690bc5ee6fef0ca50c03036691239f5fe8f9
+size 87536
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_special.dds b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_special.dds
index ecbf32df7b..95c1d424ab 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_special.dds
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_special.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5cf857858e3fa5677f9b528d07e299d865fe75b1b6084e4310cd1728c87cb03
-size 65664
+oid sha256:596b9396d8ab9986d221a596eabb3def1ecb58e3d251e37ad6abb6f4c7972973
+size 87536
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_tree.dds b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_tree.dds
index ecbf32df7b..55c74fe531 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_tree.dds
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_tree.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5cf857858e3fa5677f9b528d07e299d865fe75b1b6084e4310cd1728c87cb03
-size 65664
+oid sha256:3289f8791ab75c7d918d37a3a2ab8bdf4573cecd4505b811fc0b02bafc653fd3
+size 87536
diff --git a/binaries/data/mods/public/entities/gaia/flora_bush_berry.xml b/binaries/data/mods/public/entities/gaia/flora_bush_berry.xml
index a49f935ab6..d8f804eb97 100644
--- a/binaries/data/mods/public/entities/gaia/flora_bush_berry.xml
+++ b/binaries/data/mods/public/entities/gaia/flora_bush_berry.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_gaia_flora_bush_berry"
->
-
+<Entity Parent="template_gaia_flora_bush_berry">
+	<Traits>
+		<Id>
+			<Icon_Cell>6</Icon_Cell>
+		</Id>
+	</Traits>
  	<Actor>props/flora/foliagebush.xml</Actor>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/gaia/flora_tree_carob.xml b/binaries/data/mods/public/entities/gaia/flora_tree_carob.xml
index 90cc6e0744..43acec8a33 100644
--- a/binaries/data/mods/public/entities/gaia/flora_tree_carob.xml
+++ b/binaries/data/mods/public/entities/gaia/flora_tree_carob.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_gaia_flora_tree"
->
+<Entity Parent="template_gaia_flora_tree">
 	<Traits>
-	
 		<Id>
 			<Internal_Only />
-
+			<Icon_Cell>3</Icon_Cell>
 			<Specific>Carob Tree</Specific>
- 
-			<Classes>Carob</Classes>
-
-			<History>The carob is a leafed evergreen.</History>
-
+			<Classes>Tree, Carob</Classes>
+			<History>The carob is a leafed evergreen common in the Aegean Sea region.</History>
 		</Id>
-
 	</Traits>
- 
- 	<Actor>flora/trees/carob.xml</Actor>
- 
+	<Actor>flora/trees/carob.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/gaia/flora_tree_date_palm.xml b/binaries/data/mods/public/entities/gaia/flora_tree_date_palm.xml
index 0e4edba23c..9aa869319f 100644
--- a/binaries/data/mods/public/entities/gaia/flora_tree_date_palm.xml
+++ b/binaries/data/mods/public/entities/gaia/flora_tree_date_palm.xml
@@ -5,17 +5,11 @@
 	
 		<Id>
 			<Internal_Only />
-
+			<Icon_Cell>1</Icon_Cell>			
 			<Specific>Date Palm</Specific>
- 
 			<Classes>Palm Tree</Classes>
-
 			<History>The Date Palm is found all over the Southern and Eastern Mediterranean. Their fruit, the date, is an important food crop in ancient and modern times.</History>
-
 		</Id>
-
 	</Traits>
- 
  	<Actor>flora/trees/palm_date.xml</Actor>
- 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/gaia/flora_tree_medit_fan_palm.xml b/binaries/data/mods/public/entities/gaia/flora_tree_medit_fan_palm.xml
index 8c928affc5..20fdc94bfe 100644
--- a/binaries/data/mods/public/entities/gaia/flora_tree_medit_fan_palm.xml
+++ b/binaries/data/mods/public/entities/gaia/flora_tree_medit_fan_palm.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_gaia_flora_tree"
->
+<Entity Parent="template_gaia_flora_tree">
 	<Traits>
-	
 		<Id>
 			<Internal_Only />
-
+			<Icon_Cell>4</Icon_Cell>
 			<Specific>Mediterranean Fan Palm</Specific>
- 
-			<Classes>Palm Tree</Classes>
-
+ 			<Classes>Palm Tree</Classes>
 			<History>The Mediterranean Fan Palm is common throughout low-lying areas around the Mediterranean Sea.</History>
-
 		</Id>
-
 	</Traits>
- 
  	<Actor>flora/trees/palm_medit_fan_palm.xml</Actor>
- 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/gaia/flora_tree_poplar_lombardy.xml b/binaries/data/mods/public/entities/gaia/flora_tree_poplar_lombardy.xml
index dcd723505c..355e04b30a 100644
--- a/binaries/data/mods/public/entities/gaia/flora_tree_poplar_lombardy.xml
+++ b/binaries/data/mods/public/entities/gaia/flora_tree_poplar_lombardy.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_gaia_flora_tree"
->
+<Entity Parent="template_gaia_flora_tree">
 	<Traits>
-	
 		<Id>
 			<Internal_Only />
-
+			<Icon_Cell>5</Icon_Cell>
 			<Specific>Lombardy Poplar Tree</Specific>
- 
 			<Classes>Poplar</Classes>
-
 			<History>The lombardy poplar is an leafed deciduous.</History>
-
 		</Id>
-
 	</Traits>
-	
  	<Actor>flora/trees/lumbardypoplar.xml</Actor>
- 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/gaia/flora_tree_senegal_date_palm.xml b/binaries/data/mods/public/entities/gaia/flora_tree_senegal_date_palm.xml
index 7be617cdb4..fafabe932e 100644
--- a/binaries/data/mods/public/entities/gaia/flora_tree_senegal_date_palm.xml
+++ b/binaries/data/mods/public/entities/gaia/flora_tree_senegal_date_palm.xml
@@ -5,17 +5,11 @@
 	
 		<Id>
 			<Internal_Only />
-
+			<Icon_Cell>2</Icon_Cell>			
 			<Specific>Senegal Date Palm</Specific>
- 
 			<Classes>Palm Tree</Classes>
-
 			<History>The Senegal Date Palm is an evergreen palm tree generally found on the continent of Africa. Their fruit, the date, is an important food crop in ancient and modern times.</History>
-
 		</Id>
-
 	</Traits>
- 
  	<Actor>flora/trees/palm_senegal_date.xml</Actor>
- 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/gaia/geology_stone_desert_small.xml b/binaries/data/mods/public/entities/gaia/geology_stone_desert_small.xml
index b355760977..f69e6a765c 100644
--- a/binaries/data/mods/public/entities/gaia/geology_stone_desert_small.xml
+++ b/binaries/data/mods/public/entities/gaia/geology_stone_desert_small.xml
@@ -2,6 +2,9 @@
 
 <Entity Parent="template_gaia_geo_rock">
 	<Traits>
+		<Id>
+			<Icon_Cell>1</Icon_Cell>
+		</Id>
  		<Anchor>
  			<Type>Ground</Type>
 		<!-- If negative or > 90.0, entity will always conform to terrain (assuming traits.pitch allows it) -->
diff --git a/binaries/data/mods/public/entities/template_gaia_geo_mineral.xml b/binaries/data/mods/public/entities/template_gaia_geo_mineral.xml
index c0dbbec005..7ce962ae5b 100644
--- a/binaries/data/mods/public/entities/template_gaia_geo_mineral.xml
+++ b/binaries/data/mods/public/entities/template_gaia_geo_mineral.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_gaia_geo"
->
+<Entity Parent="template_gaia_geo">
 	<Traits>
 	
 		<Id>
@@ -13,7 +11,7 @@
  			<Icon>PortraitSheetRock</Icon>			
 			<Icon_Cell>1</Icon_Cell>			
 
-			<Classes>Mineral</Classes>
+			<Classes>Mineral, Metal</Classes>
 
 			<Rollover>A mineral deposit, providing access to rare forms of precious metal.</Rollover>
 
diff --git a/binaries/data/mods/public/entities/template_structure_gaia_settlement.xml b/binaries/data/mods/public/entities/template_structure_gaia_settlement.xml
index 606a0b5818..443d5c3f35 100644
--- a/binaries/data/mods/public/entities/template_structure_gaia_settlement.xml
+++ b/binaries/data/mods/public/entities/template_structure_gaia_settlement.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_entity_full"
->
+<Entity Parent="template_entity_full">
 	<Traits>
 	
 		<Id>
@@ -18,7 +16,7 @@
 
 			<Classes>Building, Gaia, Special, Settlement</Classes>
 
- 			<Rollover>Build a Civil Centre at this location to expand your territory.</Rollover>
+ 			<Rollover>Build a Civic Centre at this location to expand your territory.</Rollover>
 
 		</Id>
 		
diff --git a/binaries/data/mods/public/entities/template_structure_military_fortress.xml b/binaries/data/mods/public/entities/template_structure_military_fortress.xml
index 0bc92bf51c..0614d4d054 100644
--- a/binaries/data/mods/public/entities/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/entities/template_structure_military_fortress.xml
@@ -17,6 +17,8 @@
 		
 		</Id>
 
+		<IsTerritoryCentre>true</IsTerritoryCentre>
+
 		<Creation>
 			<Foundation>foundation_6x6</Foundation>
 			<Time>84</Time>