diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm
index b87829e9280fb..27d613c53fb6c 100644
--- a/code/game/machinery/body_scanner.dm
+++ b/code/game/machinery/body_scanner.dm
@@ -1,11 +1,10 @@
 // Pretty much everything here is stolen from the dna scanner FYI
 /obj/machinery/bodyscanner
 	var/mob/living/carbon/human/occupant
-	var/locked
 	name = "body scanner"
 	desc = "A large full-body scanning machine that provides a complete physical assessment of a patient placed inside. Operated using an adjacent console."
 	icon = 'icons/obj/machines/medical/bodyscanner.dmi'
-	icon_state = "body_scanner_0"
+	icon_state = "body_scanner"
 	density = TRUE
 	anchored = TRUE
 	idle_power_usage = 60
@@ -73,7 +72,7 @@
 		O.dropInto(loc)
 
 /obj/machinery/bodyscanner/proc/go_out()
-	if ((!( occupant ) || locked))
+	if(!occupant)
 		return
 	drop_contents()
 	if (occupant.client)
@@ -89,6 +88,7 @@
 	. = ..()
 	if(istype(new_state))
 		updateUsrDialog()
+		go_out()
 
 /obj/machinery/bodyscanner/proc/move_target_inside(mob/target, mob/user)
 	target.forceMove(src)
@@ -108,11 +108,11 @@
 	if(panel_open)
 		AddOverlays("[icon_state]_panel")
 	if(!occupant)
-		icon_state = "body_scanner_0"
+		icon_state = "body_scanner"
 	else if(inoperable())
-		icon_state = "body_scanner_1"
+		icon_state = "body_scanner_open"
 	else
-		icon_state = "body_scanner_2"
+		icon_state = "body_scanner_working"
 
 /obj/machinery/bodyscanner/user_can_move_target_inside(mob/target, mob/user)
 	if (occupant)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 8f8cf922d2778..de4369576b942 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -11,7 +11,7 @@
 /obj/machinery/computer/cryopod
 	name = "cryogenic oversight console"
 	desc = "An interface between crew and the cryogenic storage oversight systems."
-	icon = 'icons/obj/machines/medical/bodyscanner.dmi'
+	icon = 'icons/obj/machines/medical/cryopod.dmi'
 	icon_state = "cellconsole"
 	density = FALSE
 	interact_offline = 1
@@ -138,14 +138,14 @@
 /obj/machinery/cryopod
 	name = "cryogenic freezer"
 	desc = "A man-sized pod for entering suspended animation."
-	icon = 'icons/obj/machines/medical/bodyscanner.dmi'
-	icon_state = "body_scanner_0"
+	icon = 'icons/obj/machines/medical/cryopod.dmi'
+	icon_state = "cryopod"
 	density = TRUE
 	anchored = TRUE
 	dir = WEST
 
-	var/base_icon_state = "body_scanner_0"
-	var/occupied_icon_state = "body_scanner_1"
+	var/base_icon_state = "cryopod"
+	var/occupied_icon_state = "cryopod_closed"
 	var/on_store_message = "has entered long-term storage."
 	var/on_store_visible_message = "hums and hisses as it moves $occupant$ into storage." // $occupant$ is automatically converted to the occupant's name
 	var/on_store_name = "Cryogenic Oversight"
@@ -199,9 +199,9 @@
 	desc = "A man-sized pod for entering suspended animation. Dubbed 'cryocoffin' by more cynical spacers, it is pretty barebone, counting on stasis system to keep the victim alive rather than packing extended supply of food or air. Can be ordered with symbols of common religious denominations to be used in space funerals too."
 	on_store_name = "Life Pod Oversight"
 	time_till_despawn = 20 MINUTES
-	icon_state = "lifepod_0"
-	base_icon_state = "lifepod_0"
-	occupied_icon_state = "lifepod_1"
+	icon_state = "redpod0"
+	base_icon_state = "redpod0"
+	occupied_icon_state = "redpod1"
 	var/launched = 0
 	var/datum/gas_mixture/airtank
 
@@ -575,7 +575,7 @@
 /obj/structure/broken_cryo
 	name = "broken cryo sleeper"
 	desc = "Whoever was inside isn't going to wake up now. It looks like you could pry it open with a crowbar."
-	icon = 'icons/obj/machines/medical/bodyscanner.dmi'
+	icon = 'icons/obj/machines/medical/cryopod.dmi'
 	icon_state = "broken_cryo"
 	anchored = TRUE
 	density = TRUE
diff --git a/icons/obj/machines/medical/bodyscanner.dmi b/icons/obj/machines/medical/bodyscanner.dmi
index db7d9d375d52e..79eaa1a29025f 100644
Binary files a/icons/obj/machines/medical/bodyscanner.dmi and b/icons/obj/machines/medical/bodyscanner.dmi differ
diff --git a/icons/obj/machines/medical/cryopod.dmi b/icons/obj/machines/medical/cryopod.dmi
new file mode 100644
index 0000000000000..e8a16c3e63ba1
Binary files /dev/null and b/icons/obj/machines/medical/cryopod.dmi differ