diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index 9739b52cd69..9a16cb75cae 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -3,6 +3,8 @@
 	name = "cheap lighter"
 	desc = "A cheap-as-free lighter."
 	icon = 'icons/obj/items.dmi'
+	lefthand_file = 'icons/mob/inhands/lighter_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/lighter_righthand.dmi'
 	icon_state = "lighter-g"
 	item_state = "lighter-g"
 	w_class = WEIGHT_CLASS_TINY
@@ -12,8 +14,6 @@
 	attack_verb = null
 	resistance_flags = FIRE_PROOF
 	var/lit = FALSE
-	var/icon_on = "lighter-g-on"
-	var/icon_off = "lighter-g"
 	/// Cooldown until the next turned on message/sound can be activated
 	var/next_on_message
 	/// Cooldown until the next turned off message/sound can be activated
@@ -22,9 +22,7 @@
 /obj/item/lighter/random/New()
 	..()
 	var/color = pick("r","c","y","g")
-	icon_on = "lighter-[color]-on"
-	icon_off = "lighter-[color]"
-	icon_state = icon_off
+	icon_state = "lighter-[color]"
 
 /obj/item/lighter/attack_self(mob/living/user)
 	. = ..()
@@ -43,13 +41,12 @@
 /obj/item/lighter/proc/turn_on_lighter(mob/living/user)
 	lit = TRUE
 	w_class = WEIGHT_CLASS_BULKY
-	icon_state = icon_on
-	item_state = icon_on
 	force = 5
 	damtype = BURN
 	hitsound = 'sound/items/welder.ogg'
 	attack_verb = list("burnt", "singed")
 
+	update_icon()
 	attempt_light(user)
 	set_light(2)
 	START_PROCESSING(SSobj, src)
@@ -70,12 +67,11 @@
 /obj/item/lighter/proc/turn_off_lighter(mob/living/user)
 	lit = FALSE
 	w_class = WEIGHT_CLASS_TINY
-	icon_state = icon_off
-	item_state = icon_off
 	hitsound = "swing_hit"
 	force = 0
 	attack_verb = null //human_defense.dm takes care of it
 
+	update_icon()
 	if(user)
 		show_off_message(user)
 	set_light(0)
@@ -119,14 +115,20 @@
 		location.hotspot_expose(700, 5)
 	return
 
+/obj/item/lighter/update_icon_state()
+	icon_state = "[initial(icon_state)][lit ? "-on" : ""]"
+	return ..()
+
+/obj/item/lighter/update_overlays()
+	item_state = "[initial(item_state)][lit ? "-on" : ""]"
+	return ..()
+
 // Zippo lighters
 /obj/item/lighter/zippo
 	name = "zippo lighter"
 	desc = "The zippo."
 	icon_state = "zippo"
 	item_state = "zippo"
-	icon_on = "zippoon"
-	icon_off = "zippo"
 
 /obj/item/lighter/zippo/turn_on_lighter(mob/living/user)
 	. = ..()
@@ -159,37 +161,31 @@
 /obj/item/lighter/zippo/nt_rep
 	name = "gold engraved zippo"
 	desc = "An engraved golden Zippo lighter with the letters NT on it."
-	icon_state = "zippo_nt_off"
-	icon_on = "zippo_nt_on"
-	icon_off = "zippo_nt_off"
+	icon_state = "zippo-nt"
+	item_state = "zippo-gold"
 
 /obj/item/lighter/zippo/blue
 	name = "blue zippo lighter"
 	desc = "A zippo lighter made of some blue metal."
-	icon_state = "bluezippo"
-	icon_on = "bluezippoon"
-	icon_off = "bluezippo"
+	icon_state = "zippo-blue"
+	item_state = "zippo-blue"
 
 /obj/item/lighter/zippo/black
 	name = "black zippo lighter"
 	desc = "A black zippo lighter."
-	icon_state = "blackzippo"
-	icon_on = "blackzippoon"
-	icon_off = "blackzippo"
+	icon_state = "zippo-black"
+	item_state = "zippo-black"
 
 /obj/item/lighter/zippo/engraved
 	name = "engraved zippo lighter"
 	desc = "A intricately engraved zippo lighter."
-	icon_state = "engravedzippo"
-	icon_on = "engravedzippoon"
-	icon_off = "engravedzippo"
+	icon_state = "zippo-engraved"
 
 /obj/item/lighter/zippo/gonzofist
 	name = "Gonzo Fist zippo"
 	desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
-	icon_state = "gonzozippo"
-	icon_on = "gonzozippoon"
-	icon_off = "gonzozippo"
+	icon_state = "zippo-gonzo"
+	item_state = "zippo-red"
 
 ///////////
 //MATCHES//
diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm
index adf3af170dd..5964acf38d3 100644
--- a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm
@@ -11,6 +11,5 @@
 /obj/item/lighter/zippo/contractor
 	name = "contractor zippo lighter"
 	desc = "An unique black and gold zippo commonly carried by elite Syndicate agents."
-	icon_state = "contractorzippo"
-	icon_on = "contractorzippoon"
-	icon_off = "contractorzippo"
+	icon_state = "zippo-contractor"
+	item_state = "zippo-black"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 65b6e2676d6..2bf1e8fc21d 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -202,37 +202,35 @@
 
 	to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
 
+// Custom zippo lighters
+/obj/item/lighter/zippo/fluff
+	name = "custom zippo"
+	desc = "A custom made zippo lighter."
+	icon = 'icons/obj/custom_items.dmi'
+
 /obj/item/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad
 	name = "purple engraved zippo"
 	desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "purple_zippo_off"
-	icon_on = "purple_zippo_on"
-	icon_off = "purple_zippo_off"
+	icon_state = "zippo-purple"
+	item_state = "zippo-purple"
 
 /obj/item/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold
 	name = "engraved lighter"
 	desc = "A golden lighter, engraved with some ornaments and a G."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "guessip"
-	icon_on = "guessipon"
-	icon_off = "guessip"
+	icon_state = "zippo-guess"
+	item_state = "zippo-gold"
 
 /obj/item/lighter/zippo/fluff/duckchan // Duckchan: Rybys Romney
 	name = "Monogrammed Zippo"
 	desc = " A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "rybysfluff"
-	icon_on = "rybysfluffopen"
-	icon_off = "rybysfluff"
+	icon_state = "zippo-duckchan"
+	item_state = "zippo-purple"
 
 /obj/item/lighter/zippo/fluff/warriorstar // Warriorstar: DEADLOCK
 	name = "zippo"
 	desc = "The lighter is made of a pastel purple metal which seems to glimmer even in complete darkness."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "deadlock_zippo"
-	icon_on = "deadlock_zippo_on"
-	icon_off = "deadlock_zippo"
+	icon_state = "zippo-warriorstar"
+	item_state = "zippo-purple"
 
 /obj/item/fluff/dogwhistle //phantasmicdream: Zeke Varloss
 	name = "Sax's whistle"
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index f5511c5ec82..351472113bb 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index ba7cf1cddfa..daced424869 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/lighter_lefthand.dmi b/icons/mob/inhands/lighter_lefthand.dmi
new file mode 100644
index 00000000000..33ac46a2b08
Binary files /dev/null and b/icons/mob/inhands/lighter_lefthand.dmi differ
diff --git a/icons/mob/inhands/lighter_righthand.dmi b/icons/mob/inhands/lighter_righthand.dmi
new file mode 100644
index 00000000000..dadd8e96100
Binary files /dev/null and b/icons/mob/inhands/lighter_righthand.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 7b7f2d6e815..ae96898cf33 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 41e3d2e6bf0..d5d982cbeab 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ