diff --git a/binaries/data/mods/public/art/actors/fauna/whale_fin.xml b/binaries/data/mods/public/art/actors/fauna/whale_fin.xml
index 6a4d254402..e0488e11d8 100644
--- a/binaries/data/mods/public/art/actors/fauna/whale_fin.xml
+++ b/binaries/data/mods/public/art/actors/fauna/whale_fin.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <float/>
   <group>
     <variant frequency="100" name="Mesh">
       <animations>
-        <animation file="other/whale_fin_idle_a.dae" name="Idle" speed="30"/>
-        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="30"/>
-        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="25"/>
+        <animation file="other/whale_fin_idle_a.dae" name="Idle" speed="5"/>
+        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="6"/>
+        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="5"/>
+        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="5"/>
+        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="5"/>
+        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="7"/>
       </animations>
       <mesh>skeletal/whale_fin.dae</mesh>
     </variant>
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/animal_whale_fin.png b/binaries/data/mods/public/art/textures/skins/skeletal/animal_whale_fin.png
index ba4c7d04d0..3c449f1e8e 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/animal_whale_fin.png
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/animal_whale_fin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2118e7dc76953edc862e4d7d30f59aa922ed4b86e89f66bf41fa06b5fd35ce17
-size 1762676
+oid sha256:644e18a6bcc277286420f01e57c48e6e51c1302e9968ebc5d9da88083784dd9c
+size 524024
diff --git a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago II.xml b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago II.xml
index fd5e310b98..a4e18546e5 100644
--- a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago II.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago II.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8110f03222dc83d50c26c3cd7c597545fe0d362d33557a0b0724d8372fb572a0
-size 485792
+oid sha256:cdaca4de8dcbef04a915d4f664723c4c40f38c18fd924616d60c4b28fd5a3df7
+size 487434
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
new file mode 100644
index 0000000000..5d2583faf3
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_whale">
+  <Footprint>
+    <Circle radius="5.0"/>
+    <Height>2.5</Height>
+  </Footprint>
+  <Health>
+    <Max>300</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <GenericName>Whale</GenericName>
+    <SpecificName>Fin Whale</SpecificName>
+	<Tooltip>Kill, then collect food from this bountiful oceanic resource.</Tooltip>
+    <Icon>gaia/fauna_fish.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Unit radius="0.1"/>
+  </Obstruction>
+  <Position>
+	<Altitude>0.0</Altitude>
+	<Floating>true</Floating>
+  </Position>
+  <ResourceSupply>
+    <KillBeforeGather>true</KillBeforeGather>
+    <Amount>2000</Amount>
+    <Type>food.fish</Type>
+  </ResourceSupply>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+    <RoamDistance>30.0</RoamDistance>
+    <FleeDistance>60.0</FleeDistance>
+    <RoamTimeMin>10000</RoamTimeMin>
+    <RoamTimeMax>30000</RoamTimeMax>
+    <FeedTimeMin>1000</FeedTimeMin>
+    <FeedTimeMax>2000</FeedTimeMax>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>ship</PassabilityClass>
+    <WalkSpeed>6.0</WalkSpeed>
+    <Run>
+      <Speed>12.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>fauna/whale_fin.xml</Actor>
+  </VisualActor>
+</Entity>