Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -31,6 +31,7 @@
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
+    <Icon>technologies/laurel_wreath.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
@@ -8,7 +8,7 @@
     <Civ>athen</Civ>
     <Lang>greek</Lang>
     <GenericName>Themistocles</GenericName>
-    <SpecificName>Themistoklês</SpecificName>
+    <SpecificName>Themistoklēs</SpecificName>
     <Icon>units/athen_hero_themistocles.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
@@ -3,9 +3,9 @@
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
-    <GenericName>Iphicrates</GenericName>
-    <SpecificName>Iphikratēs</SpecificName>
-    <Icon>units/athen_hero_iphicrates.png</Icon>
+    <GenericName>Xenophon</GenericName>
+    <SpecificName>Xenophōn</SpecificName>
+    <Icon>units/hele_hero_xenophon.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_javelinist_xenophon.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
-    <Icon>units/celt_hero_cunobelin.png</Icon>
+    <Icon>units/brit_hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/hero_infantry_swordsman_cunobelin.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
@@ -6,8 +6,8 @@
   </Auras>
   <Identity>
     <Civ>cart</Civ>
-    <SpecificName>Ḥimelqart Baraq</SpecificName>
     <GenericName>Hamilcar Barca</GenericName>
+    <SpecificName>Ḥimelqart Baraq</SpecificName>
     <Icon>units/cart_hero_hamilcar.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil_infantry.xml
@@ -6,7 +6,6 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Indibil</SpecificName>
-    <Icon>units/iber_hero_indibil.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_infantry_spearman_indibil.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
@@ -17,10 +17,10 @@
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
-    <GenericName>Alexander The Great</GenericName>
-    <SpecificName>Mégās Aléxandros</SpecificName>
+    <GenericName>Alexander III the Great</GenericName>
+    <SpecificName>Alexandros ho Megas</SpecificName>
     <Tooltip>"Herocide" Bonus: +20% attack bonus vs. enemy Heroes.</Tooltip>
-    <Icon>units/hele_hero_alexander.png</Icon>
+    <Icon>units/mace_hero_alexander.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_cavalry_swordsman_alexander_m.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
@@ -6,8 +6,8 @@
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
-    <GenericName>Crateros</GenericName>
-    <SpecificName>Kraterós</SpecificName>
+    <GenericName>Craterus</GenericName>
+    <SpecificName>Krateros</SpecificName>
     <Icon>units/mace_hero_craterus.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
@@ -6,9 +6,9 @@
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
-    <GenericName>Demetrius The Besieger</GenericName>
-    <SpecificName>Dēmḗtrios Poliorkḗtēs</SpecificName>
-    <Icon>units/hele_hero_demetrius.png</Icon>
+    <GenericName>Demetrius I the Besieger</GenericName>
+    <SpecificName>Dēmētrios Poliorkētēs</SpecificName>
+    <Icon>units/mace_hero_demetrius.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_infantry_swordsman_demetrius.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
@@ -7,7 +7,7 @@
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Philip II of Macedon</GenericName>
-    <SpecificName>Phílippos B' ho Makedṓn</SpecificName>
+    <SpecificName>Philippos B' ho Makedōn</SpecificName>
     <Icon>units/mace_hero_philip.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
@@ -7,8 +7,7 @@
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Philip II of Macedon</GenericName>
-    <SpecificName>Phílippos B' ho Makedṓn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
+    <SpecificName>Philippos B' ho Makedōn</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/hero_infantry_pikeman_philip.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
@@ -6,8 +6,8 @@
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
-    <GenericName>Pyrrhus of Epirus</GenericName>
-    <SpecificName>Pyrrhos ton Epeiros</SpecificName>
+    <GenericName>Pyrrhus I of Epirus</GenericName>
+    <SpecificName>Pyrrhos ho Epeiros</SpecificName>
     <Icon>units/mace_hero_pyrrhus.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
@@ -9,7 +9,7 @@
     <Civ>ptol</Civ>
     <Phenotype>female</Phenotype>
     <GenericName>Cleopatra VII</GenericName>
-    <SpecificName>Kleopatra H' Philopator</SpecificName>
+    <SpecificName>Kleopatra H' Philopatōr</SpecificName>
     <Icon>units/ptol_hero_cleopatra.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
@@ -6,9 +6,8 @@
   </Auras>
   <Identity>
     <Civ>ptol</Civ>
-    <GenericName>Ptolemy I "Savior"</GenericName>
-    <SpecificName>Ptolemaios A' Soter</SpecificName>
-    <Icon>units/hele_hero_alexander.png</Icon>
+    <GenericName>Ptolemy I</GenericName>
+    <SpecificName>Ptolemaios A' Sōter</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/hero_elephantry_ptolemy_I_m.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
@@ -6,9 +6,8 @@
   <Identity>
     <Civ>ptol</Civ>
     <Classes datatype="tokens">PtolemyIV</Classes>
-    <GenericName>Ptolemy IV "Father Loving"</GenericName>
-    <SpecificName>Ptolemaios D' Philopator</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
+    <GenericName>Ptolemy IV</GenericName>
+    <SpecificName>Ptolemaios D' Philopatōr</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
@@ -6,8 +6,8 @@
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
-    <GenericName>Antiochus III "The Great"</GenericName>
-    <SpecificName>Antiokhos G' Mégās</SpecificName>
+    <GenericName>Antiochus III the Great</GenericName>
+    <SpecificName>Antiokhos G' Megas</SpecificName>
     <Icon>units/sele_hero_antiochus_the_great.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
@@ -6,8 +6,8 @@
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
-    <GenericName>Antiochus IV "The Righteous"</GenericName>
-    <SpecificName>Antiokhos D' Epiphanes</SpecificName>
+    <GenericName>Antiochus IV</GenericName>
+    <SpecificName>Antiokhos D' Epiphanēs</SpecificName>
     <Icon>units/sele_hero_antiochus_the_righteous.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
@@ -6,8 +6,8 @@
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
-    <GenericName>Seleucus I "The Victor"</GenericName>
-    <SpecificName>Seleukos A' Nikator</SpecificName>
+    <GenericName>Seleucus I</GenericName>
+    <SpecificName>Seleukos A' Nikatōr</SpecificName>
     <Icon>units/sele_hero_seleucus.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
@@ -7,7 +7,7 @@
     <Civ>spart</Civ>
     <Lang>greek</Lang>
     <GenericName>Leonidas I</GenericName>
-    <SpecificName>Leōnídēs</SpecificName>
+    <SpecificName>Leōnidēs</SpecificName>
     <Icon>units/spart_hero_leonidas.png</Icon>
   </Identity>
   <VisualActor>