diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
index db703128a3..e7fcf7e219 100644
--- a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
@@ -30,9 +30,6 @@ public sealed class PoweredLightVisualizerSystem : VisualizerSystem<PoweredLight
         if (comp.SpriteStateMap.TryGetValue(state, out var spriteState))
             args.Sprite.LayerSetState(PoweredLightLayers.Base, spriteState);
 
-        if (args.Sprite.LayerExists(PoweredLightLayers.Glow))
-            args.Sprite.LayerSetVisible(PoweredLightLayers.Glow, state == PoweredLightState.On);
-
         SetBlinkingAnimation(
             uid,
             state == PoweredLightState.On
diff --git a/Content.Shared/Light/SharedPoweredLightVisuals.cs b/Content.Shared/Light/SharedPoweredLightVisuals.cs
index 90c15bb373..6b954a8bf6 100644
--- a/Content.Shared/Light/SharedPoweredLightVisuals.cs
+++ b/Content.Shared/Light/SharedPoweredLightVisuals.cs
@@ -21,7 +21,6 @@ namespace Content.Shared.Light
 
     public enum PoweredLightLayers : byte
     {
-        Base,
-        Glow
+        Base
     }
 }
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index ad2851415a..397ae09541 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -25,12 +25,9 @@
     sprite: Structures/Wallmounts/Lighting/light_tube.rsi
     drawdepth: WallMountedItems
     layers:
-    - map: ["enum.PoweredLightLayers.Base"]
-      state: base
-    - map: ["enum.PoweredLightLayers.Glow"]
-      state: glow
-      shader: unshaded
-    state: base
+    - state: on
+      map: ["enum.PoweredLightLayers.Base"]
+    state: on
   - type: PointLight
     color: "#FFE4CE" # 5000K color temp
     energy: 0.8
@@ -111,12 +108,6 @@
   - type: PoweredLightVisuals
     blinkingSound:
       path: "/Audio/Machines/light_tube_on.ogg"
-    spriteStateMap:
-      empty: empty
-      off: base
-      on: base
-      broken: broken
-      burned: burned
 
 - type: entity
   id: Poweredlight
@@ -125,7 +116,7 @@
   parent: PoweredlightEmpty
   components:
   - type: Sprite
-    state: base
+    state: off
   - type: PointLight
     enabled: true
   - type: PoweredLight
@@ -227,7 +218,7 @@
         path: /Audio/Ambience/Objects/light_hum.ogg
     - type: Sprite
       sprite: Structures/Wallmounts/Lighting/light_small.rsi
-      state: base
+      state: on
     - type: PointLight
       energy: 1.0
       radius: 6
@@ -291,15 +282,6 @@
     range: 200
   - type: Appearance
   - type: PoweredLightVisuals
-    spriteStateMap:
-      empty: empty
-      off: base
-      on: base
-      broken: broken
-      burned: burned
-  - type: DeviceLinkSource
-    ports:
-    - LightStatus
   - type: DeviceLinkSink
     ports:
       - On
@@ -312,7 +294,7 @@
   parent: PoweredSmallLightEmpty
   components:
   - type: Sprite
-    state: base
+    state: off
   - type: PointLight
     enabled: true
   - type: PoweredLight
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
index b8aaa60c37..ebeebef8f7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
@@ -8,12 +8,9 @@
     sprite: Structures/Wallmounts/service_light.rsi
     drawdepth: WallMountedItems
     layers:
-    - map: ["enum.PoweredLightLayers.Base"]
-      state: base
-    - map: ["enum.PoweredLightLayers.Glow"]
-      state: glow
-      shader: unshaded
-    state: base
+    - state: off
+      map: ["enum.PoweredLightLayers.Base"]
+    state: off
   - type: PointLight
     radius: 1.5
     energy: 0.45
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 8ff75b3d22..6881d579fa 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1059,7 +1059,7 @@
   description: A wall light fixture. Use light tubes.
   icon:
     sprite: Structures/Wallmounts/Lighting/light_tube.rsi
-    state: base
+    state: off
   objectType: Structure
   placementMode: SnapgridCenter
   canRotate: true
@@ -1079,7 +1079,7 @@
   description: A wall light fixture. Use light bulbs.
   icon:
     sprite: Structures/Wallmounts/Lighting/light_small.rsi
-    state: base
+    state: off
   objectType: Structure
   placementMode: SnapgridCenter
   canRotate: true
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png
deleted file mode 100644
index 0bfe0a7ddb..0000000000
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json
index 09378e1ebd..5b49fd2cea 100644
--- a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [{"name": "broken", "directions": 4}, {"name": "burned", "directions": 4}, {"name": "empty", "directions": 4}, {"name": "base", "directions": 4}, {"name": "glow", "directions": 4}]}
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [{"name": "broken", "directions": 4}, {"name": "burned", "directions": 4}, {"name": "empty", "directions": 4}, {"name": "off", "directions": 4}, {"name": "on", "directions": 4}]}
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png
similarity index 100%
rename from Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/base.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png
new file mode 100644
index 0000000000..01b6e79d75
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
deleted file mode 100644
index 02e8764173..0000000000
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
index 9d10428af8..1565cdc86d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
index 160db7c5cb..7e14e2c2b3 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
index 0f8f9478bd..5ead53beb0 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
deleted file mode 100644
index e1258d83dc..0000000000
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
index 4b8aa5fa2f..d7e5ae46ad 100644
--- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
@@ -1,31 +1,101 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
   "size": {
     "x": 32,
     "y": 32
   },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi",
   "states": [
     {
       "name": "broken",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "burned",
-      "directions": 4
-    },
-    {
-      "name": "base",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "empty",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
     },
-	{
-      "name": "glow",
-      "directions": 4
+    {
+      "name": "off",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "on",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png
new file mode 100644
index 0000000000..0a2e1ae76b
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png
new file mode 100644
index 0000000000..6b9758914a
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/glow.png
deleted file mode 100644
index 5cb7b09ea1..0000000000
Binary files a/Resources/Textures/Structures/Wallmounts/service_light.rsi/glow.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json
index ceaa7a56ee..cf91d5d1a5 100644
--- a/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json
@@ -20,11 +20,11 @@
             "directions": 4
         },
         {
-            "name": "base",
+            "name": "off",
             "directions": 4
         },
         {
-            "name": "glow",
+            "name": "on",
             "directions": 4,
             "delays": [
                 [
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/base.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png
similarity index 100%
rename from Resources/Textures/Structures/Wallmounts/service_light.rsi/base.png
rename to Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png
new file mode 100644
index 0000000000..3e52be44ec
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png differ