diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 52ce12d260..ddb441f1c9 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -1,7 +1,6 @@
 /obj/item/grenade/chem_grenade
 	name = "grenade casing"
 	icon_state = "chemg"
-	item_state = "grenade"
 	desc = "A hand made chemical grenade."
 	w_class = ITEMSIZE_SMALL
 	force = 2.0
@@ -193,6 +192,7 @@
 	name = "large chem grenade"
 	desc = "An oversized grenade that affects a larger area."
 	icon_state = "large_grenade"
+	item_state = "largechemg"
 	allowed_containers = list(/obj/item/reagent_containers/glass)
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 	affected_area = 4
@@ -305,4 +305,4 @@
 
 	beakers += B1
 	beakers += B2
-	icon_state = initial(icon_state) +"_locked"
\ No newline at end of file
+	icon_state = initial(icon_state) +"_locked"
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 56169a446d..7051d8b1bf 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -1,6 +1,5 @@
 /obj/item/grenade/empgrenade
 	name = "emp grenade"
-	icon = 'icons/obj/device.dmi'
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'
 	icon_state = "emp"
@@ -21,8 +20,9 @@
 	name = "low yield emp grenade"
 	desc = "A weaker variant of the EMP grenade"
 	icon_state = "lyemp"
+	item_state = "lyemp"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
 	emp_heavy = 1
 	emp_med = 2
 	emp_light = 3
-	emp_long = 4
\ No newline at end of file
+	emp_long = 4
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index c84e21af94..7da7f047ba 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -2,7 +2,7 @@
 	name = "extinguisher cabinet"
 	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
 	icon = 'icons/obj/closet.dmi'
-	icon_state = "extinguisher_closed"
+	icon_state = "fire_cabinet"
 	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
@@ -14,9 +14,9 @@
 	if(building)
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27)
 		pixel_y = (dir & 3)? (dir ==1 ? -27 : 27) : 0
-		update_icon()
 	else
 		has_extinguisher = new/obj/item/extinguisher(src)
+	update_icon()
 
 /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
 	if(isrobot(user))
@@ -74,13 +74,13 @@
 	update_icon()
 
 /obj/structure/extinguisher_cabinet/update_icon()
-	if(!opened)
-		icon_state = "extinguisher_closed"
-		return
+	cut_overlays()
 	if(has_extinguisher)
 		if(istype(has_extinguisher, /obj/item/extinguisher/mini))
-			icon_state = "extinguisher_mini"
+			add_overlay("extinguisher_mini")
 		else
-			icon_state = "extinguisher_full"
+			add_overlay("extinguisher_full")
+	if(opened)
+		add_overlay("fire_cabinet_door_open")
 	else
-		icon_state = "extinguisher_empty"
+		add_overlay("fire_cabinet_door_closed")
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index da2df240da..455a45a4f8 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -1,10 +1,9 @@
-//I still dont think this should be a closet but whatever
 /obj/structure/fireaxecabinet
 	name = "fire axe cabinet"
 	desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
 	var/obj/item/material/twohanded/fireaxe/fireaxe
-	icon = 'icons/obj/closet.dmi'	//Not bothering to move icons out for now. But its dumb still.
-	icon_state = "fireaxe1000"
+	icon = 'icons/obj/axecabinet.dmi'
+	icon_state = "fireaxe"
 	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
@@ -16,6 +15,7 @@
 /obj/structure/fireaxecabinet/Initialize()
 	. = ..()
 	fireaxe = new /obj/item/material/twohanded/fireaxe()
+	update_icon()
 
 /obj/structure/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
 	//..() //That's very useful, Erro
@@ -179,8 +179,19 @@
 			to_chat(user, "<span class='notice'>Cabinet unlocked.</span>")
 		return
 
-/obj/structure/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
-	var/hasaxe = 0
+/obj/structure/fireaxecabinet/update_icon()
+	cut_overlays()
 	if(fireaxe)
-		hasaxe = 1
-	icon_state = text("fireaxe[][][][]",hasaxe,open,hitstaken,smashed)
+		add_overlay("axe")
+	if(smashed)
+		add_overlay("glass_broken")
+	if(locked)
+		add_overlay("locked")
+	else
+		add_overlay("unlocked")
+	if(open)
+		add_overlay("glass_raised")
+	else
+		add_overlay("glass")
+		if(hitstaken)
+			add_overlay("crack[hitstaken]")
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index ac0f051579..bfd5c4d858 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -244,6 +244,7 @@
 /obj/item/crossbowframe
 	name = "crossbow frame"
 	desc = "A half-finished crossbow."
+	icon = 'icons/obj/weapons.dmi'
 	icon_state = "crossbowframe0"
 	item_state = "crossbow-solid"
 
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index c0bc6e5f49..e6f7c420c2 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/lefthand_storage.dmi b/icons/mob/items/lefthand_storage.dmi
index 5181d7ae41..2989166dad 100644
Binary files a/icons/mob/items/lefthand_storage.dmi and b/icons/mob/items/lefthand_storage.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index 9a44e80ad5..38d605e42d 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/mob/items/righthand_storage.dmi b/icons/mob/items/righthand_storage.dmi
index 9a53de7b41..831ba21387 100644
Binary files a/icons/mob/items/righthand_storage.dmi and b/icons/mob/items/righthand_storage.dmi differ
diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi
index 0f9d337dc5..4ac0e197d1 100644
Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ
diff --git a/icons/obj/axecabinet.dmi b/icons/obj/axecabinet.dmi
new file mode 100644
index 0000000000..b208882174
Binary files /dev/null and b/icons/obj/axecabinet.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 14f7fba854..9418e0109b 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index 0303d62153..9bcd47e4c6 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/custom_books.dmi b/icons/obj/custom_books.dmi
index f60a15fc1a..3ceedf4487 100644
Binary files a/icons/obj/custom_books.dmi and b/icons/obj/custom_books.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index e312da52b9..604a67e280 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 9bee702901..2fce7272f6 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 47d1114de3..9c783ea866 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 88fa2ab801..5a2d61eaf0 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index 4949a69a08..cab72c2823 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index cc4a4b52bf..c3ebda9c64 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 750cf75768..b8fdc59688 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index b31790e3dc..c75aa65d5a 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index aefff673f6..eb5648e9ff 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ