diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 2bc5cabd28..15f8d052b9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -91,7 +91,7 @@
     # autoEject: true # Do not set this until the PVS prediction issue is resolved
   - type: MagazineVisuals
     magState: mag
-    steps: 1
+    steps: 6
     zeroVisible: true
   - type: Appearance
 
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
index 430d78001a..8ace34ae73 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png
index 61d4f77a19..d4aff837fc 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png
index 565a3fcf44..2c1d776fb4 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png
index 521e71de8b..d5af57bddd 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png
index 324cfc2cc3..62660a5aa4 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
index cdc084122b..c4a04dea6c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
index ec4156700a..bf8cc27c45 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
index db3b039e59..c959a32fd7 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/pull/26621/commits/fc4cc47e5ae4a5562077239fc2dcfe1603d2645a",
+    "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png
index db369dcfa6..c739e0816d 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
index da50879e32..c959a32fd7 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
+    "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png
index 9e378aed75..c942e1dadf 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
index db3b039e59..f40254fa5b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/pull/26621/commits/fc4cc47e5ae4a5562077239fc2dcfe1603d2645a",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png
index 365912737b..32d9c37299 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png
index e7ed176beb..d046237d1b 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png
index faa13781ab..a93415664e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png
index 52a889eefa..777c25475f 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png
index 9f9817c9cb..4917f158d7 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png
index f035d04e93..1c0efd411a 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
index fc6d6f78db..b5ed0520c0 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
index 9e6d62d34f..6031840c6c 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png
index ce87258d82..128e7da1be 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png
index 47544b0b42..c7b3d08483 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
index 0cfb656330..48b0fe1d54 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png
index 89de5fa775..84b4664f0a 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-1.png
new file mode 100644
index 0000000000..b752747c63
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-2.png
new file mode 100644
index 0000000000..52d395eac4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-3.png
new file mode 100644
index 0000000000..98205c742f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-4.png
new file mode 100644
index 0000000000..31b814e5a2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-5.png
new file mode 100644
index 0000000000..e36b2c07ff
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-5.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
index 1b7ea466ec..f4afb59d03 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
@@ -16,6 +16,21 @@
         {
             "name": "mag-0"
         },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
         {
             "name": "suppressor"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png
index efeadaf453..4545503c57 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png
index 8145edfbd9..f728a5df1d 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png
index 1ebdab0ebb..6aafc02670 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png
index 20d40336c8..857e1b8597 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
index 233731c5a1..2681f57361 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png
index 482493210a..8e93d86f67 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png
index 7f7c9cfbbd..b33ce2b9ce 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png
index fda6921f5c..f6edbb2c96 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
index dd98c43908..f976a57a71 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png
index 8bfd3150ff..7528ff1081 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png differ