diff --git a/bobmining/graphics/entity/water-miner/water-miner-base-shadow.png b/bobmining/graphics/entity/water-miner/water-miner-base-shadow.png
new file mode 100644
index 000000000..c91175499
Binary files /dev/null and b/bobmining/graphics/entity/water-miner/water-miner-base-shadow.png differ
diff --git a/bobmining/graphics/entity/water-miner/water-miner-base.png b/bobmining/graphics/entity/water-miner/water-miner-base.png
index fdcb11e61..62d6d9401 100644
Binary files a/bobmining/graphics/entity/water-miner/water-miner-base.png and b/bobmining/graphics/entity/water-miner/water-miner-base.png differ
diff --git a/bobmining/graphics/entity/water-miner/water-miner-horsehead-shadow.png b/bobmining/graphics/entity/water-miner/water-miner-horsehead-shadow.png
new file mode 100644
index 000000000..9069392b6
Binary files /dev/null and b/bobmining/graphics/entity/water-miner/water-miner-horsehead-shadow.png differ
diff --git a/bobmining/graphics/entity/water-miner/water-miner-horsehead.png b/bobmining/graphics/entity/water-miner/water-miner-horsehead.png
new file mode 100644
index 000000000..029a6f22a
Binary files /dev/null and b/bobmining/graphics/entity/water-miner/water-miner-horsehead.png differ
diff --git a/bobmining/prototypes/water-miner.lua b/bobmining/prototypes/water-miner.lua
index b0ef572f9..9e5534a60 100644
--- a/bobmining/prototypes/water-miner.lua
+++ b/bobmining/prototypes/water-miner.lua
@@ -148,6 +148,60 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
     },
   })
 
+  local water_miner_graphics_set = {
+    animation = {
+      north = {
+        layers = {
+          {
+            priority = "high",
+            filename = "__bobmining__/graphics/entity/water-miner/water-miner-horsehead.png",
+            animation_speed = 0.5,
+            scale = 0.5,
+            line_length = 8,
+            width = 206,
+            height = 202,
+            frame_count = 40,
+            shift = util.by_pixel(-4, -24)
+          },
+          {
+            priority = "high",
+            filename = "__bobmining__/graphics/entity/water-miner/water-miner-horsehead-shadow.png",
+            animation_speed = 0.5,
+            draw_as_shadow = true,
+            line_length = 8,
+            width = 309,
+            height = 82,
+            frame_count = 40,
+            scale = 0.5,
+            shift = util.by_pixel(17.75, 14.5)
+          }
+        },
+      },
+    },
+  }
+
+  local water_miner_base_picture = {
+    sheets =
+    {
+      {
+        filename = "__bobmining__/graphics/entity/water-miner/water-miner-base.png",
+        priority = "extra-high",
+        width = 261,
+        height = 273,
+        shift = util.by_pixel(-2.25, -4.75),
+        scale = 0.5
+      },
+      {
+        filename = "__bobmining__/graphics/entity/water-miner/water-miner-base-shadow.png",
+        width = 220,
+        height = 220,
+        scale = 0.5,
+        draw_as_shadow = true,
+        shift = util.by_pixel(6, 0.5)
+      }
+    }
+  }
+
   data:extend({
     {
       type = "mining-drill",
@@ -197,22 +251,8 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
         height = 12,
       },
       monitor_visualization_tint = { r = 78, g = 173, b = 255 },
-      base_picture = data.raw["mining-drill"].pumpjack.base_picture,
-      graphics_set = {
-        animation = {
-          north = {
-            priority = "extra-high",
-            width = 116,
-            height = 110,
-            line_length = 10,
-            shift = { 0.125, -0.71875 },
-            filename = "__bobmining__/graphics/entity/water-miner/water-miner-animation.png",
-            tint = { r = 0.2, g = 0.8, b = 1 },
-            frame_count = 40,
-            animation_speed = 0.5,
-          },
-        },
-      },
+      base_picture = water_miner_base_picture,
+      graphics_set = water_miner_graphics_set,
       working_sound = {
         sound = { filename = "__base__/sound/pumpjack.ogg" },
       },
@@ -270,22 +310,8 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
         height = 12,
       },
       monitor_visualization_tint = { r = 78, g = 173, b = 255 },
-      base_picture = data.raw["mining-drill"].pumpjack.base_picture,
-      graphics_set = {
-        animation = {
-          north = {
-            priority = "extra-high",
-            width = 116,
-            height = 110,
-            line_length = 10,
-            shift = { 0.125, -0.71875 },
-            filename = "__bobmining__/graphics/entity/water-miner/water-miner-animation.png",
-            tint = { r = 0.2, g = 0.8, b = 1 },
-            frame_count = 40,
-            animation_speed = 0.5,
-          },
-        },
-      },
+      base_picture = water_miner_base_picture,
+      graphics_set = water_miner_graphics_set,
       working_sound = {
         sound = { filename = "__base__/sound/pumpjack.ogg" },
       },
@@ -341,23 +367,9 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
         width = 12,
         height = 12,
       },
-      base_picture = data.raw["mining-drill"].pumpjack.base_picture,
+      base_picture = water_miner_base_picture,
       monitor_visualization_tint = { r = 78, g = 173, b = 255 },
-      graphics_set = {
-        animation = {
-          north = {
-            priority = "extra-high",
-            width = 116,
-            height = 110,
-            line_length = 10,
-            shift = { 0.125, -0.71875 },
-            filename = "__bobmining__/graphics/entity/water-miner/water-miner-animation.png",
-            tint = { r = 0.2, g = 0.8, b = 1 },
-            frame_count = 40,
-            animation_speed = 0.5,
-          },
-        },
-      },
+      graphics_set = water_miner_graphics_set,
       working_sound = {
         sound = { filename = "__base__/sound/pumpjack.ogg" },
       },
@@ -395,7 +407,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
           },
         },
       },
-      energy_usage = "180W",
+      energy_usage = "180kW",
       mining_speed = 5,
       resource_searching_radius = 0.49,
       vector_to_place_result = { 0, 0 },
@@ -414,22 +426,8 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
         height = 12,
       },
       monitor_visualization_tint = { r = 78, g = 173, b = 255 },
-      base_picture = data.raw["mining-drill"].pumpjack.base_picture,
-      graphics_set = {
-        animation = {
-          north = {
-            priority = "extra-high",
-            width = 116,
-            height = 110,
-            line_length = 10,
-            shift = { 0.125, -0.71875 },
-            filename = "__bobmining__/graphics/entity/water-miner/water-miner-animation.png",
-            tint = { r = 0.2, g = 0.8, b = 1 },
-            frame_count = 40,
-            animation_speed = 0.5,
-          },
-        },
-      },
+      base_picture = water_miner_base_picture,
+      graphics_set = water_miner_graphics_set,
       working_sound = {
         sound = { filename = "__base__/sound/pumpjack.ogg" },
       },