diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
index 10c41efc54a..667d5da11ca 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
@@ -6,8 +6,12 @@
   description: Someone forgot to turn off kettle?
   components:
   - type: Item
+    sprite: Objects/Fun/whistles.rsi
     size: Tiny
+  - type: Sprite
+    sprite: Objects/Fun/whistles.rsi
   - type: Clothing
+    sprite: Objects/Fun/whistles.rsi
     quickEquip: false
     slots: neck
   - type: UseDelay
@@ -16,7 +20,14 @@
     sound:
       collection: BaseWhistle
   - type: Whistle
-    distance: 5
+    distance: 3
+
+- type: entity
+  parent: BaseWhistle
+  id: Whistle
+  components:
+  - type: Sprite
+    state: whistle
 
 - type: entity
   parent: BaseWhistle
@@ -24,10 +35,11 @@
   description: Sound of it make you feel fear.
   components:
   - type: Sprite
-    sprite: Objects/Fun/whistle.rsi
-    state: securityWhistle
-  - type: Item
-    sprite: Objects/Fun/whistle.rsi
+    state: sec
+  - type: Clothing
+    equippedPrefix: sec
+  - type: Whistle
+    distance: 5
 
 - type: entity
   parent: BaseWhistle
@@ -36,13 +48,9 @@
   description: A whistle used by Syndicate commanders to draw attention. Avanti!
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    state: icon
+    state: trench
   - type: Clothing
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    quickEquip: False
-    slots:
-    - neck
+    equippedPrefix: trench
   - type: EmitSoundOnUse
     sound:
       collection: TrenchWhistle
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 6a351d47f0b..8b2cb5d5c7b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -129,6 +129,7 @@
     - PlushiePenguin
     - PlushieHuman
     - ClothingHeadHatCowboyRed
+    - Whistle
   - type: WiresPanel
   - type: Wires
     layoutId: Arcade
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
deleted file mode 100644
index 31cda14261e..00000000000
--- a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Firewatchin on Discord.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json b/Resources/Textures/Objects/Fun/whistle.rsi/meta.json
deleted file mode 100644
index 59159ff6170..00000000000
--- a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by Foleps (discord)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "securityWhistle"
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..89fdd599b2b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/meta.json b/Resources/Textures/Objects/Fun/whistles.rsi/meta.json
new file mode 100644
index 00000000000..4f59ad60e0f
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/whistles.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "sec and whistle made by Foleps (discord), trench by Firewatchin (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "whistle"
+    },
+    {
+      "name": "sec-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "sec"
+    },
+    {
+      "name": "trench-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "trench"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png
new file mode 100644
index 00000000000..053c457f03c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png differ
diff --git a/Resources/Textures/Objects/Fun/whistle.rsi/securityWhistle.png b/Resources/Textures/Objects/Fun/whistles.rsi/sec.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/whistle.rsi/securityWhistle.png
rename to Resources/Textures/Objects/Fun/whistles.rsi/sec.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/trench-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png
rename to Resources/Textures/Objects/Fun/whistles.rsi/trench-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png b/Resources/Textures/Objects/Fun/whistles.rsi/trench.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png
rename to Resources/Textures/Objects/Fun/whistles.rsi/trench.png
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png b/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png
new file mode 100644
index 00000000000..35db0ffca4b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png differ