diff --git a/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml b/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml
index aa67fae564..d85b4f22f3 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml
@@ -13,5 +13,9 @@
     <variant name="waypoint_hellenes">
       <texture>props/banner_greek.png</texture>
     </variant>
+    <variant name="waypoint_celts">
+      <texture>props/banner_celt.png</texture>
+    </variant>
   </group>
+  <material>basic_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/dock_props.xml b/binaries/data/mods/public/art/actors/props/structures/celts/dock_props.xml
new file mode 100644
index 0000000000..48ca287db5
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/dock_props.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/celt_dock_props_1.dae</mesh>
+      <texture>props/celt_prop_1.png</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/dock_shields.xml b/binaries/data/mods/public/art/actors/props/structures/celts/dock_shields.xml
new file mode 100644
index 0000000000..26dc384f8d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/dock_shields.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/celt_dock_shields.dae</mesh>
+      <texture>props/celt_props_new.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/dock_new.xml b/binaries/data/mods/public/art/actors/structures/celts/dock_new.xml
new file mode 100644
index 0000000000..de8e2cd944
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/celts/dock_new.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/celt_dock.dae</mesh>
+      <props>
+        <prop actor="props/structures/celts/dock_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/dock_props.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/celt_struct_1.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/props/celt_dock_props_1.dae b/binaries/data/mods/public/art/meshes/props/celt_dock_props_1.dae
new file mode 100644
index 0000000000..0a2ad58fd0
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/celt_dock_props_1.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c52e7117e46a6adebb2f30b72fb025afa1e325ab5ff1d0e7a38527e978bef64
+size 14210
diff --git a/binaries/data/mods/public/art/meshes/props/celt_dock_shields.dae b/binaries/data/mods/public/art/meshes/props/celt_dock_shields.dae
new file mode 100644
index 0000000000..9f5eecd2a4
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/celt_dock_shields.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d11ab3c43c3fc560e60806dfd15788ace83641334bae9ee4e6dda986b87a82e
+size 11088
diff --git a/binaries/data/mods/public/art/meshes/props/celt_market_props_new.dae b/binaries/data/mods/public/art/meshes/props/celt_market_props_new.dae
index 311fb6c268..acc5c2a2d9 100644
--- a/binaries/data/mods/public/art/meshes/props/celt_market_props_new.dae
+++ b/binaries/data/mods/public/art/meshes/props/celt_market_props_new.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a1d00f934b2e796d5cf68cc320077a1f418efec89c5729661f8b28876f02baf
-size 48543
+oid sha256:14119959888c795885e43a7028fbd490403c3b1e43cb093bb5a21da512347858
+size 51979
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_dock.dae b/binaries/data/mods/public/art/meshes/structural/celt_dock.dae
new file mode 100644
index 0000000000..03b6fd06e7
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/celt_dock.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de2b03faeaccfdb62b5ac6d86cf400014d8b2456124609d2c101242be2004794
+size 298896
diff --git a/binaries/data/mods/public/art/textures/skins/props/banner_celt.png b/binaries/data/mods/public/art/textures/skins/props/banner_celt.png
new file mode 100644
index 0000000000..83bbb9d129
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/banner_celt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:324c4c523f5b3a32213b7f2acb8f50c65237efcf6f403afa24dcaafa91f9615b
+size 39419
diff --git a/binaries/data/mods/public/maps/scenarios/Arcadia III.xml b/binaries/data/mods/public/maps/scenarios/Arcadia III.xml
index 9229a62354..c6b39365c2 100644
--- a/binaries/data/mods/public/maps/scenarios/Arcadia III.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Arcadia III.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03b39c8ad1200f74bb6966feb2b3ee963b3915201528f3e7fdb582ef0412d60d
-size 62764
+oid sha256:f4c4455969ab6137e39859ae37ef6869d95ed204771bc41a7873bfe51900f17f
+size 84418
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_dock.xml b/binaries/data/mods/public/simulation/templates/structures/celt_dock.xml
index bdf63725cd..0312c97c42 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_dock.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_dock.xml
@@ -9,8 +9,15 @@
     <PopulationBonus>2</PopulationBonus>
   </Cost>
   <VisualActor>
-    <Actor>structures/celts/dock.xml</Actor>
+    <Actor>structures/celts/dock_new.xml</Actor>
   </VisualActor>
+  <Footprint>
+    <Square width="12.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="10.0" depth="22.0"/>
+  </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/celt_ship_merchant