diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 70e3ee3578..f94aadab7f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -57,3 +57,35 @@
     layers:
       - state: box_security
       - state: ziptie
+
+- type: entity
+  name: box of beanbag shots
+  parent: BoxCardboard
+  id: BoxBeanbag
+  description: A box full of beanbag shots, designed for riot shotguns.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ShellShotgunBeanbag
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box_beanbag
+  - type: Storage
+    capacity: 30
+
+- type: entity
+  name: box of lethal shots
+  parent: BoxCardboard
+  id: BoxLethalshot
+  description: A box full of lethal shots, designed for riot shotguns.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ShellShotgunBase
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box_lethalshot
+  - type: Storage
+    capacity: 30
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index 2f7c63f4bb..cea0cb252d 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -21,5 +21,5 @@
     contents:
       - id: ShotgunGladstone
         amount: 2
-      - id: ShellShotgun
-        amount: 18
+      - id: BoxLethalshot
+        amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index 2e4974674a..5444927a21 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -61,8 +61,8 @@
         amount: 2
       - id: ShotgunGladstone
         amount: 2
-      - id: ShellShotgunBeanbag
-        amount: 12
+      - id: BoxBeanbag
+        amount: 2
 #      - ShieldRiot
 #      - SecGasmask
 
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png
new file mode 100644
index 0000000000..d83ddc20b3
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png
new file mode 100644
index 0000000000..03f3e809ef
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 779637b116..7b0c750a9e 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/17dc39d12005f3279a90212b5c61a781c08693a5",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0",
   "size": {
     "x": 32,
     "y": 32
@@ -113,6 +113,12 @@
       "name": "hug-inhand-right",
       "directions": 4
     },
+    {
+      "name": "box_lethalshot"
+    },
+    {
+      "name": "box_beanbag"
+    },
     {
       "name": "ziptie"
     }