diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 3ec8204e46..01a8e7e951 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -74,3 +74,12 @@
     - id: HydroponicsToolMiniHoe
     - id: HydroponicsToolSpade
     - id: RobustHarvestChemistryBottle
+
+- type: entity
+  id: ClothingBeltSheathFilled
+  parent: ClothingBeltSheath
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CaptainSabre
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 4310ce43f1..7f7f28b69c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -61,6 +61,7 @@
         prob: 0.1
       - id: CigarGoldCase
         prob: 0.25
+      - id: ClothingBeltSheathFilled
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 6da8411f77..f41ee76e5b 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -384,55 +384,8 @@
     whitelist:
       tags:
         - CaptainSabre
-        - Baguette
-        - Carrot
-        - Crowbar
-        - Katana
-        - Machete
-        - CombatKnife
-        - RodMetal1
-        - Spear
-      components:
-        - Mop
-  - type: StorageFill
-    contents:
-      - id: CaptainSabre
   - type: ItemMapper
     mapLayers:
-      sheath-bag:
-        whitelist:
-          tags:
-          - Baguette
-      sheath-carrot:
-        whitelist:
-          tags:
-          - Carrot
-      sheath-crowbar:
-        whitelist:
-          tags:
-          - Crowbar
-      sheath-crowbarr:
-        whitelist:
-          tags:
-          - CrowbarRed
-      sheath-katana:
-        whitelist:
-          tags:
-          - Katana
-      sheath-knife:
-        whitelist:
-          tags:
-          - Machete
-          - CombatKnife
-      sheath-mop:
-        whitelist:
-          components:
-          - Mop
-      sheath-rod:
-        whitelist:
-          tags:
-          - RodMetal1
-          - Spear
       sheath-sabre:
         whitelist:
           tags:
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..ea9b5643ca
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
index 315422c42d..e549767f3a 100644
--- a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
@@ -1,44 +1,20 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-        "name": "sheath-equipped-BELT",
+        "name": "equipped-BELT",
         "directions": 4
     },
     {
         "name": "sheath-sabre-equipped-BELT",
         "directions": 4
     },
-    {
-        "name": "sheath-bag"
-    },
-    {
-        "name": "sheath-carrot"
-    },
-    {
-        "name": "sheath-crowbar"
-    },
-    {
-        "name": "sheath-crowbarr"
-    },
-    {
-        "name": "sheath-katana"
-    },
-    {
-        "name": "sheath-knife"
-    },
-    {
-        "name": "sheath-mop"
-    },
-    {
-        "name": "sheath-rod"
-    },
     {
         "name": "sheath-sabre"
     },
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png
deleted file mode 100644
index 81091d9a61..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png
deleted file mode 100644
index f9c3f6d753..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png
deleted file mode 100644
index c7e735941f..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png
deleted file mode 100644
index c763911d14..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-equipped-BELT.png
deleted file mode 100644
index eb54d79fd5..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png
deleted file mode 100644
index ba44c6a143..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png
deleted file mode 100644
index b85a4db7b2..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png
deleted file mode 100644
index 5f311b7cac..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png
deleted file mode 100644
index 14e533d062..0000000000
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png
index b11ba9b56b..a1e69cd243 100644
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png
index 462d997cf3..7c8d5aab97 100644
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png differ
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath.png
index 5afd4c56b9..fb1b2f0e8a 100644
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png
index 0874186095..d4d1c3ca46 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png
index d5f8656886..6b53ba6897 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png
index b0415abc98..b0e6a2ce8d 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
index aa6abfee3b..a6b30533f5 100644
--- a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.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/pull/31615/commits/8795484578b33a9919b7801667287c0f28afe642",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf",
   "size": {
     "x": 32,
     "y": 32