diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm
index 93637f39d1a7..52a3954f8898 100644
--- a/code/game/machinery/ARES/ARES_interface_apollo.dm
+++ b/code/game/machinery/ARES/ARES_interface_apollo.dm
@@ -473,3 +473,9 @@
 			to_chat(id_owner, SPAN_HELPFUL("AI visitation access granted."))
 			playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0)
 	return TRUE
+
+/obj/structure/machinery/computer/working_joe/bulky
+	desc = "The IBM series 10 computer retrofitted to work as a console to facilitate Working Joes and their operation, allowing for easy allocation of resources. While somewhat dated it still serves its purpose."
+	icon = 'icons/obj/structures/machinery/ares.dmi'
+	icon_state = "console_bulky"
+	density = TRUE
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index c818df9fbfb9..247fd01fad40 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -315,12 +315,19 @@
 	network = list("NUKE")
 	circuit = null
 
-
 /obj/structure/machinery/computer/cameras/almayer
 	density = FALSE
 	icon_state = "security_cam"
 	network = list(CAMERA_NET_ALMAYER)
 
+/obj/structure/machinery/computer/cameras/almayer/bulky
+	name = "Security Cameras"
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	desc = "The IBM series 10 computer retrofitted to work as a security cameras console for the ship. While somewhat dated it still serves its purpose."
+	icon_state = "cameras_bulky"
+	density = TRUE
+	circuit = null
+
 /obj/structure/machinery/computer/cameras/almayer/containment
 	name = "Containment Cameras"
 	network = list(CAMERA_NET_CONTAINMENT)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 40b23667636f..d54a6f7fb82c 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -507,3 +507,9 @@
 	desc = "Cheap Weyland-Yutani Laptop."
 	icon_state = "medlaptop"
 	density = FALSE
+
+/obj/structure/machinery/computer/med_data/bulky
+	name = "Medical Laptop"
+	desc = "The IBM series 10 computer retrofitted to be used to check the medical records of all crew. While somewhat dated it still serves its purpose."
+	icon_state = "medcomp_bulky"
+	deconstructible = FALSE
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 8974eb36187f..693993c8792d 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -158,6 +158,12 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 	var/reqtime = 0 //Cooldown for requisitions - Quarxink
 	var/last_viewed_group = "categories"
 
+/obj/structure/machinery/computer/ordercomp/bulky
+	desc = "The IBM series 10 computer retrofitted to be used as a console for the Automated Storage Retrieval System. While somewhat dated it still serves its purpose."
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "request_bulky"
+	deconstructible = FALSE
+
 /obj/structure/machinery/computer/supply_drop_console
 	name = "Supply Drop Console"
 	desc = "An old-fashioned computer hooked into the nearby Supply Drop system."
diff --git a/code/modules/cm_marines/altitude_control_console.dm b/code/modules/cm_marines/altitude_control_console.dm
index 7e0a8c395152..90ba4ea0c835 100644
--- a/code/modules/cm_marines/altitude_control_console.dm
+++ b/code/modules/cm_marines/altitude_control_console.dm
@@ -20,9 +20,10 @@ GLOBAL_VAR_INIT(ship_temp, 0)
 GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 
 /obj/structure/machinery/computer/altitude_control_console
-	icon_state = "overwatch"
+	icon_state = "almayer_altitude"
 	name = "Altitude Control Console"
 	desc = "The A.C.C console monitors, regulates, and updates the ships attitude and altitude in relation to the AO. It's not rocket science."
+	density = TRUE
 
 /obj/structure/machinery/computer/altitude_control_console/attack_hand()
 	. = ..()
@@ -54,7 +55,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 				continue
 			current_mob.apply_effect(3, WEAKEN)
 			shake_camera(current_mob, 10, 2)
-		ai_silent_announcement("Attention performing high-G maneuverer", ";", TRUE)
+		ai_silent_announcement("Attention performing high-G maneuver", ";", TRUE)
 	if(!temperature_change)
 		switch(GLOB.ship_alt)
 			if(SHIP_ALT_LOW)
@@ -128,7 +129,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 			continue
 		current_mob.apply_effect(3, WEAKEN)
 		shake_camera(current_mob, 10, 2)
-	ai_silent_announcement("Attention: Performing high-G manoeuvre", ";", TRUE)
+	ai_silent_announcement("Attention: Performing high-G maneuver", ";", TRUE)
 
 #undef COOLING
 #undef OVERHEAT_COOLING
diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm
index 7225556584de..37da0ebe3af0 100644
--- a/code/modules/cm_marines/marines_consoles.dm
+++ b/code/modules/cm_marines/marines_consoles.dm
@@ -747,6 +747,33 @@
 	icon_state = "cmonitor"
 	density = FALSE
 
+/obj/structure/machinery/computer/crew/alt/update_icon()
+	if(stat & BROKEN)
+		icon_state = "cmonitorb"
+	else
+		if(stat & NOPOWER)
+			icon_state = "cmonitor0"
+			stat |= NOPOWER
+		else
+			icon_state = initial(icon_state)
+			stat &= ~NOPOWER
+
+/obj/structure/machinery/computer/crew/bulky
+	desc = "The IBM series 10 computer retrofitted to be used to monitor active health sensors built into the wearer's uniform. While somewhat dated it still serves its purpose."
+	icon_state = "crew_bulky"
+	deconstructible = FALSE
+
+/obj/structure/machinery/computer/crew/bulky/update_icon()
+	if(stat & BROKEN)
+		icon_state = "crew_bulkyb"
+	else
+		if(stat & NOPOWER)
+			icon_state = "crew_bulky0"
+			stat |= NOPOWER
+		else
+			icon_state = initial(icon_state)
+			stat &= ~NOPOWER
+
 /obj/structure/machinery/computer/crew/alt/yautja
 	name = "\improper Yautja health monitor"
 	desc = "Used to monitor active health sensors of all Yautja in the system. You can see that the console highlights the human's ship areas with BLUE and the hunting locations with RED."
diff --git a/code/modules/cm_tech/trees/marine.dm b/code/modules/cm_tech/trees/marine.dm
index 046712f9656b..a525779ac1d1 100644
--- a/code/modules/cm_tech/trees/marine.dm
+++ b/code/modules/cm_tech/trees/marine.dm
@@ -150,7 +150,7 @@ GLOBAL_LIST_EMPTY(tech_controls_marine)
 /obj/structure/machinery/computer/view_objectives
 	name = "Intel Database Computer"
 	desc = "An USCM Intel Computer for consulting the current Intel database."
-	icon_state = "terminal1_old"
+	icon_state = "comm"
 	unslashable = TRUE
 	unacidable = TRUE
 
diff --git a/icons/obj/structures/machinery/ares.dmi b/icons/obj/structures/machinery/ares.dmi
index 77dd304310f6..5bbe4a42441a 100644
Binary files a/icons/obj/structures/machinery/ares.dmi and b/icons/obj/structures/machinery/ares.dmi differ
diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi
index 54c99e3186d9..9a69859ef86c 100644
Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index b4a195ae5969..90f7709a4cb2 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -2510,12 +2510,6 @@
 	},
 /turf/open/floor/almayer/silver/north,
 /area/almayer/command/cic)
-"arG" = (
-/obj/structure/machinery/power/apc/almayer/hardened{
-	dir = 1
-	},
-/turf/open/floor/almayer/silver/north,
-/area/almayer/command/cic)
 "arH" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer/redfull,
@@ -2541,8 +2535,8 @@
 /obj/structure/machinery/status_display{
 	pixel_y = 30
 	},
-/obj/structure/prop/almayer/computers/sensor_computer1,
-/turf/open/floor/almayer/silver/northeast,
+/obj/structure/machinery/computer/working_joe/bulky,
+/turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "arT" = (
 /obj/structure/target{
@@ -2655,9 +2649,11 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/stair_clone/upper)
 "asN" = (
-/obj/structure/machinery/computer/crew,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer/silver/southeast,
+/obj/structure/machinery/computer/crew/bulky,
+/obj/structure/machinery/status_display{
+	pixel_y = -29
+	},
+/turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "asQ" = (
 /obj/structure/surface/rack,
@@ -2854,7 +2850,9 @@
 /turf/open/floor/almayer/plating/northeast,
 /area/almayer/command/cic)
 "atO" = (
-/turf/open/floor/almayer/silver/east,
+/turf/open/floor/almayer/silver/east{
+	dir = 8
+	},
 /area/almayer/command/cic)
 "atP" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -3245,7 +3243,9 @@
 /turf/open/floor/almayer/plate,
 /area/almayer/living/pilotbunks)
 "awt" = (
-/turf/open/floor/almayer/silvercorner/east,
+/turf/open/floor/almayer/silvercorner{
+	dir = 4
+	},
 /area/almayer/command/cic)
 "awu" = (
 /obj/effect/decal/warning_stripes{
@@ -3275,13 +3275,14 @@
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/command/cichallway)
 "awA" = (
-/obj/structure/prop/almayer/computers/sensor_computer3{
-	name = "weapon targetting computer"
-	},
 /obj/structure/sign/safety/terminal{
 	pixel_x = 8;
 	pixel_y = 32
 	},
+/obj/structure/machinery/computer/cameras/almayer/bulky{
+	network = list("ARES");
+	name = "ARES Core Cameras"
+	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "awB" = (
@@ -3318,8 +3319,9 @@
 /area/almayer/command/cic)
 "awH" = (
 /obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/faxmachine/uscm/command,
-/obj/item/device/megaphone,
+/obj/structure/machinery/faxmachine/uscm/command{
+	pixel_y = 2
+	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "awQ" = (
@@ -3640,20 +3642,8 @@
 /turf/open/floor/almayer/redfull,
 /area/almayer/shipboard/starboard_missiles)
 "ayr" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/item/storage/belt/medical/full,
-/obj/item/storage/belt/medical/full,
-/obj/item/storage/belt/medical/full,
-/obj/item/storage/belt/medical/full,
-/obj/structure/machinery/computer/working_joe{
-	dir = 8;
-	pixel_x = 17;
-	pixel_y = 8
-	},
-/obj/structure/machinery/computer/cameras/almayer/ares{
-	dir = 8;
-	pixel_x = 17;
-	pixel_y = -6
+/obj/structure/machinery/power/apc/almayer/hardened{
+	dir = 4
 	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
@@ -5113,7 +5103,11 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/upper/starboard)
 "aGH" = (
-/obj/structure/machinery/computer/ordercomp,
+/obj/structure/machinery/computer/ordercomp/bulky,
+/obj/structure/sign/safety/terminal{
+	pixel_x = 8;
+	pixel_y = -32
+	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "aGN" = (
@@ -5619,7 +5613,7 @@
 /obj/structure/disposalpipe/junction{
 	dir = 4
 	},
-/turf/open/floor/almayer/silver/north,
+/turf/open/floor/almayer,
 /area/almayer/command/cichallway)
 "aKk" = (
 /obj/structure/disposalpipe/segment,
@@ -15621,7 +15615,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
-/turf/open/floor/almayer/silver/east,
+/turf/open/floor/almayer/silvercorner{
+	dir = 1
+	},
 /area/almayer/command/cic)
 "cwo" = (
 /obj/structure/largecrate/random/mini/chest{
@@ -21566,9 +21562,9 @@
 /area/almayer/living/briefing)
 "eVj" = (
 /obj/structure/bed/chair/office/dark{
-	dir = 4
+	dir = 1
 	},
-/turf/open/floor/almayer/plate,
+/turf/open/floor/almayer,
 /area/almayer/command/cic)
 "eVm" = (
 /obj/structure/sign/safety/bulkhead_door{
@@ -27535,6 +27531,7 @@
 	pixel_y = 4
 	},
 /obj/structure/surface/table/reinforced/black,
+/obj/item/device/megaphone,
 /turf/open/floor/almayer,
 /area/almayer/command/cic)
 "hxG" = (
@@ -29820,6 +29817,11 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/req)
+"ixS" = (
+/turf/open/floor/almayer/silver/east{
+	dir = 10
+	},
+/area/almayer/command/cic)
 "ixT" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -33161,6 +33163,10 @@
 	},
 /turf/open/floor/almayer/plate,
 /area/almayer/maint/hull/lower/l_m_p)
+"jQk" = (
+/obj/structure/machinery/computer/tech_control,
+/turf/open/floor/almayer/plate,
+/area/almayer/command/cic)
 "jQt" = (
 /turf/open/floor/almayer/research/containment/floor2/west,
 /area/almayer/medical/containment/cell)
@@ -36900,6 +36906,10 @@
 /obj/item/storage/firstaid/adv,
 /obj/item/storage/firstaid/adv,
 /obj/item/storage/firstaid/adv,
+/obj/item/storage/belt/medical/full,
+/obj/item/storage/belt/medical/full,
+/obj/item/storage/belt/medical/full,
+/obj/item/storage/belt/medical/full,
 /turf/open/floor/almayer/redfull,
 /area/almayer/command/cic)
 "lrX" = (
@@ -37986,10 +37996,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/lower/vehiclehangar)
-"lQG" = (
-/obj/structure/machinery/computer/tech_control,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/cic)
 "lQO" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -38293,7 +38299,6 @@
 /obj/item/device/radio/intercom{
 	freerange = 1;
 	name = "General Listening Channel";
-	pixel_x = -6;
 	pixel_y = 28
 	},
 /obj/structure/machinery/computer/cameras/almayer/vehicle{
@@ -38302,10 +38307,6 @@
 	},
 /obj/item/device/flashlight/lamp,
 /obj/item/clothing/glasses/hud/health,
-/obj/structure/machinery/firealarm{
-	pixel_x = 8;
-	pixel_y = 28
-	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "lZI" = (
@@ -49578,6 +49579,11 @@
 /obj/structure/machinery/door/airlock/almayer/maint,
 /turf/open/floor/almayer/test_floor4,
 /area/almayer/maint/hull/upper/u_a_p)
+"qDM" = (
+/turf/open/floor/almayer/silver/east{
+	dir = 9
+	},
+/area/almayer/command/cic)
 "qDP" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -54425,6 +54431,11 @@
 /obj/structure/pipes/standard/manifold/fourway/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/lower/port_fore_hallway)
+"sAO" = (
+/turf/open/floor/almayer/silvercorner{
+	dir = 8
+	},
+/area/almayer/command/cic)
 "sAS" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/plating_catwalk,
@@ -55662,6 +55673,14 @@
 	},
 /turf/open/floor/almayer/red/north,
 /area/almayer/shipboard/brig/lobby)
+"tdA" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer/silver/east{
+	dir = 9
+	},
+/area/almayer/command/cic)
 "tdE" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -55728,7 +55747,7 @@
 /obj/structure/machinery/light{
 	dir = 1
 	},
-/obj/structure/prop/almayer/computers/sensor_computer2,
+/obj/structure/machinery/computer/altitude_control_console,
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "teZ" = (
@@ -62727,6 +62746,10 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
 	},
+/obj/structure/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "vSn" = (
@@ -67542,11 +67565,8 @@
 /turf/open/floor/almayer/red/west,
 /area/almayer/hallways/upper/starboard)
 "xMA" = (
-/obj/structure/machinery/computer/med_data,
-/obj/structure/sign/safety/terminal{
-	pixel_x = 8;
-	pixel_y = -32
-	},
+/obj/structure/machinery/computer/med_data/bulky,
+/obj/structure/machinery/light,
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "xMB" = (
@@ -87880,11 +87900,11 @@ kcN
 cod
 ufL
 aic
-aov
-wVW
-arG
+aKq
+luZ
+alX
 alX
-lQG
+avY
 oPE
 alZ
 auT
@@ -87894,10 +87914,10 @@ bZJ
 aRt
 axp
 aPI
-lQG
+avY
 aIf
-aEB
-wVW
+alX
+eRu
 aKi
 amY
 aVg
@@ -88084,7 +88104,7 @@ yff
 ufL
 aic
 aKq
-luZ
+uTU
 alX
 alX
 avY
@@ -88100,7 +88120,7 @@ alX
 avY
 aIf
 alX
-eRu
+uTU
 aKq
 aKz
 mKq
@@ -88286,10 +88306,10 @@ kcN
 kcN
 agj
 aic
-aKq
-uTU
-alX
-alX
+aov
+wVW
+jQk
+ixS
 aqN
 avY
 alX
@@ -88301,10 +88321,10 @@ alX
 alX
 avY
 aqN
-aIf
-alX
-uTU
-aKq
+tdA
+jQk
+wVW
+aTj
 aKz
 mKq
 ceK
@@ -88489,12 +88509,12 @@ xxh
 xpi
 agj
 bFA
-aov
+sxW
 wVW
 arR
+sAO
 atO
-atO
-atO
+ixS
 awt
 aqN
 rKd
@@ -88502,12 +88522,12 @@ aAA
 xMB
 aqN
 ays
-atO
+qDM
 atO
 cvZ
 asN
 wVW
-aTj
+aKn
 aKz
 mKq
 bFC
@@ -88696,7 +88716,7 @@ aoA
 wVW
 teY
 eVj
-aqN
+alX
 alX
 asc
 abk