diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index 07c2a7ad3c..375d24c29e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -18,6 +18,13 @@
     containers:
       cluster-payload: !type:Container
   - type: ProjectileGrenade
+  - type: AnimationPlayer
+  - type: GenericVisualizer
+    visuals:
+      enum.Trigger.TriggerVisuals.VisualState:
+        enum.ConstructionVisuals.Layer:
+          Primed: { state: primed }
+          Unprimed: { state: icon }
 
 - type: entity
   parent: [ProjectileGrenadeBase, BaseRestrictedContraband]
@@ -41,10 +48,6 @@
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
   - type: OnUseTimerTrigger
-    beepSound:
-      path: "/Audio/Effects/beep1.ogg"
-      params:
-        volume: 5
     initialBeepDelay: 0
     beepInterval: 2
     delay: 3.5
diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
index 5f43e51ee0..4251b56a0f 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
index 889ac5cb4c..b5584b9e38 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e52683d3872347af447bb0ff74c420d4a4e91ea8",
+  "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/8231234a64b80635369e8da43011ad20bde631ce/icons/obj/grenade.dmi, created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
index a11f70171f..4e96428882 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png
index 6fc9244667..28006d22b0 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
index aec9818274..6151b7f44c 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
index 28d3e6969a..b5584b9e38 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
+  "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/8231234a64b80635369e8da43011ad20bde631ce/icons/obj/grenade.dmi, created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
index 596bfb6a15..d396f42261 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..d3eca30e75
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png
index c6365e6404..54cdd40640 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
index 525248ce94..cfe6901719 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi",
+  "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/83624574e59e68746965ef528604663b16983473/icons/obj/grenade.dmi, created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -12,6 +12,10 @@
     },
     {
       "name": "primed"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png
index ef7ca55e19..25d11b7fda 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png
index 85a06f2d4d..cfc9b2a94f 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
index 1fae857453..ca4383378b 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
index 28d3e6969a..2f3dee4f0a 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
+  "copyright": "Derived from Arendian (https://github.com/space-wizards/space-station-14/commit/3e766402b9d6c17f41f9e7e814b70eef83a95568), created by K-Dynamic",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
index 32d39cb89f..dd9542f61f 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png
index e3980eaf10..5faf46b224 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
index 60b919588c..69413f3b8c 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi and modified by deltanedas (github)",
+  "copyright": "Derived from deltanedas (https://github.com/space-wizards/space-station-14/commit/7dd472c934e61e4087a3f991ed9b51f0eb99271c), created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png
index ca49e02fe3..61d03a6a79 100644
Binary files a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png differ