diff --git a/angelspetrochem/prototypes/buildings/pipes-overlay.lua b/angelspetrochem/prototypes/buildings/pipes-overlay.lua
index cca7eb6b3..15a7e792c 100644
--- a/angelspetrochem/prototypes/buildings/pipes-overlay.lua
+++ b/angelspetrochem/prototypes/buildings/pipes-overlay.lua
@@ -175,3 +175,166 @@ local function polypictures3()
     },
   }
 end
+function angelsmods.petrochem.separatorpipepictures1()
+  return {
+    north = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/pipe-north2.png",
+      priority = "extra-high",
+      width = 96,
+      height = 96,
+      scale = 0.5,
+      shift = util.by_pixel(4, 36),
+    },
+    east = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    south = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    west = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+  }
+end
+function angelsmods.petrochem.separatorpipepictures2()
+  return {
+    north = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/pipe-north1.png",
+      priority = "extra-high",
+      width = 96,
+      height = 96,
+      scale = 0.5,
+      shift = util.by_pixel(3, 36),
+    },
+    east = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    south = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    west = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+  }
+end
+function angelsmods.petrochem.separatorpipepictures2mirror()
+  return {
+    north = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    east = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    south = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    west = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+  }
+end
+function angelsmods.petrochem.steamcrackerpipepictures1()
+  return {
+    north = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/pipe-north1.png",
+      priority = "extra-high",
+      width = 64,
+      height = 64,
+      scale = 0.5,
+      shift = {0, 1},
+    },
+    east = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    south = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    west = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+  }
+end
+function angelsmods.petrochem.steamcrackerpipepictures1mirror()
+  return {
+    north = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    east = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    south = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+    west = {
+      filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png",
+      priority = "extra-high",
+      width = 1,
+      height = 1,
+      shift = { 0, 0 },
+    },
+  }
+end
\ No newline at end of file
diff --git a/angelspetrochem/prototypes/buildings/separator.lua b/angelspetrochem/prototypes/buildings/separator.lua
index 1cb213c80..29026f3ae 100644
--- a/angelspetrochem/prototypes/buildings/separator.lua
+++ b/angelspetrochem/prototypes/buildings/separator.lua
@@ -83,14 +83,16 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -99,7 +101,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -108,7 +111,7 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -195,14 +198,16 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -211,7 +216,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -220,7 +226,7 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -306,14 +312,16 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -322,7 +330,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -331,7 +340,7 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -416,14 +425,16 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -432,7 +443,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(),
+        pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -441,7 +453,7 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
diff --git a/angelspetrochem/prototypes/buildings/steam-cracker.lua b/angelspetrochem/prototypes/buildings/steam-cracker.lua
index f1067f341..7b65c3e1c 100644
--- a/angelspetrochem/prototypes/buildings/steam-cracker.lua
+++ b/angelspetrochem/prototypes/buildings/steam-cracker.lua
@@ -116,20 +116,27 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
@@ -139,7 +146,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -242,20 +250,27 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
@@ -265,7 +280,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -368,20 +384,27 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
@@ -391,7 +414,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
@@ -493,20 +517,27 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         --pipe_picture = floatationpipepictures(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
@@ -516,7 +547,8 @@ data:extend({
       },
       {
         production_type = "output",
-        --pipe_picture = floatationpipepictures(),
+        mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(),
+        pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(),
         pipe_covers = pipecoverspictures(),
         volume = 100,
         pipe_connections = {
diff --git a/angelspetrochemgraphics/graphics/entity/separator/blank.png b/angelspetrochemgraphics/graphics/entity/separator/blank.png
new file mode 100644
index 000000000..b881dc908
Binary files /dev/null and b/angelspetrochemgraphics/graphics/entity/separator/blank.png differ
diff --git a/angelspetrochemgraphics/graphics/entity/separator/pipe-north1.png b/angelspetrochemgraphics/graphics/entity/separator/pipe-north1.png
new file mode 100644
index 000000000..3fcea109f
Binary files /dev/null and b/angelspetrochemgraphics/graphics/entity/separator/pipe-north1.png differ
diff --git a/angelspetrochemgraphics/graphics/entity/separator/pipe-north2.png b/angelspetrochemgraphics/graphics/entity/separator/pipe-north2.png
new file mode 100644
index 000000000..8515f10bd
Binary files /dev/null and b/angelspetrochemgraphics/graphics/entity/separator/pipe-north2.png differ
diff --git a/angelspetrochemgraphics/graphics/entity/steam-cracker/blank.png b/angelspetrochemgraphics/graphics/entity/steam-cracker/blank.png
new file mode 100644
index 000000000..b881dc908
Binary files /dev/null and b/angelspetrochemgraphics/graphics/entity/steam-cracker/blank.png differ
diff --git a/angelspetrochemgraphics/graphics/entity/steam-cracker/pipe-north1.png b/angelspetrochemgraphics/graphics/entity/steam-cracker/pipe-north1.png
new file mode 100644
index 000000000..a618c3495
Binary files /dev/null and b/angelspetrochemgraphics/graphics/entity/steam-cracker/pipe-north1.png differ
diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua
index 67729e691..d24acf32b 100644
--- a/angelsrefining/prototypes/buildings/filtration-unit.lua
+++ b/angelsrefining/prototypes/buildings/filtration-unit.lua
@@ -71,22 +71,29 @@ data:extend({
     fluid_boxes = {
       {
         production_type = "input",
+        mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = { 
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
+        mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
+        mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         volume = 100,
         pipe_connections = {
           { flow_direction = "output", position = { 1, -2 }, direction = defines.direction.north },
@@ -94,8 +101,9 @@ data:extend({
       },
       {
         production_type = "output",
+        mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         volume = 100,
         pipe_connections = {
           { flow_direction = "output", position = { -1, -2 }, direction = defines.direction.north },
@@ -169,21 +177,25 @@ data:extend({
       {
         production_type = "input",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         volume = 100,
         pipe_connections = {
           { flow_direction = "output", position = { 1, -2 }, direction = defines.direction.north },
@@ -192,7 +204,7 @@ data:extend({
       {
         production_type = "output",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         volume = 100,
         pipe_connections = {
           { flow_direction = "output", position = { -1, -2 }, direction = defines.direction.north },
@@ -265,21 +277,25 @@ data:extend({
       {
         production_type = "input",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "input",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         volume = 1000,
-        pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } },
+        pipe_connections = {
+          { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south }
+        },
       },
       {
         production_type = "output",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures2(),
         volume = 100,
         pipe_connections = {
           { flow_direction = "output", position = { 1, -2 }, direction = defines.direction.north },
@@ -288,7 +304,7 @@ data:extend({
       {
         production_type = "output",
         pipe_covers = pipecoverspictures(),
-        pipe_picture = angelsmods.refining.filtrationpipepictures(),
+        pipe_picture = angelsmods.refining.filtrationpipepictures1(),
         volume = 100,
         pipe_connections = {
           { flow_direction = "output", position = { -1, -2 }, direction = defines.direction.north },
diff --git a/angelsrefining/prototypes/buildings/hydro-plant.lua b/angelsrefining/prototypes/buildings/hydro-plant.lua
index 0253a30ee..cc863c375 100644
--- a/angelsrefining/prototypes/buildings/hydro-plant.lua
+++ b/angelsrefining/prototypes/buildings/hydro-plant.lua
@@ -22,7 +22,7 @@ local function hydropipepictures()
       shift = { 0.06, -0.6 },
     },
     west = {
-      filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-east1.png",
+      filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-west1.png",
       priority = "extra-high",
       width = 48,
       height = 48,
@@ -55,7 +55,7 @@ local function hydropipepictures2()
       shift = { 0.06, -0.6 },
     },
     west = {
-      filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-east2.png",
+      filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-west2.png",
       priority = "extra-high",
       width = 48,
       height = 48,
@@ -352,6 +352,241 @@ data:extend({
         },
       },
     },
+    graphics_set_flipped = {
+      animation = {
+        layers = {
+          {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-base.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            shift = util.by_pixel(0, 0),
+            scale = 0.5,
+          },
+        },
+      },
+      working_visualisations = {
+        {
+          always_draw = true,
+          north_position = util.by_pixel(-52.5, -43),
+          east_position = util.by_pixel(-52.5, -43),
+          south_position = util.by_pixel(-52.5, -43),
+          west_position = util.by_pixel(-52.5, -43),
+          animation = {
+            layers = {
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, -47.75),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 0.125),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 48),
+                scale = 0.5,
+              },
+            },
+          },
+        },
+        {
+          always_draw = true,
+          north_position = util.by_pixel(14.5, -21.5),
+          east_position = util.by_pixel(14.5, -21.5),
+          south_position = util.by_pixel(14.5, -21.5),
+          west_position = util.by_pixel(14.5, -21.5),
+          animation = {
+            layers = {
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, -47.75),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 0.125),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 48),
+                scale = 0.5,
+              },
+            },
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            shift = util.by_pixel(20, 10.5),
+            x = 0,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          east_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            x = 538,
+            y = 0,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+          south_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            x = 1076,
+            y = 0,
+            height = 454,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+          west_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            x = 1614,
+            y = 0,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 0,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          east_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            frame_count = 1,
+            width = 459,
+            height = 491,
+            x = 459,
+            y = 0,
+            scale = 0.5,
+          },
+          south_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 918,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          west_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 1377,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+            priority = "high",
+            width = 128,
+            height = 128,
+            repeat_count = 36,
+            scale = 0.5,
+            shift = { 2, -3 },
+          },
+          south_animation = {
+            layers = {
+              {
+                draw_as_shadow = true,
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+                priority = "high",
+                width = 128,
+                height = 128,
+                repeat_count = 36,
+                scale = 0.5,
+                shift = { 2, -3 },
+              },
+              {
+                draw_as_shadow = true,
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+                priority = "high",
+                width = 128,
+                height = 128,
+                repeat_count = 36,
+                scale = 0.5,
+                shift = { -2, -3 },
+              },
+            },
+          },
+        },
+      },
+    },
     impact_category = "metal",
     working_sound = {
       sound = { filename = "__angelsrefininggraphics__/sound/ore-leaching-plant.ogg", volume = 0.65 },
@@ -428,10 +663,245 @@ data:extend({
       usage_priority = "secondary-input",
       emissions_per_minute = { pollution = 2.4 },
     },
-    energy_usage = "200kW",
-    circuit_connector = circuit_connector_definitions["angels-hydro-plant"],
-    circuit_wire_max_distance = default_circuit_wire_max_distance,
-    graphics_set = {
+    energy_usage = "200kW",
+    circuit_connector = circuit_connector_definitions["angels-hydro-plant"],
+    circuit_wire_max_distance = default_circuit_wire_max_distance,
+    graphics_set = {
+      animation = {
+        layers = {
+          {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-base.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            shift = util.by_pixel(0, 0),
+            scale = 0.5,
+          },
+        },
+      },
+      working_visualisations = {
+        {
+          always_draw = true,
+          north_position = util.by_pixel(-52.5, -43),
+          east_position = util.by_pixel(-52.5, -43),
+          south_position = util.by_pixel(-52.5, -43),
+          west_position = util.by_pixel(-52.5, -43),
+          animation = {
+            layers = {
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, -47.75),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 0.125),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 48),
+                scale = 0.5,
+              },
+            },
+          },
+        },
+        {
+          always_draw = true,
+          north_position = util.by_pixel(14.5, -21.5),
+          east_position = util.by_pixel(14.5, -21.5),
+          south_position = util.by_pixel(14.5, -21.5),
+          west_position = util.by_pixel(14.5, -21.5),
+          animation = {
+            layers = {
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, -47.75),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 0.125),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 48),
+                scale = 0.5,
+              },
+            },
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            shift = util.by_pixel(20, 10.5),
+            x = 0,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          east_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            x = 538,
+            y = 0,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+          south_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            priority = "extra-high",
+            width = 538,
+            x = 1076,
+            y = 0,
+            height = 454,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+          west_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            x = 1614,
+            y = 0,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 0,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          east_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            priority = "extra-high",
+            frame_count = 1,
+            width = 459,
+            height = 491,
+            x = 459,
+            y = 0,
+            scale = 0.5,
+          },
+          south_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 918,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          west_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 1377,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+            priority = "high",
+            width = 128,
+            height = 128,
+            repeat_count = 36,
+            scale = 0.5,
+            shift = { -2, -3 },
+          },
+          south_animation = {
+            layers = {
+              {
+                draw_as_shadow = true,
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+                priority = "high",
+                width = 128,
+                height = 128,
+                repeat_count = 36,
+                scale = 0.5,
+                shift = { -2, -3 },
+              },
+              {
+                draw_as_shadow = true,
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+                priority = "high",
+                width = 128,
+                height = 128,
+                repeat_count = 36,
+                scale = 0.5,
+                shift = { 2, -3 },
+              },
+            },
+          },
+        },
+      },
+    },
+    graphics_set_flipped = {
       animation = {
         layers = {
           {
@@ -537,7 +1007,7 @@ data:extend({
           always_draw = true,
           north_animation = {
             draw_as_shadow = true,
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
             priority = "extra-high",
             width = 538,
             height = 454,
@@ -549,7 +1019,7 @@ data:extend({
           },
           east_animation = {
             draw_as_shadow = true,
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
             priority = "extra-high",
             width = 538,
             height = 454,
@@ -561,7 +1031,7 @@ data:extend({
           },
           south_animation = {
             draw_as_shadow = true,
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
             priority = "extra-high",
             width = 538,
             x = 1076,
@@ -573,7 +1043,7 @@ data:extend({
           },
           west_animation = {
             draw_as_shadow = true,
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
             priority = "extra-high",
             width = 538,
             height = 454,
@@ -587,7 +1057,7 @@ data:extend({
         {
           always_draw = true,
           north_animation = {
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
             priority = "extra-high",
             width = 459,
             height = 491,
@@ -597,7 +1067,7 @@ data:extend({
             scale = 0.5,
           },
           east_animation = {
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
             priority = "extra-high",
             frame_count = 1,
             width = 459,
@@ -607,7 +1077,7 @@ data:extend({
             scale = 0.5,
           },
           south_animation = {
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
             priority = "extra-high",
             width = 459,
             height = 491,
@@ -617,7 +1087,7 @@ data:extend({
             scale = 0.5,
           },
           west_animation = {
-            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png",
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
             priority = "extra-high",
             width = 459,
             height = 491,
@@ -637,7 +1107,7 @@ data:extend({
             height = 128,
             repeat_count = 36,
             scale = 0.5,
-            shift = { -2, -3 },
+            shift = { 2, -3 },
           },
           south_animation = {
             layers = {
@@ -649,7 +1119,7 @@ data:extend({
                 height = 128,
                 repeat_count = 36,
                 scale = 0.5,
-                shift = { -2, -3 },
+                shift = { 2, -3 },
               },
               {
                 draw_as_shadow = true,
@@ -659,7 +1129,7 @@ data:extend({
                 height = 128,
                 repeat_count = 36,
                 scale = 0.5,
-                shift = { 2, -3 },
+                shift = { -2, -3 },
               },
             },
           },
@@ -979,6 +1449,241 @@ data:extend({
         },
       },
     },
+    graphics_set_flipped = {
+      animation = {
+        layers = {
+          {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-base.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            shift = util.by_pixel(0, 0),
+            scale = 0.5,
+          },
+        },
+      },
+      working_visualisations = {
+        {
+          always_draw = true,
+          north_position = util.by_pixel(-52.5, -43),
+          east_position = util.by_pixel(-52.5, -43),
+          south_position = util.by_pixel(-52.5, -43),
+          west_position = util.by_pixel(-52.5, -43),
+          animation = {
+            layers = {
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, -47.75),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 0.125),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png",
+                priority = "extra-high",
+                width = 107,
+                height = 77,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 48),
+                scale = 0.5,
+              },
+            },
+          },
+        },
+        {
+          always_draw = true,
+          north_position = util.by_pixel(14.5, -21.5),
+          east_position = util.by_pixel(14.5, -21.5),
+          south_position = util.by_pixel(14.5, -21.5),
+          west_position = util.by_pixel(14.5, -21.5),
+          animation = {
+            layers = {
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, -47.75),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 0.125),
+                scale = 0.5,
+              },
+              {
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png",
+                priority = "extra-high",
+                width = 40,
+                height = 36,
+                frame_count = 24,
+                line_length = 6,
+                animation_speed = 0.5,
+                shift = util.by_pixel(0, 48),
+                scale = 0.5,
+              },
+            },
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            shift = util.by_pixel(20, 10.5),
+            x = 0,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          east_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            x = 538,
+            y = 0,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+          south_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            x = 1076,
+            y = 0,
+            height = 454,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+          west_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png",
+            priority = "extra-high",
+            width = 538,
+            height = 454,
+            x = 1614,
+            y = 0,
+            frame_count = 1,
+            shift = util.by_pixel(20, 10.5),
+            scale = 0.5,
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 0,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          east_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            frame_count = 1,
+            width = 459,
+            height = 491,
+            x = 459,
+            y = 0,
+            scale = 0.5,
+          },
+          south_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 918,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+          west_animation = {
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png",
+            priority = "extra-high",
+            width = 459,
+            height = 491,
+            x = 1377,
+            y = 0,
+            frame_count = 1,
+            scale = 0.5,
+          },
+        },
+        {
+          always_draw = true,
+          north_animation = {
+            draw_as_shadow = true,
+            filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+            priority = "high",
+            width = 128,
+            height = 128,
+            repeat_count = 36,
+            scale = 0.5,
+            shift = { 2, -3 },
+          },
+          south_animation = {
+            layers = {
+              {
+                draw_as_shadow = true,
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+                priority = "high",
+                width = 128,
+                height = 128,
+                repeat_count = 36,
+                scale = 0.5,
+                shift = { 2, -3 },
+              },
+              {
+                draw_as_shadow = true,
+                filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png",
+                priority = "high",
+                width = 128,
+                height = 128,
+                repeat_count = 36,
+                scale = 0.5,
+                shift = { -2, -3 },
+              },
+            },
+          },
+        },
+      },
+    },
     impact_category = "metal",
     working_sound = {
       sound = { filename = "__angelsrefininggraphics__/sound/ore-leaching-plant.ogg", volume = 0.65 },
diff --git a/angelsrefining/prototypes/buildings/pipes-overlay.lua b/angelsrefining/prototypes/buildings/pipes-overlay.lua
index 63e753e82..675960b3e 100644
--- a/angelsrefining/prototypes/buildings/pipes-overlay.lua
+++ b/angelsrefining/prototypes/buildings/pipes-overlay.lua
@@ -65,13 +65,14 @@ function angelsmods.refining.leachingpipepictures()
   }
 end
 
-function angelsmods.refining.filtrationpipepictures()
+function angelsmods.refining.filtrationpipepictures1()
   return {
     north = {
-      filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north.png",
+      filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north1.png",
       priority = "extra-high",
-      width = 34,
-      height = 37,
+      width = 68,
+      height = 74,
+      scale = 0.5,
       shift = { 0, 1 },
     },
     east = {
@@ -97,3 +98,37 @@ function angelsmods.refining.filtrationpipepictures()
     },
   }
 end
+
+function angelsmods.refining.filtrationpipepictures2()
+  return {
+    north = {
+      filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north2.png",
+      priority = "extra-high",
+      width = 128,
+      height = 128,
+      scale = 0.5,
+      shift = { 0, 1.5 },
+    },
+    east = {
+      filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-east.png",
+      priority = "extra-high",
+      width = 34,
+      height = 47,
+      shift = { -0.7, -0.1 },
+    },
+    south = {
+      filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-south.png",
+      priority = "extra-high",
+      width = 34,
+      height = 39,
+      shift = { 0, -0.75 },
+    },
+    west = {
+      filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-west.png",
+      priority = "extra-high",
+      width = 34,
+      height = 47,
+      shift = { 0.7, -0.1 },
+    },
+  }
+end
diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north.png b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north.png
deleted file mode 100644
index 8cae63490..000000000
Binary files a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north.png and /dev/null differ
diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north1.png b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north1.png
new file mode 100644
index 000000000..d198f9f02
Binary files /dev/null and b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north1.png differ
diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north2.png b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north2.png
new file mode 100644
index 000000000..f39de0564
Binary files /dev/null and b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north2.png differ
diff --git a/angelsrefininggraphics/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png b/angelsrefininggraphics/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png
new file mode 100644
index 000000000..07766a86c
Binary files /dev/null and b/angelsrefininggraphics/graphics/entity/hydro-plant/hydro-plant-pipe-connections-flipped.png differ
diff --git a/angelsrefininggraphics/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png b/angelsrefininggraphics/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png
new file mode 100644
index 000000000..1bc9c32c2
Binary files /dev/null and b/angelsrefininggraphics/graphics/entity/hydro-plant/hydro-plant-shadow-flipped.png differ
diff --git a/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east1.png b/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west1.png
similarity index 100%
rename from angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east1.png
rename to angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west1.png
diff --git a/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east2.png b/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west2.png
similarity index 100%
rename from angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east2.png
rename to angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west2.png