Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_war_elephant.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_mace.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_vercingetorix.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cataphract.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_viridomarus.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_cavalry_mace.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_infantry_pikeman.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_brennus.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_brit.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_brit.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_cavalry_gaul.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_champion_infantry_gaul.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_caratacos.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_boudicca.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_sacred_band_cavalry.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_cunobelin
   </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
-    <Icon>units/celt_hero_cynvelin.png</Icon>
+    <Icon>units/brit_hero_cunobelin.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/cunobelin_horse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml	(revision 20677)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>North African War Elephant</GenericName>
     <SpecificName>Pil Malḥamit</SpecificName>
-    <Icon>units/cart_champion_cavalry.png</Icon>
+    <Icon>units/cart_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml	(revision 20677)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Heavy Swordsman</GenericName>
     <SpecificName>Solduros</SpecificName>
     <SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_gaul.png</Icon>
+    <Icon>units/gaul_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_vercingetorix
   </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Vercingetorix</SpecificName>
-    <Icon>units/celt_hero_vercingetorix.png</Icon>
+    <Icon>units/gaul_hero_vercingetorix.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/vercingetorix_horse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hetaîros</SpecificName>
-    <Icon>units/hele_champion_cavalry_mace.png</Icon>
+    <Icon>units/mace_champion_cavalry.png</Icon>
     <SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/champion_cavalry.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml	(revision 20677)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Footprint replace="">
     <Square width="5.5" depth="10.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Babiruviya Ratha</SpecificName>
-    <Icon>units/pers_cavalry_archer.png</Icon>
+    <Icon>units/pers_chariot_archer.png</Icon>
     <Tooltip>Causes trample damage to enemy units.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_archer_a</Entity>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>5.0</MaxDistance>
     <Capacities>
       <food>50</food>
     </Capacities>
   </ResourceGatherer>
   <VisualActor>
     <Actor>units/persians/cavalry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <GenericName>Seleucid Cataphract</GenericName>
     <SpecificName>Seleukidón Kataphraktos</SpecificName>
-    <Icon>units/sele_champion_cataphract.png</Icon>
+    <Icon>units/sele_champion_cavalry.png</Icon>
     <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/champion_cataphract.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml	(revision 20677)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Macedonian Shield Bearer</GenericName>
     <SpecificName>Hypaspistḗs</SpecificName>
-    <Icon>units/macedonian_hypaspist.png</Icon>
+    <Icon>units/mace_hypaspist.png</Icon>
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
   </Identity>
   <Promotion>
     <Entity>units/mace_champion_infantry_e</Entity>
     <RequiredXp>2000</RequiredXp>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/champion_infantry_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml	(revision 20677)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Hinduya Pila</SpecificName>
-    <Icon>units/pers_war_elephant.png</Icon>
+    <Icon>units/pers_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/war_elephant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_pikeman">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <GenericName>Silver Shield Pikeman</GenericName>
     <SpecificName>Phalangitès Argyraspis</SpecificName>
-    <Icon>units/sele_champion_infantry_pikeman.png</Icon>
+    <Icon>units/sele_champion_pikeman.png</Icon>
     <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/champion_infantry_pikeman.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png	(revision 20677)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml	(revision 20677)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
   <Footprint replace="">
     <Square width="10.0" depth="10.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Carbanto</SpecificName>
-    <SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_brit.png</Icon>
+    <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
+    <Icon>units/brit_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_4.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml	(revision 20677)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>brit</Civ>
     <GenericName>Brythonic Longswordsman</GenericName>
     <SpecificName>Delamokludda</SpecificName>
     <SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_brit.png</Icon>
+    <Icon>units/brit_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_3.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(revision 20677)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_javelinist">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Boudicca (Chariot)</GenericName>
     <SpecificName>Boadicea</SpecificName>
     <Gender>female</Gender>
-    <Icon>units/celt_hero_boudicca.png</Icon>
+    <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml	(revision 20677)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
   <Identity>
     <Civ>brit</Civ>
     <GenericName>Boudicca (Sword)</GenericName>
     <SpecificName>Boadicea</SpecificName>
     <Gender>female</Gender>
-    <Icon>units/celt_hero_boudicca.png</Icon>
+    <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/boudicca.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_caratacos
   </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Caratacos</SpecificName>
-    <Icon>units/celt_hero_caratacos.png</Icon>
+    <Icon>units/brit_hero_caratacos.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/caradoc.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml	(revision 20677)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Sacred Band Cavalry</GenericName>
     <SpecificName>Sacred Band of Astarte</SpecificName>
-    <Icon>units/cart_sacred_band_cavalry.png</Icon>
+    <Icon>units/cart_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_3.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml	(revision 20677)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Gallic Noble Cavalry</GenericName>
     <SpecificName>Gallic Brihent</SpecificName>
     <SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_gaul.png</Icon>
+    <Icon>units/gaul_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/champion_unit_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_brennus
   </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brennus</SpecificName>
-    <Icon>units/celt_hero_brennus.png</Icon>
+    <Icon>units/gaul_hero_brennus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/brennus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml	(revision 20677)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_viridomarus
   </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Britomartus</SpecificName>
-    <Icon>units/celt_hero_viridomarus.png</Icon>
+    <Icon>units/gaul_hero_viridomarus.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/viridomarus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml	(revision 20677)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_champion_infantry_a">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">1</Pierce>
   </Armour>
   <Health>
     <Max op="mul">1.1</Max>
   </Health>
   <Identity>
     <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
-    <Icon>units/macedonian_argyraspidai.png</Icon>
+    <Icon>units/mace_argyraspidai.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
     <Actor>units/macedonians/champion_infantry_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml	(revision 20676)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml	(revision 20677)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Identity>
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Camel</VisibleClasses>
-    <SelectionGroupName>units/ptol_cavalry_archer_b</SelectionGroupName>
+    <SelectionGroupName>units/ptol_camel_archer</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
-    <Icon>units/ptol_cavalry_archer.png</Icon>
+    <Icon>units/ptol_camel_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_cavalry_archer_a</Entity>
   </Promotion>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel.xml</select>
       <order_walk>actor/fauna/movement/camel.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>units/ptolemies/cavalry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>