diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm
index 975738871e..4911db1f19 100644
--- a/code/defines/area/Space Station 13 areas.dm	
+++ b/code/defines/area/Space Station 13 areas.dm	
@@ -959,7 +959,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "surgery"
 
 /area/medical/cryo
-	name = "Cryo"
+	name = "Cryogenics"
 	icon_state = "cryo"
 
 /area/medical/exam_room
@@ -989,7 +989,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "security"
 
 /area/security/warden
-	name = "Warden"
+	name = "Armory"
 	icon_state = "Warden"
 
 /area/security/hos
@@ -997,7 +997,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "security"
 
 /area/security/detectives_office
-	name = "Detectives Office"
+	name = "Detective's Office"
 	icon_state = "detective"
 
 /area/security/range
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index 2964da1dcf..aecdce005f 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -77,7 +77,7 @@
 		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/atmospheric_technician(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_l_store)
+		H.equip_if_possible(new /obj/item/device/pda/atmos(H), H.slot_l_store)
 		H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/atmostech/(H), H.slot_belt)
 		if(H.backbag == 1)
 			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand)
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 58f0f2ca34..b84fde0166 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -76,7 +76,7 @@
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
+		H.equip_if_possible(new /obj/item/device/pda/chemist(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/chemist(H), H.slot_wear_suit)
 		return 1
 
@@ -98,7 +98,7 @@
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
+		H.equip_if_possible(new /obj/item/device/pda/geneticist(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/genetics(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
 		if(H.backbag == 1)
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 2b09635398..4785c59f4d 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -134,8 +134,6 @@
 
 /obj/item/device/pda/roboticist
 	icon_state = "pda-robot"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case."
-	note = "Congratulations, your station has chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Turbo Edition!"
 
 /obj/item/device/pda/librarian
 	icon_state = "pda-libb"
@@ -143,6 +141,15 @@
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
 
+/obj/item/device/pda/atmos
+	icon_state = "pda-atmo"
+
+/obj/item/device/pda/chemist
+	icon_state = "pda-chem"
+
+/obj/item/device/pda/geneticist
+	icon_state = "pda-gene"
+
 /*
  *	The Actual PDA
  */
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 4e51c0ff59..8e8127c641 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ