diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index c38af8ae41..73dc0ec4b4 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -18,12 +18,12 @@
 /obj/machinery/computer/atmoscontrol/New()
 	..()
 
-/obj/machinery/computer/atmoscontrol/laptop
-	name = "Atmospherics Laptop"
-	desc = "A cheap laptop."
-	icon_screen = "medlaptop"
-	icon_state = "laptop"
-	icon_keyboard = "laptop_key"
+/obj/machinery/computer/atmoscontrol/laptop //[TO DO] Change name to PCU and update mapdata to include replacement computers
+	name = "\improper Atmospherics PCU"
+	desc = "A personal computer unit. It seems to have only the Atmosphereics Control program installed."
+	icon_screen = "pcu_atmo"
+	icon_state = "pcu"
+	icon_keyboard = "pcu_key"
 	density = 0
 
 /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 680ce44345..419e4d1ffe 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -493,13 +493,14 @@
 	..(severity)
 
 
-/obj/machinery/computer/med_data/laptop
-	name = "Medical Laptop"
-	desc = "A cheap laptop. It seems to have only the medical records program."
-	icon_state = "laptop"
-	icon_keyboard = "laptop_key"
-	icon_screen = "medlaptop"
-	circuit = /obj/item/weapon/circuitboard/med_data/laptop
+/obj/machinery/computer/med_data/laptop //[TO DO] Change name to PCU and update mapdata to include replacement computers
+	name = "\improper Medical Laptop"
+	desc = "A personal computer unit. It seems to have only the medical records program installed."
+	icon_screen = "pcu_generic"
+	icon_state = "pcu"
+	icon_keyboard = "pcu_key"
+	light_color = "#00b000"
+	circuit = /obj/item/weapon/circuitboard/med_data/pcu
 	density = 0
 
 #undef FIELD
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index e11f404b16..e8c69e000b 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -6,15 +6,15 @@
 
 #define FIELD(N, V, E) list(field = N, value = V, edit = E)
 
-/obj/machinery/computer/skills//TODO:SANITY
-	name = "employment records console"
-	desc = "Used to view, edit and maintain employment records."
-	icon_state = "laptop"
-	icon_keyboard = "laptop_key"
-	icon_screen = "medlaptop"
+/obj/machinery/computer/skills//TODO:SANITY //[TO DO] Change name to PCU and update mapdata to include replacement computers
+	name = "\improper Employment Records PCU"
+	desc = "A personal computer unit that's used to view, edit and maintain employment records."
+	icon_screen = "pcu_generic"
+	icon_state = "pcu"
+	icon_keyboard = "pcu_key"
 	light_color = "#00b000"
 	req_one_access = list(access_heads)
-	circuit = /obj/item/weapon/circuitboard/skills
+	circuit = /obj/item/weapon/circuitboard/skills/pcu
 	density = 0
 	var/obj/item/weapon/card/id/scan = null
 	var/authenticated = null
@@ -175,7 +175,7 @@
 				screen = GENERAL_RECORD_LIST
 		else
 			. = FALSE
-	
+
 	if(.)
 		return
 
diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm
index 9948edea42..e3e300f0ce 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm
@@ -21,8 +21,8 @@
 	name = T_BOARD("medical records console")
 	build_path = /obj/machinery/computer/med_data
 
-/obj/item/weapon/circuitboard/med_data/laptop
-	name = T_BOARD("medical records laptop")
+/obj/item/weapon/circuitboard/med_data/pcu
+	name = T_BOARD("medical records PCU")
 	build_path = /obj/machinery/computer/med_data/laptop
 
 /obj/item/weapon/circuitboard/scan_consolenew
@@ -52,8 +52,8 @@
 	name = T_BOARD("security records console")
 	build_path = /obj/machinery/computer/secure_data
 
-/obj/item/weapon/circuitboard/skills
-	name = T_BOARD("employment records console")
+/obj/item/weapon/circuitboard/skills/pcu
+	name = T_BOARD("employment records PCU")
 	build_path = /obj/machinery/computer/skills
 
 /obj/item/weapon/circuitboard/stationalert_engineering
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 67dcb0d5cb..2b8d5247be 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ