diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index a2310cda923..1450fa94ce5 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -113,6 +113,7 @@
 	a hostile enviroment."
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
+	item_state = "bodybag_cryo_folded"
 	origin_tech = list(TECH_BIO = 4)
 
 /obj/item/bodybag/cryobag/attack_self(mob/user)
diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index a4b0a02c5ab..67a7cdf0437 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -4,6 +4,7 @@
 	desc = "This KHI-branded defib kit is a semi-automated model. Remove pads, slap on chest, wait."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "defib_kit"
+	item_state = "defib_kit"
 	w_class = ITEMSIZE_LARGE
 
 	var/state	 								//0 off, 1 open, 2 working, 3 dead
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 56229e6cf39..9c1b2d153cd 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -266,8 +266,10 @@ REAGENT SCANNER
 /obj/item/device/mass_spectrometer/on_reagent_change()
 	if(reagents.total_volume)
 		icon_state = initial(icon_state) + "_s"
+		item_state = initial(item_state) + "_s"
 	else
 		icon_state = initial(icon_state)
+		item_state = initial(item_state)
 
 /obj/item/device/mass_spectrometer/attack_self(mob/user as mob)
 	if (user.stat)
@@ -298,6 +300,7 @@ REAGENT SCANNER
 /obj/item/device/mass_spectrometer/adv
 	name = "advanced mass spectrometer"
 	icon_state = "adv_spectrometer"
+	item_state = "adv_spectrometer"
 	details = 1
 	origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2)
 
diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm
index 302ac99d97f..d9606d28d24 100644
--- a/code/game/objects/items/weapons/autopsy.dm
+++ b/code/game/objects/items/weapons/autopsy.dm
@@ -7,6 +7,7 @@
 	desc = "Extracts information on wounds."
 	icon = 'icons/obj/autopsy_scanner.dmi'
 	icon_state = ""
+	item_state = "autopsy_scanner"
 	flags = CONDUCT
 	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 57d78e21f17..7fd68c305ac 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -256,7 +256,6 @@
 	name = "inflatable barrier box"
 	desc = "Contains inflatable walls and doors."
 	icon_state = "inf_box"
-	item_state = "syringe_kit"
 	w_class = ITEMSIZE_NORMAL
 	max_storage_space = ITEMSIZE_COST_NORMAL * 7
 	can_hold = list(/obj/item/inflatable)
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 558e8609134..9949550182c 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -18,6 +18,7 @@
 	desc = "Contains blood used for transfusion."
 	icon = 'icons/obj/bloodpack.dmi'
 	icon_state = "empty"
+	item_state = "bloodpack_empty"
 	volume = 200
 
 	var/blood_type = null
@@ -34,10 +35,15 @@
 
 /obj/item/weapon/reagent_containers/blood/update_icon()
 	var/percent = round((reagents.total_volume / volume) * 100)
-	switch(percent)
-		if(0 to 9)			icon_state = "empty"
-		if(10 to 50) 		icon_state = "half"
-		if(51 to INFINITY)	icon_state = "full"
+	if(percent >= 0 && percent <= 9)
+		icon_state = "empty"
+		item_state = "bloodpack_empty"
+	else if(percent >= 10 && percent <= 50)
+		icon_state = "half"
+		item_state = "bloodpack_half"
+	else if(percent >= 51 && percent < INFINITY)
+		icon_state = "full"
+		item_state = "bloodpack_full"
 
 /obj/item/weapon/reagent_containers/blood/APlus
 	blood_type = "A+"
@@ -60,4 +66,5 @@
 /obj/item/weapon/reagent_containers/blood/empty
 	name = "Empty BloodPack"
 	desc = "Seems pretty useless... Maybe if there were a way to fill it?"
-	icon_state = "empty"
\ No newline at end of file
+	icon_state = "empty"
+	item_state = "bloodpack_empty"
\ No newline at end of file
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 38ab16838f3..554ae9f6b1d 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 5cc6bfadd43..c3e04f0f668 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 c4496d41215..fe9b1e66a2f 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 ea73375a201..3d100172b31 100644
Binary files a/icons/mob/items/righthand_storage.dmi and b/icons/mob/items/righthand_storage.dmi differ