diff --git a/images/units/drakes/shockbringer/shockbringer-melee-1.png b/images/units/drakes/shockbringer/shockbringer-melee-1.png
index 193947e6f..94f95dcb7 100644
Binary files a/images/units/drakes/shockbringer/shockbringer-melee-1.png and b/images/units/drakes/shockbringer/shockbringer-melee-1.png differ
diff --git a/images/units/drakes/shockbringer/shockbringer-melee-2.png b/images/units/drakes/shockbringer/shockbringer-melee-2.png
index c7a32fdc2..fbad92316 100644
Binary files a/images/units/drakes/shockbringer/shockbringer-melee-2.png and b/images/units/drakes/shockbringer/shockbringer-melee-2.png differ
diff --git a/images/units/drakes/shockbringer/shockbringer-melee-3.png b/images/units/drakes/shockbringer/shockbringer-melee-3.png
index bd1d55750..c838f5294 100644
Binary files a/images/units/drakes/shockbringer/shockbringer-melee-3.png and b/images/units/drakes/shockbringer/shockbringer-melee-3.png differ
diff --git a/images/units/drakes/shockbringer/shockbringer-melee-4.png b/images/units/drakes/shockbringer/shockbringer-melee-4.png
index bb10cefc3..a008e2d99 100644
Binary files a/images/units/drakes/shockbringer/shockbringer-melee-4.png and b/images/units/drakes/shockbringer/shockbringer-melee-4.png differ
diff --git a/images/units/drakes/shockbringer/shockbringer-melee-5.png b/images/units/drakes/shockbringer/shockbringer-melee-5.png
index 915a0f474..e2c184a70 100644
Binary files a/images/units/drakes/shockbringer/shockbringer-melee-5.png and b/images/units/drakes/shockbringer/shockbringer-melee-5.png differ
diff --git a/images/units/drakes/shockbringer/shockbringer-melee-6.png b/images/units/drakes/shockbringer/shockbringer-melee-6.png
index 89770c96e..59bf34ca4 100644
Binary files a/images/units/drakes/shockbringer/shockbringer-melee-6.png and b/images/units/drakes/shockbringer/shockbringer-melee-6.png differ
diff --git a/units/drakes/Shockbringer.cfg b/units/drakes/Shockbringer.cfg
index 62c3582b4..4aa007f86 100644
--- a/units/drakes/Shockbringer.cfg
+++ b/units/drakes/Shockbringer.cfg
@@ -122,16 +122,29 @@
         damage=6
         number=4
     [/attack]
+
     [attack_anim]
         [filter_attack]
             name=hammer
         [/filter_attack]
+        offset=0.0~0.1,0.1~0.0
+        [if]
+            terrain_type=W*,S*
+            submerge=0.4
+        [/if]
         start_time=-300
         [frame]
-            image="units/drakes/shockbringer/shockbringer-melee-[1~6].png:[100,50*3,100*2]"
+            image="units/drakes/shockbringer/shockbringer.png:50"
+        [/frame]
+        [frame]
+            image="units/drakes/shockbringer/shockbringer-melee-[1~6].png:100"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -50}
+        [frame]
+            image="units/drakes/shockbringer/shockbringer.png:100"
         [/frame]
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
+
     [attack_anim]
         [filter_attack]
             name=fire breath