diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 79ac055ba7..4201713f2a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -19,6 +19,7 @@
         - type: BagOpenCloseVisualizer
           openIcon: open
         - type: StackVisualizer
+          sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
           composite: true
           stackLayers:
             - cig1
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
index aa330b70a5..0da0f0cd38 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
@@ -7,24 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "cig1"
-    },
-    {
-      "name": "cig2"
-    },
-    {
-      "name": "cig3"
-    },
-    {
-      "name": "cig4"
-    },
-    {
-      "name": "cig5"
-    },
-    {
-      "name": "cig6"
-    },
     {
       "name": "closed"
     },
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png
deleted file mode 100644
index cc8c846f38..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png
deleted file mode 100644
index 446d606c89..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png
deleted file mode 100644
index 72e1aa40d4..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png
deleted file mode 100644
index 0d9b28188e..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png
deleted file mode 100644
index b79eef3d2d..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png
deleted file mode 100644
index 8f39716ef2..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
index aa330b70a5..0da0f0cd38 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
@@ -7,24 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "cig1"
-    },
-    {
-      "name": "cig2"
-    },
-    {
-      "name": "cig3"
-    },
-    {
-      "name": "cig4"
-    },
-    {
-      "name": "cig5"
-    },
-    {
-      "name": "cig6"
-    },
     {
       "name": "closed"
     },
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png
deleted file mode 100644
index cc8c846f38..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png
deleted file mode 100644
index 446d606c89..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png
deleted file mode 100644
index 72e1aa40d4..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png
deleted file mode 100644
index 0d9b28188e..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png
deleted file mode 100644
index b79eef3d2d..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png
deleted file mode 100644
index 8f39716ef2..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
index aa330b70a5..0da0f0cd38 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
@@ -7,24 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "cig1"
-    },
-    {
-      "name": "cig2"
-    },
-    {
-      "name": "cig3"
-    },
-    {
-      "name": "cig4"
-    },
-    {
-      "name": "cig5"
-    },
-    {
-      "name": "cig6"
-    },
     {
       "name": "closed"
     },
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png
deleted file mode 100644
index cc8c846f38..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png
deleted file mode 100644
index 446d606c89..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png
deleted file mode 100644
index 72e1aa40d4..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png
deleted file mode 100644
index 0d9b28188e..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png
deleted file mode 100644
index b79eef3d2d..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png
deleted file mode 100644
index 8f39716ef2..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
index aa330b70a5..0da0f0cd38 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
@@ -7,24 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "cig1"
-    },
-    {
-      "name": "cig2"
-    },
-    {
-      "name": "cig3"
-    },
-    {
-      "name": "cig4"
-    },
-    {
-      "name": "cig5"
-    },
-    {
-      "name": "cig6"
-    },
     {
       "name": "closed"
     },
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json
new file mode 100644
index 0000000000..9e0bb8c848
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "cig1"
+    },
+    {
+      "name": "cig2"
+    },
+    {
+      "name": "cig3"
+    },
+    {
+      "name": "cig4"
+    },
+    {
+      "name": "cig5"
+    },
+    {
+      "name": "cig6"
+    }
+  ]
+}