diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index b85cf244f18..a185fd7f1cc 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -29,10 +29,10 @@
 
 /obj/item/weapon/matchbox
 	name = "Matchbox"
-	desc = "A box of matches"
+	desc = "A small box of Almost But Not Quite Plasma Premium Matches."
 	icon = 'cigarettes.dmi'
 	icon_state = "matchbox"
-	var/matchcount = 20
+	var/matchcount = 10
 
 /obj/item/weapon/rcd
 	name = "rapid-construction-device (RCD)"
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 39e85ffbd7a..e948d4b6cff 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -49,13 +49,11 @@ ZIPPO
 	else
 		return ..()
 	if(src.matchcount <= 0)
-		src.icon_state = "matchbox_e"
-	else if(src.matchcount <= 5)
-		src.icon_state = "matchbox_1q"
-	else if(src.matchcount <= 10)
-		src.icon_state = "matchbox_h"
-	else if(src.matchcount <= 15)
-		src.icon_state = "matchbox_3q"
+		src.icon_state = "matchbox_empty"
+	else if(src.matchcount <= 3)
+		src.icon_state = "matchbox_almostempty"
+	else if(src.matchcount <= 6)
+		src.icon_state = "matchbox_almostfull"
 	else
 		src.icon_state = "matchbox"
 	src.update_icon()
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index bdc762803b9..bae1b0d3642 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ