diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
index d6c88bccb04..4346a76ca27 100644
--- a/_maps/map_files/Talos/TGS_Talos.dmm
+++ b/_maps/map_files/Talos/TGS_Talos.dmm
@@ -4344,7 +4344,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/liquid_fuel,
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
@@ -8418,7 +8418,7 @@
 /turf/open/floor/carpet,
 /area/mainship/command/corporateliaison)
 "eNx" = (
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /turf/open/floor/mainship/orange{
 	dir = 1
 	},
@@ -15008,7 +15008,7 @@
 /turf/closed/wall/mainship/alt,
 /area/mainship/engineering/port_atmos)
 "jeh" = (
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /turf/open/floor/mainship/red{
 	dir = 1
 	},
@@ -17291,7 +17291,7 @@
 	dir = 8;
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8;
 	pixel_x = null
 	},
@@ -19341,7 +19341,7 @@
 	dir = 1;
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1;
 	pixel_x = null
 	},
@@ -20994,7 +20994,7 @@
 	dir = 8
 	},
 /obj/structure/prop/mainship/hangar_stencil,
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
@@ -21677,7 +21677,7 @@
 	},
 /area/mainship/squads/alpha)
 "mPy" = (
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1
 	},
 /turf/open/floor/mainship/blue,
@@ -23730,7 +23730,7 @@
 	dir = 4
 	},
 /obj/effect/ai_node,
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
@@ -24122,7 +24122,7 @@
 /obj/effect/turf_decal/siding/dark{
 	dir = 4
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 4
 	},
 /turf/open/floor/mainship/metal/full,
@@ -24943,7 +24943,7 @@
 /turf/open/floor/plating,
 /area/mainship/hull/upper_hull)
 "oMw" = (
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1
 	},
 /turf/open/floor/mainship/emerald,
@@ -29465,7 +29465,7 @@
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 8
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 4
 	},
 /turf/open/floor/mainship/metal/full,
@@ -30267,7 +30267,7 @@
 	dir = 2;
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /turf/open/floor/prison/yellow{
 	dir = 1
 	},
@@ -33420,7 +33420,7 @@
 /obj/machinery/door/poddoor/railing{
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 4;
 	pixel_x = null
 	},
@@ -36123,7 +36123,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 8
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1;
 	pixel_y = 4
 	},
@@ -38584,7 +38584,7 @@
 /turf/open/floor/prison/marked,
 /area/mainship/command/self_destruct)
 "xjK" = (
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /obj/structure/sign/semiotic/bathmens{
 	pixel_y = 24;
 	pixel_x = 8
@@ -40135,7 +40135,7 @@
 /obj/effect/turf_decal/siding/dark{
 	dir = 8
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
diff --git a/_maps/shuttles/minidropship_combat_tad.dmm b/_maps/shuttles/minidropship_combat_tad.dmm
index 4fc60b9931b..ac89bf7a67d 100644
--- a/_maps/shuttles/minidropship_combat_tad.dmm
+++ b/_maps/shuttles/minidropship_combat_tad.dmm
@@ -23,8 +23,8 @@
 /obj/structure/barricade/plasteel{
 	dir = 8
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/light/floor{
+	dir = 8
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
@@ -58,12 +58,12 @@
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
 "s" = (
-/obj/machinery/light,
+/obj/machinery/light/floor,
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
 "u" = (
-/obj/machinery/light,
 /obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
+/obj/machinery/light/floor,
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
 "v" = (
@@ -103,8 +103,8 @@
 /obj/structure/barricade/plasteel{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/light/floor{
+	dir = 4
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
diff --git a/_maps/shuttles/minidropship_factorio.dmm b/_maps/shuttles/minidropship_factorio.dmm
index 02e7df7403c..15af7a3e0fe 100644
--- a/_maps/shuttles/minidropship_factorio.dmm
+++ b/_maps/shuttles/minidropship_factorio.dmm
@@ -84,7 +84,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
@@ -169,7 +170,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
diff --git a/_maps/shuttles/minidropship_standard.dmm b/_maps/shuttles/minidropship_standard.dmm
index c1550db2b7b..10fffc08078 100644
--- a/_maps/shuttles/minidropship_standard.dmm
+++ b/_maps/shuttles/minidropship_standard.dmm
@@ -1,10 +1,5 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/obj/machinery/door_control{
-	dir = 1;
-	id = "minidropship_podlock";
-	name = "outer door-control"
-	},
 /obj/structure/dropship_piece/tadpole/tadpole_nose/right{
 	dir = 1;
 	pixel_y = 32
@@ -184,7 +179,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /turf/open/floor/mainship/mono,
@@ -218,7 +214,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /turf/open/floor/mainship/mono,
diff --git a/_maps/shuttles/minidropship_umbilical.dmm b/_maps/shuttles/minidropship_umbilical.dmm
index c7787ac4aa9..ad9ccab8f92 100644
--- a/_maps/shuttles/minidropship_umbilical.dmm
+++ b/_maps/shuttles/minidropship_umbilical.dmm
@@ -63,6 +63,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
+"n" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/transparent/dark_blue/full,
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
 "q" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
@@ -87,9 +94,8 @@
 /turf/open/floor/mainship/floor,
 /area/shuttle/minidropship)
 "u" = (
-/obj/effect/turf_decal/tile/transparent/dark_blue/full,
 /obj/docking_port/mobile/marine_dropship/minidropship,
-/turf/open/floor/mainship/mono,
+/turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
 "v" = (
 /obj/effect/attach_point/crew_weapon/minidropship,
@@ -143,7 +149,8 @@
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
-/turf/open/floor/plating/plating_catwalk,
+/obj/effect/turf_decal/tile/transparent/dark_blue/full,
+/turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
 "J" = (
 /obj/structure/bed/chair/dropship/passenger{
@@ -253,8 +260,8 @@ s
 l
 l
 F
-F
 X
+R
 "}
 (4,1,1) = {"
 t
@@ -264,8 +271,8 @@ J
 u
 q
 D
+n
 F
-R
 "}
 (5,1,1) = {"
 x
@@ -274,9 +281,9 @@ Z
 q
 v
 q
+q
 C
 F
-F
 "}
 (6,1,1) = {"
 E
@@ -286,8 +293,8 @@ S
 e
 I
 j
+I
 F
-N
 "}
 (7,1,1) = {"
 P
@@ -297,6 +304,6 @@ a
 a
 a
 F
-F
 f
+N
 "}
diff --git a/code/game/objects/machinery/door_control.dm b/code/game/objects/machinery/door_control.dm
index eb004dc77b1..fb54e92fad6 100644
--- a/code/game/objects/machinery/door_control.dm
+++ b/code/game/objects/machinery/door_control.dm
@@ -8,17 +8,19 @@
 	icon_state = "doorctrl0"
 	desc = "A remote control-switch for a door."
 	power_channel = ENVIRON
+	anchored = TRUE
+	use_power = IDLE_POWER_USE
+	idle_power_usage = 2
+	active_power_usage = 4
 	var/id = null
 	var/range = 10
 	var/normaldoorcontrol = CONTROL_POD_DOORS
-	var/desiredstate = 0 // Zero is closed, 1 is open.
+	/// Zero is closed, 1 is open.
+	var/desiredstate = 0
 	var/specialfunctions = 1
-	var/directional = TRUE //if true we apply directional offsets, if not the door control is free floating
-	anchored = TRUE
+	/// if true we apply directional offsets, if not the door control is free floating
+	var/directional = TRUE
 	var/pressed = FALSE
-	use_power = IDLE_POWER_USE
-	idle_power_usage = 2
-	active_power_usage = 4
 
 /obj/machinery/door_control/unmeltable
 	resistance_flags = RESIST_ALL
diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index cfe5ff7b18c..e898aece523 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -20,13 +20,13 @@
 		dir = ndir
 	switch(dir)
 		if(NORTH)
-			pixel_y = -32
+			pixel_y = -48
 		if(SOUTH)
-			pixel_y = 32
+			pixel_y = 16
 		if(EAST)
-			pixel_x = -32
+			pixel_x = -48
 		if(WEST)
-			pixel_x = 32
+			pixel_x = 16
 
 /obj/structure/closet/walllocker/emerglocker //wall mounted emergency closet
 	name = "emergency locker"
diff --git a/code/game/objects/structures/dropship_equipment.dm b/code/game/objects/structures/dropship_equipment.dm
index 4a6b9188e13..3c360141d1a 100644
--- a/code/game/objects/structures/dropship_equipment.dm
+++ b/code/game/objects/structures/dropship_equipment.dm
@@ -107,6 +107,7 @@
 	name = "rear attach point"
 	base_category = DROPSHIP_CREW_WEAPON
 	density = FALSE
+	layer = BELOW_OBJ_LAYER
 
 /obj/effect/attach_point/crew_weapon/dropship1
 	ship_tag = SHUTTLE_ALAMO
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index fca580ace3b..82f50676961 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -442,7 +442,7 @@
 	name = "reinforced window"
 	desc = "A glass window with a special rod matrice inside a wall frame. It looks rather strong. Might take a few good hits to shatter it."
 	icon = 'icons/obj/smooth_objects/ship_window.dmi'
-	icon_state = "window-reinforced"
+	icon_state = "ship_window-0"
 	basestate = "ship_window"
 	base_icon_state = "ship_window"
 	max_integrity = 100 //Was 600
@@ -483,11 +483,10 @@
 /obj/structure/window/framed/mainship/hull
 	name = "hull window"
 	desc = "A glass window with a special rod matrice inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here."
-	//icon_state = "rwindow0_debug" //Uncomment to check hull in the map editor
+	icon_state = "ship_window_invincible"
 	damageable = FALSE
 	deconstructable = FALSE
 	resistance_flags = RESIST_ALL
-	icon_state = "window-invincible"
 	max_integrity = 1000000 //Failsafe, shouldn't matter
 
 /obj/structure/window/framed/mainship/hull/canterbury //So we can wallsmooth properly.
@@ -505,7 +504,6 @@
 	desc = "A borosilicate glass window infused with kevlar fibres and mounted within a special shock-absorbing frame, this is gonna be seriously hard to break through."
 	max_integrity = 1000
 	deconstructable = FALSE
-	icon_state = "window-reinforced"
 
 /obj/structure/window/framed/mainship/white
 	icon = 'icons/obj/smooth_objects/wwindow.dmi'
diff --git a/code/game/turfs/plating.dm b/code/game/turfs/plating.dm
index 5bf270b37cc..67e235fa1d4 100644
--- a/code/game/turfs/plating.dm
+++ b/code/game/turfs/plating.dm
@@ -121,6 +121,7 @@
 
 /turf/open/floor/plating/plating_catwalk/dark
 	icon_state = "plating_catwalk_dark"
+	base_icon_state = "catwalk_dark"
 
 /turf/open/floor/plating/plating_catwalk/light
 	icon_state = "plating_catwalk_light"
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 68e68c47e9f..cd8eb633827 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -141,85 +141,14 @@
 	var/switchcount = 0
 	/// true if rigged to explode
 	var/rigged = FALSE
-
-/obj/machinery/light/mainship
-	base_state = "tube"
-
-/obj/machinery/light/mainship/Initialize(mapload)
-	. = ..()
-	GLOB.mainship_lights += src
-
-/obj/machinery/light/mainship/Destroy()
-	. = ..()
-	GLOB.mainship_lights -= src
-
-/obj/machinery/light/mainship/small
-	icon_state = "bulb1"
-	base_state = "bulb"
-	fitting = "bulb"
-	brightness = 4
-	desc = "A small lighting fixture."
-	light_type = /obj/item/light_bulb/bulb
-
-/obj/machinery/light/mainship/floor
-	name = "floor light fixture"
-	desc = "A small lighting fixture."
-	base_state = "floortube"
-	icon_state = "floortube1"
-	layer = 2.5
-	brightness = 6
-	plane = FLOOR_PLANE
-
-/obj/machinery/light/mainship/floor/LateInitialize()
-	. = ..()
-	pixel_x = 0
-	pixel_y = 0 // i hate how this is made and that it ignored map edits entirelly
-
-/obj/machinery/light/red
-	base_state = "tubered"
-	icon_state = "tubered1"
-	light_color = LIGHT_COLOR_FLARE
-	brightness = 3
-	bulb_power = 0.5
-	bulb_colour = LIGHT_COLOR_FLARE
-
-// the smaller bulb light fixture
-
-/obj/machinery/light/small
-	icon_state = "bulb1"
-	base_state = "bulb"
-	fitting = "bulb"
-	brightness = 4
-	desc = "A small lighting fixture."
-	light_type = /obj/item/light_bulb/bulb
-
-/obj/machinery/light/spot
-	name = "spotlight"
-	fitting = "large tube"
-	light_type = /obj/item/light_bulb/tube/large
-	brightness = 12
-
-/obj/machinery/light/built/Initialize(mapload)
-	. = ..()
-	status = LIGHT_EMPTY
-	update(FALSE)
-
-/obj/machinery/light/small/built/Initialize(mapload)
-	. = ..()
-	status = LIGHT_EMPTY
-	update(FALSE)
+	/// Used for mapping to set custom pixel_x
+	var/pixel_x_offset
+	/// Used for mapping to set custom pixel_y
+	var/pixel_y_offset
 
 // create a new lighting fixture
 /obj/machinery/light/Initialize(mapload, ...)
-	switch(dir)
-		if(NORTH)
-			light_pixel_y = 15
-		if(SOUTH)
-			light_pixel_y = -15
-		if(WEST)
-			light_pixel_x = 15
-		if(EAST)
-			light_pixel_x = -15
+	set_light_offset()
 	. = ..()
 
 	GLOB.nightfall_toggleable_lights += src
@@ -233,14 +162,7 @@
 				broken(TRUE)
 
 	update(FALSE)
-
-	switch(dir)
-		if(NORTH)
-			pixel_y = 20
-		if(EAST)
-			pixel_x = 10
-		if(WEST)
-			pixel_x = -10
+	set_pixel_offset()
 
 	return INITIALIZE_HINT_LATELOAD
 
@@ -252,6 +174,31 @@
 	GLOB.nightfall_toggleable_lights -= src
 	return ..()
 
+/obj/machinery/light/proc/set_pixel_offset()
+	switch(dir)
+		if(NORTH)
+			pixel_y = 20
+		if(EAST)
+			pixel_x = 10
+		if(WEST)
+			pixel_x = -10
+
+	if(!isnull(pixel_x_offset))
+		pixel_x = pixel_x_offset
+	if(!isnull(pixel_y_offset))
+		pixel_y = pixel_y_offset
+
+/obj/machinery/light/proc/set_light_offset()
+	switch(dir)
+		if(NORTH)
+			light_pixel_y = 15
+		if(SOUTH)
+			light_pixel_y = -15
+		if(WEST)
+			light_pixel_x = 15
+		if(EAST)
+			light_pixel_x = -15
+
 /obj/machinery/light/proc/is_broken()
 	if(status == LIGHT_BROKEN)
 		return TRUE
@@ -431,7 +378,6 @@
 
 // attack with hand - remove tube/bulb
 // if hands aren't protected and the light is on, burn the player
-
 /obj/machinery/light/attack_hand(mob/living/user)
 	. = ..()
 	if(.)
@@ -488,7 +434,6 @@
 	update()
 
 // break the light and make sparks if was on
-
 /obj/machinery/light/proc/broken(skip_sound_and_sparks = 0)
 	if(status == LIGHT_EMPTY)
 		return
@@ -496,10 +441,6 @@
 	if(!skip_sound_and_sparks)
 		if(status == LIGHT_OK || status == LIGHT_BURNED)
 			playsound(src.loc, 'sound/effects/Glasshit.ogg', 25, 1)
-//		if(on)
-//			var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-//			s.set_up(3, 1, src)
-//			s.start()
 	status = LIGHT_BROKEN
 	update()
 
@@ -512,23 +453,12 @@
 
 // explosion effect
 // destroy the whole light fixture or just shatter it
-
 /obj/machinery/light/ex_act(severity)
 	if(severity >= EXPLODE_HEAVY)
 		qdel(src)
 	else if(prob(severity / 2))
 		broken()
 
-//timed process
-//use power
-#define LIGHTING_POWER_FACTOR 20		//20W per unit luminosity
-
-/*
-/obj/machinery/light/process()//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY
-	if(on)
-		use_power(luminosity * LIGHTING_POWER_FACTOR, LIGHT)
-*/
-
 // called when area power state changes
 /obj/machinery/light/power_change()
 	var/area/A = get_area(src)
@@ -550,6 +480,71 @@
 	explosion(loc, 0, 1, 3, 0, 2)
 	qdel(src)
 
+/obj/machinery/light/mainship
+	base_state = "tube"
+
+/obj/machinery/light/mainship/Initialize(mapload)
+	. = ..()
+	GLOB.mainship_lights += src
+
+/obj/machinery/light/mainship/Destroy()
+	. = ..()
+	GLOB.mainship_lights -= src
+
+/obj/machinery/light/mainship/small
+	icon_state = "bulb1"
+	base_state = "bulb"
+	fitting = "bulb"
+	brightness = 4
+	desc = "A small lighting fixture."
+	light_type = /obj/item/light_bulb/bulb
+
+/obj/machinery/light/floor
+	name = "floor light fixture"
+	desc = "A small lighting fixture."
+	base_state = "floortube"
+	icon_state = "floortube1"
+	brightness = 6
+	layer = BELOW_TABLE_LAYER
+	plane = FLOOR_PLANE
+
+/obj/machinery/light/floor/set_pixel_offset()
+	return
+
+/obj/machinery/light/red
+	base_state = "tubered"
+	icon_state = "tubered1"
+	light_color = LIGHT_COLOR_FLARE
+	brightness = 3
+	bulb_power = 0.5
+	bulb_colour = LIGHT_COLOR_FLARE
+
+// the smaller bulb light fixture
+
+/obj/machinery/light/small
+	icon_state = "bulb1"
+	base_state = "bulb"
+	fitting = "bulb"
+	brightness = 4
+	desc = "A small lighting fixture."
+	light_type = /obj/item/light_bulb/bulb
+
+/obj/machinery/light/spot
+	name = "spotlight"
+	fitting = "large tube"
+	light_type = /obj/item/light_bulb/tube/large
+	brightness = 12
+
+/obj/machinery/light/built/Initialize(mapload)
+	. = ..()
+	status = LIGHT_EMPTY
+	update(FALSE)
+
+/obj/machinery/light/small/built/Initialize(mapload)
+	. = ..()
+	status = LIGHT_EMPTY
+	update(FALSE)
+
 // the light item
 // can be tube or bulb subtypes
 // will fit into empty /obj/machinery/light of the corresponding type
@@ -689,7 +684,7 @@
 	desc = "A landing light, if it's flashing stay clear!"
 	anchored = TRUE
 	density = FALSE
-	layer = BELOW_TABLE_LAYER
+	layer = LOW_OBJ_LAYER
 	use_power = ACTIVE_POWER_USE
 	idle_power_usage = 2
 	active_power_usage = 20
diff --git a/code/modules/shuttle/marine_dropship.dm b/code/modules/shuttle/marine_dropship.dm
index 80fe541bc5b..8a8da0503e8 100644
--- a/code/modules/shuttle/marine_dropship.dm
+++ b/code/modules/shuttle/marine_dropship.dm
@@ -828,6 +828,7 @@
 	resistance_flags = RESIST_ALL
 	opacity = TRUE
 	allow_pass_flags = PASS_PROJECTILE|PASS_AIR
+	layer = BELOW_OBJ_LAYER
 
 /obj/structure/dropship_piece/add_debris_element()
 	AddElement(/datum/element/debris, DEBRIS_SPARKS, -15, 8, 1)
diff --git a/icons/UI_Icons/dropshippicker/_big.png b/icons/UI_Icons/dropshippicker/_big.png
index 31488a78eea..db7b22216d9 100644
Binary files a/icons/UI_Icons/dropshippicker/_big.png and b/icons/UI_Icons/dropshippicker/_big.png differ
diff --git a/icons/UI_Icons/dropshippicker/_combat_tad.png b/icons/UI_Icons/dropshippicker/_combat_tad.png
index 1a2bca76f72..5ae8cb90e21 100644
Binary files a/icons/UI_Icons/dropshippicker/_combat_tad.png and b/icons/UI_Icons/dropshippicker/_combat_tad.png differ
diff --git a/icons/UI_Icons/dropshippicker/_factorio.png b/icons/UI_Icons/dropshippicker/_factorio.png
index cf60a29dd6e..18880aa10e5 100644
Binary files a/icons/UI_Icons/dropshippicker/_factorio.png and b/icons/UI_Icons/dropshippicker/_factorio.png differ
diff --git a/icons/UI_Icons/dropshippicker/_food.png b/icons/UI_Icons/dropshippicker/_food.png
index 3f6a366da75..060204349ea 100644
Binary files a/icons/UI_Icons/dropshippicker/_food.png and b/icons/UI_Icons/dropshippicker/_food.png differ
diff --git a/icons/UI_Icons/dropshippicker/_mobile_bar.png b/icons/UI_Icons/dropshippicker/_mobile_bar.png
index 7a25afed175..db5046e8b06 100644
Binary files a/icons/UI_Icons/dropshippicker/_mobile_bar.png and b/icons/UI_Icons/dropshippicker/_mobile_bar.png differ
diff --git a/icons/UI_Icons/dropshippicker/_standard.png b/icons/UI_Icons/dropshippicker/_standard.png
index e374493b56e..817aea53110 100644
Binary files a/icons/UI_Icons/dropshippicker/_standard.png and b/icons/UI_Icons/dropshippicker/_standard.png differ
diff --git a/icons/UI_Icons/dropshippicker/_umbilical.png b/icons/UI_Icons/dropshippicker/_umbilical.png
index 2987bf4e5dc..5511b49c72f 100644
Binary files a/icons/UI_Icons/dropshippicker/_umbilical.png and b/icons/UI_Icons/dropshippicker/_umbilical.png differ
diff --git a/icons/obj/smooth_objects/ship_window.dmi b/icons/obj/smooth_objects/ship_window.dmi
index 75a1f500b07..d77e41fd119 100644
Binary files a/icons/obj/smooth_objects/ship_window.dmi and b/icons/obj/smooth_objects/ship_window.dmi differ
diff --git a/icons/turf/mainship.dmi b/icons/turf/mainship.dmi
index c3a7dd61b0c..3d7838c820a 100644
Binary files a/icons/turf/mainship.dmi and b/icons/turf/mainship.dmi differ