diff --git a/prototypes/electronic/el_caster.lua b/prototypes/electronic/el_caster.lua
index 59b4d7d..28d809c 100644
--- a/prototypes/electronic/el_caster.lua
+++ b/prototypes/electronic/el_caster.lua
@@ -114,46 +114,29 @@ data:extend({
       },
       --animation
       animation = {
-          north = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          east = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          south = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          west = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
+        filename = sprite('entity_base.png'),
+        size = {512,512},
+        scale = 0.54,
+        line_length = 1,
+        --lines_per_file = 2,
+        frame_count = 1,
+        --animation_speed = 0.2,
+        shift = {0,-0.3} 
+      },
+      working_visualisations = {
+        {
+          animation = 
+          {
+            filename = sprite('entity_overlay.png'),
+            size = {512,512},
+            scale = 0.54,
+            line_length = 3,
+            lines_per_file = 3,
+            frame_count = 9,
+            animation_speed = 0.2,
+            shift = {0,-0.3} 
+          }
+        }
       },
       working_sound =
       {
diff --git a/prototypes/electronic/el_purifier.lua b/prototypes/electronic/el_purifier.lua
index 44b18e2..c8b848c 100644
--- a/prototypes/electronic/el_purifier.lua
+++ b/prototypes/electronic/el_purifier.lua
@@ -114,42 +114,29 @@ data:extend({
       },
       --animation
       animation = {
-          north = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          east = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          south = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          west = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
+        filename = sprite('entity_base.png'),
+        size = {512,512},
+        scale = 0.54,
+        line_length = 1,
+        --lines_per_file = 2,
+        frame_count = 1,
+        --animation_speed = 0.2,
+        shift = {0,-0.3} 
+      },
+      working_visualisations = {
+        {
+          animation = 
+          {
+            filename = sprite('entity_overlay.png'),
+            size = {512,512},
+            scale = 0.54,
+            line_length = 3,
+            lines_per_file = 3,
+            frame_count = 9,
+            animation_speed = 0.2,
+            shift = {0,-0.3} 
+          }
+        }
       },
       working_sound =
       {
diff --git a/prototypes/fission/fi_compound_machine.lua b/prototypes/fission/fi_compound_machine.lua
index 622e5f9..b1ade83 100644
--- a/prototypes/fission/fi_compound_machine.lua
+++ b/prototypes/fission/fi_compound_machine.lua
@@ -113,43 +113,29 @@ data:extend({
       },
       --animation
       animation = {
-          north = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.5,
-              shift = {0,-0.3}
-          },
-          east = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              --lines_per_file = 3,
-              frame_count = 3,
-              animation_speed = 0.5,
-              shift = {0,-0.3}
-          },
-          south = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.5,
-              shift = {0,-0.3}
-          },
-          west = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              frame_count = 3,
-              animation_speed = 0.5,
-              shift = {0,-0.3}
-          },
+        filename = sprite('entity_base.png'),
+        size = {512,512},
+        scale = 0.54,
+        line_length = 1,
+        --lines_per_file = 2,
+        frame_count = 1,
+        --animation_speed = 0.2,
+        shift = {0,-0.3} 
+      },
+      working_visualisations = {
+        {
+          animation = 
+          {
+            filename = sprite('entity_overlay.png'),
+            size = {512,512},
+            scale = 0.54,
+            line_length = 3,
+            lines_per_file = 3,
+            frame_count = 9,
+            animation_speed = 0.2,
+            shift = {0,-0.3} 
+          }
+        }
       },
       working_sound =
       {
diff --git a/prototypes/fusion/fu_magnet.lua b/prototypes/fusion/fu_magnet.lua
index 0806811..d4298e0 100644
--- a/prototypes/fusion/fu_magnet.lua
+++ b/prototypes/fusion/fu_magnet.lua
@@ -106,49 +106,29 @@ data:extend({
       },
       --animation
       animation = {
-          north = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          east = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          south = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
-          west = {
-              filename = sprite('entity_animation.png'),
-              size = {512,512},
-              scale = 0.54,
-              line_length = 3,
-              lines_per_file = 3,
-              frame_count = 9,
-              animation_speed = 0.2,
-              shift = {0,-0.3}
-          },
+        filename = sprite('entity_base.png'),
+        size = {512,512},
+        scale = 0.54,
+        line_length = 1,
+        --lines_per_file = 2,
+        frame_count = 1,
+        --animation_speed = 0.2,
+        shift = {0,-0.3} 
       },
-
       working_visualisations = {
+        {
+          animation = 
+          {
+            filename = sprite('entity_overlay.png'),
+            size = {512,512},
+            scale = 0.54,
+            line_length = 3,
+            lines_per_file = 3,
+            frame_count = 9,
+            animation_speed = 0.2,
+            shift = {0,-0.3} 
+          }
+        },
         {
           light = {
             type = "basic",
diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png
index 0c7bc22..a61115d 100644
Binary files a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png and b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png differ
diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png
index 4b769cc..4e01eb1 100644
Binary files a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png and b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png differ
diff --git a/ressources/electronic/el_caster/el_caster_entity_animation.png b/ressources/electronic/el_caster/el_caster_entity_animation.png
deleted file mode 100644
index a27aa0f..0000000
Binary files a/ressources/electronic/el_caster/el_caster_entity_animation.png and /dev/null differ
diff --git a/ressources/electronic/el_caster/el_caster_entity_base.png b/ressources/electronic/el_caster/el_caster_entity_base.png
new file mode 100644
index 0000000..61d77e8
Binary files /dev/null and b/ressources/electronic/el_caster/el_caster_entity_base.png differ
diff --git a/ressources/electronic/el_caster/el_caster_entity_overlay.png b/ressources/electronic/el_caster/el_caster_entity_overlay.png
new file mode 100644
index 0000000..19b253d
Binary files /dev/null and b/ressources/electronic/el_caster/el_caster_entity_overlay.png differ
diff --git a/ressources/electronic/el_purifier/el_purifier_entity_animation.png b/ressources/electronic/el_purifier/el_purifier_entity_animation.png
deleted file mode 100644
index 60e3d20..0000000
Binary files a/ressources/electronic/el_purifier/el_purifier_entity_animation.png and /dev/null differ
diff --git a/ressources/electronic/el_purifier/el_purifier_entity_base.png b/ressources/electronic/el_purifier/el_purifier_entity_base.png
new file mode 100644
index 0000000..116aff6
Binary files /dev/null and b/ressources/electronic/el_purifier/el_purifier_entity_base.png differ
diff --git a/ressources/electronic/el_purifier/el_purifier_entity_overlay.png b/ressources/electronic/el_purifier/el_purifier_entity_overlay.png
new file mode 100644
index 0000000..1d3a378
Binary files /dev/null and b/ressources/electronic/el_purifier/el_purifier_entity_overlay.png differ
diff --git a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png
deleted file mode 100644
index 4690af9..0000000
Binary files a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png and /dev/null differ
diff --git a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_base.png b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_base.png
new file mode 100644
index 0000000..5750d2c
Binary files /dev/null and b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_base.png differ
diff --git a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_overlay.png b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_overlay.png
new file mode 100644
index 0000000..48e15f0
Binary files /dev/null and b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_overlay.png differ
diff --git a/ressources/fusion/fu_laser/fu_laser_entity_base.png b/ressources/fusion/fu_laser/fu_laser_entity_base.png
index 498e343..5e98855 100644
Binary files a/ressources/fusion/fu_laser/fu_laser_entity_base.png and b/ressources/fusion/fu_laser/fu_laser_entity_base.png differ
diff --git a/ressources/fusion/fu_laser/fu_laser_entity_overlay.png b/ressources/fusion/fu_laser/fu_laser_entity_overlay.png
index 8d78a89..73a3731 100644
Binary files a/ressources/fusion/fu_laser/fu_laser_entity_overlay.png and b/ressources/fusion/fu_laser/fu_laser_entity_overlay.png differ
diff --git a/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png b/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png
deleted file mode 100644
index 2c2d2dc..0000000
Binary files a/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png and /dev/null differ
diff --git a/ressources/fusion/fu_magnet/fu_magnet_entity_base.png b/ressources/fusion/fu_magnet/fu_magnet_entity_base.png
new file mode 100644
index 0000000..29ae6c9
Binary files /dev/null and b/ressources/fusion/fu_magnet/fu_magnet_entity_base.png differ
diff --git a/ressources/fusion/fu_magnet/fu_magnet_entity_overlay.png b/ressources/fusion/fu_magnet/fu_magnet_entity_overlay.png
new file mode 100644
index 0000000..29bc5af
Binary files /dev/null and b/ressources/fusion/fu_magnet/fu_magnet_entity_overlay.png differ
diff --git a/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png b/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png
index f560881..b16ffbf 100644
Binary files a/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png and b/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png differ
diff --git a/ressources/fusion/fu_plasma/fu_plasma_entity_base.png b/ressources/fusion/fu_plasma/fu_plasma_entity_base.png
index 32db0d1..a082478 100644
Binary files a/ressources/fusion/fu_plasma/fu_plasma_entity_base.png and b/ressources/fusion/fu_plasma/fu_plasma_entity_base.png differ