diff --git a/code/game/objects/machinery/doors/door.dm b/code/game/objects/machinery/doors/door.dm
index 4d2e1b2170490..7ac76b4296643 100755
--- a/code/game/objects/machinery/doors/door.dm
+++ b/code/game/objects/machinery/doors/door.dm
@@ -200,7 +200,6 @@
 		return FALSE
 	operating = TRUE
 	do_animate("opening")
-	icon_state = "door0"
 	set_opacity(FALSE)
 	for(var/t in fillers)
 		var/obj/effect/opacifier/O = t
@@ -211,7 +210,7 @@
 /obj/machinery/door/proc/finish_open()
 	layer = open_layer
 	density = FALSE
-	update_icon()
+	update_appearance(UPDATE_ICON_STATE)
 
 	if(operating)
 		operating = FALSE
@@ -226,14 +225,13 @@
 	if(operating)
 		return FALSE
 	operating = TRUE
-
 	density = TRUE
 	layer = closed_layer
 	do_animate("closing")
 	addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed)
 
 /obj/machinery/door/proc/finish_close()
-	update_icon()
+	update_appearance(UPDATE_ICON_STATE)
 	if(visible && !glass)
 		set_opacity(TRUE)	//caaaaarn!
 		for(var/t in fillers)
diff --git a/code/game/objects/machinery/doors/shutters.dm b/code/game/objects/machinery/doors/shutters.dm
index ec8b93b907886..c92ca9cd9a4ad 100644
--- a/code/game/objects/machinery/doors/shutters.dm
+++ b/code/game/objects/machinery/doors/shutters.dm
@@ -84,9 +84,10 @@
 
 
 /obj/machinery/door/poddoor/shutters/opened
-	icon_state = "shutter"
+	icon_state = "shutter0"
 	density = FALSE
 	opacity = FALSE
+	layer = PODDOOR_OPEN_LAYER
 
 /obj/machinery/door/poddoor/shutters/opened/medbay
 	name = "Medbay Lockdown Shutters"
@@ -125,8 +126,7 @@
 	density = FALSE
 	opacity = FALSE
 	layer = PODDOOR_OPEN_LAYER
-	icon_state = "shutter"
-
+	icon_state = "shutter0"
 
 /obj/machinery/door/poddoor/shutters/mainship/selfdestruct
 	name = "Self Destruct Lockdown"
@@ -159,9 +159,8 @@
 /obj/machinery/door/poddoor/shutters/transit/open
 	density = FALSE
 	opacity = FALSE
-	resistance_flags = RESIST_ALL|DROPSHIP_IMMUNE
 	layer = PODDOOR_OPEN_LAYER
-	icon_state = "shutter"
+	icon_state = "shutter0"
 
 /obj/machinery/door/poddoor/shutters/barren
 	resistance_flags = UNACIDABLE|DROPSHIP_IMMUNE
@@ -171,7 +170,6 @@
 	density = FALSE
 	opacity = FALSE
 	resistance_flags = RESIST_ALL|DROPSHIP_IMMUNE
-	icon_state = "shutter"
 	open_layer = PODDOOR_CLOSED_LAYER
 	closed_layer = PODDOOR_CLOSED_LAYER
 
@@ -179,7 +177,6 @@
 	name = "pressure shutters"
 	density = FALSE
 	opacity = FALSE
-	icon_state = "shutter"
 	open_layer = PODDOOR_CLOSED_LAYER
 	closed_layer = PODDOOR_CLOSED_LAYER
 
@@ -194,7 +191,6 @@
 
 /obj/machinery/door/poddoor/shutters/mainship/req
 	name = "\improper Requisitions Shutters"
-	icon_state = "shutter"
 
 /obj/machinery/door/poddoor/shutters/mainship/req/ro
 	name = "\improper RO Line"
@@ -210,7 +206,6 @@
 /obj/machinery/door/poddoor/shutters/mainship/containment
 	name = "\improper Containment Cell"
 	id = "containmentcell"
-	icon_state = "shutter"
 
 /obj/machinery/door/poddoor/shutters/mainship/containment/cell1
 	name = "\improper Containment Cell 1"
@@ -223,7 +218,6 @@
 /obj/machinery/door/poddoor/shutters/mainship/brigarmory
 	name = "\improper Brig Armory Shutters"
 	id = "brig_armory"
-	icon_state = "shutter"
 
 /obj/machinery/door/poddoor/shutters/mainship/cic
 	name = "\improper CIC Shutters"
@@ -231,12 +225,10 @@
 /obj/machinery/door/poddoor/shutters/mainship/cic/armory
 	name = "\improper Armory Shutters"
 	id = "cic_armory"
-	icon_state = "shutter"
 
 /obj/machinery/door/poddoor/shutters/mainship/engineering/armory
 	name = "\improper Engineering Armory Shutters"
 	id = "engi_armory"
-	icon_state = "shutter"
 
 /obj/machinery/door/poddoor/shutters/mainship/corporate
 	name = "\improper Privacy Shutters"
@@ -301,9 +293,9 @@
 
 /obj/machinery/door/poddoor/shutters/urban/open_shutters/opened
 	icon_state = "almayer_pdoor0"
-	base_icon_state = "almayer_pdoor"
 	density = FALSE
 	opacity = FALSE
+	layer = PODDOOR_OPEN_LAYER
 
 /obj/machinery/door/poddoor/shutters/urban/shutters
 	icon_state = "shutter"
@@ -314,6 +306,7 @@
 	base_icon_state = "shutter"
 	density = FALSE
 	opacity = FALSE
+	layer = PODDOOR_OPEN_LAYER
 
 /obj/machinery/door/poddoor/shutters/urban/white
 	desc = "That looks like it doesn't open easily."
diff --git a/icons/obj/doors/mainship/blastdoors_shutters.dmi b/icons/obj/doors/mainship/blastdoors_shutters.dmi
index 6b6f3f647e194..ea04503d1efce 100644
Binary files a/icons/obj/doors/mainship/blastdoors_shutters.dmi and b/icons/obj/doors/mainship/blastdoors_shutters.dmi differ
diff --git a/icons/obj/structures/prop/urban/urbanshutters.dmi b/icons/obj/structures/prop/urban/urbanshutters.dmi
index 73ff4231c117f..c7d43e3673924 100644
Binary files a/icons/obj/structures/prop/urban/urbanshutters.dmi and b/icons/obj/structures/prop/urban/urbanshutters.dmi differ