diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 6c3814a8010..dd4d2662a7d 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -556,6 +556,7 @@
 	name = "toy phazon"
 	desc = "Mini-Mecha action figure! Collect them all! 11/11."
 	icon_state = "phazonprize"
+
 /obj/item/toy/katana
 	name = "replica katana"
 	desc = "Woefully underpowered in D20."
@@ -575,4 +576,4 @@
 	desc = "This baby looks almost real. Wait, did it just burp?"
 	force = 5
 	w_class = 4.0
-	slot_flags = SLOT_BACK
+	slot_flags = SLOT_BACK
\ No newline at end of file
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index c953ac56686..ff80b7bd0c0 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -135,6 +135,14 @@ hi
 	icon_on = "bluezippoon"
 	icon_off = "bluezippo"
 
+/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess
+	name = "engraved lighter"
+	desc = "A golden lighter, engraved with some ornaments and a G."
+	icon = 'custom_items.dmi'
+	icon_state = "guessip"
+	icon_on = "guessipon"
+	icon_off = "guessip"
+
 /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin
 	name = "Riley's black zippo"
 	desc = "A black zippo lighter, which holds some form of sentimental value."
@@ -263,14 +271,6 @@ hi
 	body_parts_covered = null
 	flags = FPRINT|TABLEPASS
 
-/obj/item/weapon/lighter/fluff //Dragor23: Michael Guess
-	name = "engraved lighter"
-	desc = "A golden lighter, engraved with some ornaments and a G.."
-	icon_state = "guessip"
-	item_state = "guessip"
-	icon_on = "guessipon"
-	icon_off = "guessip"
-
 //Strange penlight, Nerezza: Asher Spock
 
 /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 914426748a6..aaf47b37a91 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 6d2abfacd9d..4141cca7185 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 402704f387a..a921d45d483 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ