diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 304131d736..0f202d9d05 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -414,35 +414,33 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon = 'icons/obj/items.dmi'
 	icon_state = "lighter-g"
 	item_state = "lighter-g"
-	var/icon_on = "lighter-g-on"
-	var/icon_off = "lighter-g"
 	w_class = 1
 	throwforce = 4
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	attack_verb = list("burnt", "singed")
+	var/base_state
 
 /obj/item/weapon/flame/lighter/zippo
 	name = "\improper Zippo lighter"
 	desc = "The zippo."
 	icon_state = "zippo"
 	item_state = "zippo"
-	icon_on = "zippoon"
-	icon_off = "zippo"
 
 /obj/item/weapon/flame/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-[pick("r","c","y","g")]"
+		item_state = icon_state
+		base_state = icon_state
 
 /obj/item/weapon/flame/lighter/attack_self(mob/living/user)
+	if(!base_state)
+		base_state = icon_state
 	if(user.r_hand == src || user.l_hand == src)
 		if(!lit)
 			lit = 1
-			icon_state = icon_on
-			item_state = icon_on
+			icon_state = "[base_state]on"
+			item_state = "[base_state]on"
 			if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
 				user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
 			else
@@ -460,8 +458,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			processing_objects.Add(src)
 		else
 			lit = 0
-			icon_state = icon_off
-			item_state = icon_off
+			icon_state = "[base_state]"
+			item_state = "[base_state]"
 			if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
 				user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")
 			else
diff --git a/code/global.dm b/code/global.dm
index 2e7ddeb0e6..c8b00b8721 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -267,4 +267,4 @@ var/global/obj/item/device/radio/intercom/global_announcer = new(null)
 var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian")
 
 var/global/const/TICKS_IN_DAY = 864000
-var/global/const/TICKS_IN_SECOND = 10
+var/global/const/TICKS_IN_SECOND = 10
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index 5f96b66288..bb6613582e 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -6,7 +6,7 @@
 
 /obj/item/clothing/accessory/badge
 	name = "detective's badge"
-	desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564."
+	desc = "NanoTrasen Security Department detective's badge, made from gold."
 	icon_state = "badge"
 	slot_flags = SLOT_BELT | SLOT_TIE
 
diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm
index 3842047a19..d5fa21c0aa 100644
--- a/code/modules/clothing/under/accessories/lockets.dm
+++ b/code/modules/clothing/under/accessories/lockets.dm
@@ -6,32 +6,28 @@
 	slot_flags = 0
 	w_class = 2
 	slot_flags = SLOT_MASK | SLOT_TIE
-	var/icon_open
-	var/icon_closed
+	var/base_icon
 	var/open
 	var/obj/item/held //Item inside locket.
 
 /obj/item/clothing/accessory/locket/heart
 	name = "heart-shaped locket"
 	desc = " A silver, heart-shaped locket. It flips open to reveal two pictures, one of a young red-headed woman and one of a brunette of similar age. Small writing is etched onto the back, reading 'M+L'. Some may regard it as cheesy."
-	icon_state = "heartlocket_closed"
-	item_state = "heartlocket_closed"
-	icon_open = "heartlocket_open"
-	icon_closed = "heartlocket_closed"
+	icon_state = "heartlocket"
 
 /obj/item/clothing/accessory/locket/attack_self(mob/user as mob)
+	if(!base_icon)
+		base_icon = icon_state
 	open = !open
 	user << "You flip \the [src] [open?"open":"closed"]."
 	if(open)
-		if(icon_open)
-			icon_state = icon_open
+		icon_state = "[base_icon]_open"
 		if(held)
 			user << "\The [held] falls out!"
 			held.loc = get_turf(user)
 			src.held = null
 	else
-		if(icon_closed)
-			icon_state = icon_closed
+		icon_state = "[base_icon]"
 
 /obj/item/clothing/accessory/locket/attackby(var/obj/item/O as obj, mob/user as mob)
 	if(!open)
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index e8a10e349d..456e6a6b01 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
index 4cab7dd237..cc0869939e 100644
Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 8038dc3d78..42c1b28cbf 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 70baf0badb..2b2bdfae95 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 65b9782bf2..c43ee44df5 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index d03314d623..68e702df03 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index ec29f0ce41..999e6b61c6 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 5dbeea2cdd..bc3f111fd3 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 2b986b7de7..24ed256260 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ