diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index c686897a5d..af1f536dde 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -49,4 +49,9 @@
     <Radius>60</Radius>
     <Types>food wood stone metal</Types>
   </ResourceDropsite>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/{civ}_support_female_citizen
+    </Entities>
+  </TrainingQueue>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
index 2995b839a7..adf6c0066f 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_javelinist_b">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>7</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
index 798d18be11..51e2be5d61 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_javelinist_a">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>8</IconCell>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
index 6181add020..22a7c89892 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_spearman_b">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>16</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
index 53577d4e37..297c39aa40 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_spearman_a">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>17</IconCell>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
index 5a2deb3ae1..e07bfd0386 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_swordsman_b">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>19</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
index 3336a5de57..cb74ab1783 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_swordsman_a">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>20</IconCell>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
index 454835af06..dc91fa9974 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_javelinist_b">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>22</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
index 470a09c33c..bd674f15d3 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_javelinist_a">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>23</IconCell>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
index f6e138a1fb..b6e0d726ab 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_spearman_b">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>4</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
index cfbbc658aa..fe0893bb0d 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_spearman_a">
   <Identity>
-    <IconSheet>snPortraitSheetCelt</IconSheet>
 	<IconCell>5</IconCell>
   </Identity>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
index 0a516261e8..6579331b8f 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_b">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>19</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
index 75291cfb61..b5c8522dcf 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_a">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>20</IconCell>
   </Identity>
   <ResourceGatherer>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml
index 12d6f3fef6..efa4bbdff0 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_archer_b">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>10</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
index 19504f6031..e645afe54d 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_archer_a">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>11</IconCell>
   </Identity>
   <ResourceGatherer>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
index a5472d2453..d2f9c3569c 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_javelinist_b">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>7</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml
index 0cfa4f3e64..057133b1fa 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_javelinist_a">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>8</IconCell>
   </Identity>
   <ResourceGatherer>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
index a6bee7f53c..f77e756a05 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_b">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>4</IconCell>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
index 603972a91c..d43ee4d2ec 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_a">
   <Identity>
-    <IconSheet>snPortraitSheetHele</IconSheet>
 	<IconCell>5</IconCell>
   </Identity>
   <ResourceGatherer>