diff --git a/data/core/images/portraits/Kitty/elvish-archer+female.png b/data/core/images/portraits/Kitty/elvish-archer+female.png
new file mode 100644
index 00000000000..fe4b4bfbf43
Binary files /dev/null and b/data/core/images/portraits/Kitty/elvish-archer+female.png differ
diff --git a/data/core/images/portraits/Kitty/elvish-archer.png b/data/core/images/portraits/Kitty/elvish-archer.png
new file mode 100644
index 00000000000..bd2bd393e03
Binary files /dev/null and b/data/core/images/portraits/Kitty/elvish-archer.png differ
diff --git a/data/core/images/portraits/Kitty/elvish-captain.png b/data/core/images/portraits/Kitty/elvish-captain.png
new file mode 100644
index 00000000000..81948ba5fc6
Binary files /dev/null and b/data/core/images/portraits/Kitty/elvish-captain.png differ
diff --git a/data/core/images/portraits/Kitty/elvish-fighter.png b/data/core/images/portraits/Kitty/elvish-fighter.png
new file mode 100644
index 00000000000..0fb59e82ad4
Binary files /dev/null and b/data/core/images/portraits/Kitty/elvish-fighter.png differ
diff --git a/data/core/units/elves/Archer.cfg b/data/core/units/elves/Archer.cfg
index f8d97b3aa9a..fca9084088b 100644
--- a/data/core/units/elves/Archer.cfg
+++ b/data/core/units/elves/Archer.cfg
@@ -6,6 +6,7 @@
     gender=male,female
     image="units/elves-wood/archer.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
+    profile="portraits/Kitty/elvish-archer.png"
     ellipse="misc/ellipse"
     hitpoints=29
     movement_type=woodland
@@ -167,6 +168,7 @@
         name= _ "female^Elvish Archer"
         gender=female
         image="units/elves-wood/archer+female.png"
+        profile="portraits/Kitty/elvish-archer+female.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
         #		[death]
         #			[frame]
diff --git a/data/core/units/elves/Avenger.cfg b/data/core/units/elves/Avenger.cfg
index f9c36d090a8..cc069659b95 100644
--- a/data/core/units/elves/Avenger.cfg
+++ b/data/core/units/elves/Avenger.cfg
@@ -6,6 +6,7 @@
     gender=male,female
     image="units/elves-wood/avenger.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
+    profile="portraits/Kitty/elvish-archer.png"
     hitpoints=55
     movement_type=woodland
     movement=6
@@ -176,6 +177,7 @@ This has, at times, been interpreted as a form of vengeance for their brethren l
         name= _ "female^Elvish Avenger"
         gender=female
         image="units/elves-wood/avenger+female.png"
+	profile="portraits/Kitty/elvish-archer+female.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
         {DEFENSE_ANIM_RANGE "units/elves-wood/avenger-sword-defend.png" "units/elves-wood/avenger+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
         {DEFENSE_ANIM_RANGE "units/elves-wood/avenger+female-bow-defend.png" "units/elves-wood/avenger+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
diff --git a/data/core/units/elves/Captain.cfg b/data/core/units/elves/Captain.cfg
index 5859df8b3ce..9bd72f30a92 100644
--- a/data/core/units/elves/Captain.cfg
+++ b/data/core/units/elves/Captain.cfg
@@ -4,6 +4,7 @@
     name= _ "Elvish Captain"
     race=elf
     image="units/elves-wood/captain.png"
+    profile="portraits/Kitty/elvish-captain.png"
     [leading_anim]
         [frame]
             begin=-150
diff --git a/data/core/units/elves/Champion.cfg b/data/core/units/elves/Champion.cfg
index 037ae879d85..0fcccbcc5f2 100644
--- a/data/core/units/elves/Champion.cfg
+++ b/data/core/units/elves/Champion.cfg
@@ -4,6 +4,7 @@
     name= _ "Elvish Champion"
     race=elf
     image="units/elves-wood/champion.png"
+    profile="portraits/Kitty/elvish-fighter.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=70
     movement_type=woodland
diff --git a/data/core/units/elves/Fighter.cfg b/data/core/units/elves/Fighter.cfg
index ca2a5ec0e3f..21e197ead1d 100644
--- a/data/core/units/elves/Fighter.cfg
+++ b/data/core/units/elves/Fighter.cfg
@@ -4,6 +4,7 @@
     name= _ "Elvish Fighter"
     race=elf
     image="units/elves-wood/fighter.png"
+    profile="portraits/Kitty/elvish-fighter.png"
     ellipse="misc/ellipse"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=33
diff --git a/data/core/units/elves/Hero.cfg b/data/core/units/elves/Hero.cfg
index 2a26858560d..e9df92cf590 100644
--- a/data/core/units/elves/Hero.cfg
+++ b/data/core/units/elves/Hero.cfg
@@ -4,6 +4,7 @@
     name= _ "Elvish Hero"
     race=elf
     image="units/elves-wood/hero.png"
+    profile="portraits/Kitty/elvish-fighter.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=51
     movement_type=woodland
diff --git a/data/core/units/elves/Marksman.cfg b/data/core/units/elves/Marksman.cfg
index f73e029c423..d055fc4b431 100644
--- a/data/core/units/elves/Marksman.cfg
+++ b/data/core/units/elves/Marksman.cfg
@@ -6,6 +6,7 @@
     gender=male,female
     image="units/elves-wood/marksman.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
+    profile="portraits/Kitty/elvish-archer.png"
     hitpoints=37
     movement_type=woodland
     movement=6
@@ -171,6 +172,7 @@ Realizing this prodigious skill does come with one cost, that being a lack of pr
         name= _ "female^Elvish Marksman"
         gender=female
         image="units/elves-wood/marksman+female.png"
+	profile="portraits/Kitty/elvish-archer+female.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
         {DEFENSE_ANIM_RANGE "units/elves-wood/marksman+female-sword-defend.png" "units/elves-wood/marksman+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
         {DEFENSE_ANIM_RANGE "units/elves-wood/marksman+female-bow-defend.png" "units/elves-wood/marksman+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
diff --git a/data/core/units/elves/Marshal.cfg b/data/core/units/elves/Marshal.cfg
index fb0cdebac2d..7ea377d2ac9 100644
--- a/data/core/units/elves/Marshal.cfg
+++ b/data/core/units/elves/Marshal.cfg
@@ -4,6 +4,7 @@
     name= _ "Elvish Marshal"
     race=elf
     image="units/elves-wood/marshal.png"
+    profile="portraits/Kitty/elvish-captain.png"
     [leading_anim]
         [frame]
             begin=-150
diff --git a/data/core/units/elves/Ranger.cfg b/data/core/units/elves/Ranger.cfg
index 22e0b71b903..483193f4958 100644
--- a/data/core/units/elves/Ranger.cfg
+++ b/data/core/units/elves/Ranger.cfg
@@ -5,6 +5,7 @@
     race=elf
     gender=male,female
     image="units/elves-wood/ranger.png"
+    profile="portraits/Kitty/elvish-archer.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=42
     movement_type=woodland
@@ -173,6 +174,7 @@
         name= _ "female^Elvish Ranger"
         gender=female
         image="units/elves-wood/ranger+female.png"
+	profile="portraits/Kitty/elvish-archer+female.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
         {DEFENSE_ANIM_RANGE "units/elves-wood/ranger-sword-defend.png" "units/elves-wood/ranger+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
         {DEFENSE_ANIM_RANGE "units/elves-wood/ranger+female-bow-defend.png" "units/elves-wood/ranger+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
diff --git a/data/core/units/elves/Sharpshooter.cfg b/data/core/units/elves/Sharpshooter.cfg
index a7236c8c1c3..480cc1a8390 100644
--- a/data/core/units/elves/Sharpshooter.cfg
+++ b/data/core/units/elves/Sharpshooter.cfg
@@ -5,6 +5,7 @@
     race=elf
     gender=male,female
     image="units/elves-wood/sharpshooter.png"
+    profile="portraits/Kitty/elvish-archer.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=47
     movement_type=woodland
@@ -153,6 +154,7 @@
         name= _ "female^Elvish Sharpshooter"
         gender=female
         image="units/elves-wood/sharpshooter+female.png"
+	profile="portraits/Kitty/elvish-archer+female.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
         {DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-sword-defend.png" "units/elves-wood/sharpshooter+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
         {DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-bow-defend.png" "units/elves-wood/sharpshooter+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}