diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 9f5b21962a..0c9735ce4d 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -266,22 +266,22 @@
 					return
 				crit_fail = FALSE
 				times_used = 0
-				playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+				playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
 				update_icon()
 				flash.crit_fail = TRUE
 				flash.update_icon()
 				return
 	..()
 
-/obj/item/device/assembly/flash/shield/update_icon(flash = 0)
-	item_state = "flashshield"
+/obj/item/device/assembly/flash/shield/update_icon(flash = FALSE)
+	icon_state = "flashshield"
 	item_state = "flashshield"
 
 	if(crit_fail)
 		icon_state = "riot"
 		item_state = "riot"
 	else if(flash)
-		item_state = "flashshield_flash"
+		icon_state = "flashshield_flash"
 		item_state = "flashshield_flash"
 		addtimer(CALLBACK(src, .proc/update_icon), 5)
 
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 03cf226b84..b0b01a2446 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ