diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index a07d27fc00..1e8c468591 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -14,6 +14,9 @@
   id: Matchstick
   description: A simple match stick, used for lighting fine smokables.
   components:
+  - type: Tag
+    tags:
+    - Matchstick
   - type: Sprite
     netsync: false
     sprite: Objects/Tools/matches.rsi
@@ -46,10 +49,26 @@
   components:
   - type: Matchbox
   - type: Sprite
+    netsync: false
     sprite: Objects/Tools/matches.rsi
     layers:
       - state: matchbox
+  - type: Item
+    sprite: Objects/Tools/matches.rsi
+    HeldPrefix: matchbox
   - type: StorageFill
     contents:
       - id: Matchstick
         amount: 6
+  - type: StorageCounter
+    countTag: Matchstick
+  - type: Appearance
+    visuals:
+      - type: BagOpenCloseVisualizer
+        openIcon: matchbox-open
+      - type: StackVisualizer
+        composite: true
+        stackLayers:
+          - matchbox1
+          - matchbox2
+          - matchbox3
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 616a6c9f43..9746fdd591 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -130,6 +130,9 @@
 - type: Tag
   id: Machete
 
+- type: Tag
+  id: Matchstick
+
 - type: Tag
   id: MonkeyCube
 
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-left.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-left.png
new file mode 100644
index 0000000000..c54c85a8e2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-right.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-right.png
new file mode 100644
index 0000000000..945482297d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox-open.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-open.png
new file mode 100644
index 0000000000..e6023a052e
Binary files /dev/null and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-open.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox.png
index dfd12b3a08..8670ec194c 100644
Binary files a/Resources/Textures/Objects/Tools/matches.rsi/matchbox.png and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox1.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox1.png
new file mode 100644
index 0000000000..05f79b89f4
Binary files /dev/null and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox1.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox2.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox2.png
new file mode 100644
index 0000000000..b2d9f9445c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox2.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox3.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox3.png
new file mode 100644
index 0000000000..3b3a406d5f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/matches.rsi/matchbox3.png differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostempty.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostempty.png
deleted file mode 100644
index 3d3035ea85..0000000000
Binary files a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostempty.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostfull.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostfull.png
deleted file mode 100644
index b7a9a6e846..0000000000
Binary files a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostfull.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_e.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox_e.png
deleted file mode 100644
index ba9a9fe405..0000000000
Binary files a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_e.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Tools/matches.rsi/meta.json b/Resources/Textures/Objects/Tools/matches.rsi/meta.json
index 4ceb4f63cc..62a0442070 100644
--- a/Resources/Textures/Objects/Tools/matches.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/matches.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
@@ -27,13 +27,24 @@
       "name": "matchbox"
     },
     {
-      "name": "matchbox_almostempty"
+      "name": "matchbox-open"
     },
     {
-      "name": "matchbox_almostfull"
+      "name": "matchbox1"
     },
     {
-      "name": "matchbox_e"
+      "name": "matchbox2"
+    },
+    {
+      "name": "matchbox3"
+    },
+    {
+      "name": "matchbox-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "matchbox-inhand-right",
+      "directions": 4
     },
     {
       "name": "unlit-inhand-left",