diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index adf094d12e..5551412745 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: handheld radio
-  description: A handy handheld radio.
   parent: BaseItem
   id: RadioHandheld
+  name: handheld radio
+  description: A handy handheld radio.
   components:
   - type: TelecomExempt
   - type: RadioMicrophone
@@ -16,8 +16,25 @@
     sprite: Objects/Devices/communication.rsi
     layers:
     - state: walkietalkie
-    - state: walkietalkie-on
-    state: walkietalkie
+    - map: [enum.RadioDeviceVisualLayers.Broadcasting]
+      state: walkietalkie-on
+      shader: unshaded
+      visible: false
+    - map: [enum.RadioDeviceVisualLayers.Speaker]
+      state: walkietalkie-active
+      shader: unshaded
+      visible: false
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.RadioDeviceVisuals.Broadcasting:
+        enum.RadioDeviceVisualLayers.Broadcasting:
+          True: { visible: true }
+          False: { visible: false }
+      enum.RadioDeviceVisuals.Speaker:
+        enum.RadioDeviceVisualLayers.Speaker:
+          True: { visible: true }
+          False: { visible: false }
   - type: Item
     sprite: Objects/Devices/communication.rsi
     heldPrefix: walkietalkie
@@ -26,10 +43,10 @@
     - Radio
 
 - type: entity
-  name: security radio
-  description: A handy security radio.
   parent: [ RadioHandheld, BaseSecurityContraband ]
   id: RadioHandheldSecurity
+  name: security radio
+  description: A handy security radio.
   components:
   - type: RadioMicrophone
     broadcastChannel: Security
@@ -41,4 +58,3 @@
     sprite: Objects/Devices/securityhandy.rsi
   - type: Item
     sprite: Objects/Devices/securityhandy.rsi
-    heldPrefix: walkietalkie
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index 7aa33b0489..7c69dcca12 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo",
+    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other licensed sprites in the repo. walkietalkie/-on/-active edited by whatston3.",
     "size": {
         "x": 32,
         "y": 32
@@ -33,9 +33,6 @@
         {
             "name": "walkietalkie-on"
         },
-        {
-            "name": "walkietalkie-off"
-        },
         {
             "name": "walkietalkie-active"
         },
@@ -47,14 +44,6 @@
             "name": "walkietalkie-inhand-left",
             "directions": 4
         },
-        {
-            "name": "off-walkietalkie-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "off-walkietalkie-inhand-left",
-            "directions": 4
-        },
         {
             "name": "old-radio"
         },
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png
deleted file mode 100644
index 7aefcd07ef..0000000000
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png
deleted file mode 100644
index de13046469..0000000000
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png
index ecd4d0661c..95cf3d8ccd 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png
deleted file mode 100644
index 70e2b3a2a5..0000000000
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png
index 0bf04a782d..f0407d1448 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png
index 0799b3f9c8..6834e594bc 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png differ
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
index 2ff702f252..84ad1775ae 100644
--- a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "walkietalkie"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Minor edits, unshaded separation by whatston3.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "walkietalkie-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "walkietalkie-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "walkietalkie-off"
-    },
-    {
-      "name": "walkietalkie-on"
-    }
-  ]
+    "states": [
+        {
+            "name": "walkietalkie"
+        },
+        {
+            "name": "walkietalkie-on"
+        },
+        {
+            "name": "walkietalkie-active"
+        },
+        {
+            "name": "walkietalkie-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "walkietalkie-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png
new file mode 100644
index 0000000000..95cf3d8ccd
Binary files /dev/null and b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png differ
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png
deleted file mode 100644
index 2afdf8d962..0000000000
Binary files a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png
index dfd79a6441..af20e880ab 100644
Binary files a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png and b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png differ
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png
index 12aaa3f2f0..4e694002da 100644
Binary files a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png and b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png differ