diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index a6f92d876fb8..797e11a1d6b1 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "screwdriver_map"
 	item_state = "screwdriver"
+	belt_icon_state = "screwdriver"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 65b07a5f3bac..465d21af09be 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -310,14 +310,10 @@
 	air_contents.set_moles(GAS_O2, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
 	air_contents.set_moles(GAS_N2, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
 
-/obj/machinery/portable_atmospherics/canister/update_icon_state()
-	if(stat & BROKEN)
-		icon_state = "[initial(icon_state)]-1"
-	return ..()
-
 /obj/machinery/portable_atmospherics/canister/update_overlays()
 	. = ..()
 	if(stat & BROKEN)
+		. += mutable_appearance(canister_overlay_file, "broken")
 		return
 	if(valve_open)
 		. += mutable_appearance(canister_overlay_file, "can-open")
@@ -402,6 +398,8 @@
 		usr.put_in_hands(holding)
 		holding = null
 
+	animate(src, 0.5 SECONDS, transform=turn(transform, 90), easing=BOUNCE_EASING)
+
 /obj/machinery/portable_atmospherics/canister/replace_tank(mob/living/user, close_valve)
 	. = ..()
 	if(.)