diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm
index f2f5bf7a770..f0332a07804 100644
--- a/code/datums/cache/crew.dm
+++ b/code/datums/cache/crew.dm
@@ -26,6 +26,7 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new())
 		bold_jobs = list()
 		bold_jobs += GLOB.command_positions
 		bold_jobs += get_all_centcom_jobs()
+		bold_jobs += get_all_ERT_jobs()
 		bold_jobs += list("Nanotrasen Representative", "Blueshield", "Magistrate")
 
 	for(var/thing in GLOB.human_list)
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 3ae44bff924..87e879566d0 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -492,6 +492,39 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 		if("Syndicate Nuclear Operative")
 			clothes_s = new /icon('icons/mob/clothing/under/syndicate.dmi', "syndicate_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Emergency Response Team Officer")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "security"), ICON_OVERLAY)
+		if("Emergency Response Team Engineer")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "workboots"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Emergency Response Team Medic")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "medical"), ICON_OVERLAY)
+		if("Emergency Response Team Inquisitor")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "claymore"), ICON_OVERLAY)
+		if("Emergency Response Team Janitor")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "galoshes"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "janibelt"), ICON_OVERLAY)
+		if("Emergency Response Team Leader")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "wgloves"), ICON_UNDERLAY)
+		if("Emergency Response Team Member")
+			clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
 		else
 			if(H.mind && (H.mind.assigned_role in get_all_centcom_jobs()))
 				clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index c69fa2f4325..3d710b625f0 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -270,7 +270,7 @@
 					holder.icon_state = "huddemote"
 					return
 				if(SEC_RECORD_STATUS_INCARCERATED)
-					holder.icon_state = "hudprisoner"
+					holder.icon_state = "hudincarcerated"
 					return
 				if(SEC_RECORD_STATUS_PAROLLED)
 					holder.icon_state = "hudparolled"
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 833b12f600d..b57a3554567 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -82,6 +82,16 @@
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE)
 		if("Thunderdome Overseer")
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER)
+		if("Emergency Response Team Officer")
+			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses()
+		if("Emergency Response Team Engineer")
+			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses()
+		if("Emergency Response Team Medic")
+			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses()
+		if("Emergency Response Team Inquisitor")
+			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses()
+		if("Emergency Response Team Janitor")
+			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses()
 		if("Emergency Response Team Member")
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses()
 		if("Emergency Response Team Leader")
@@ -388,7 +398,10 @@
 	return all_jobs
 
 /proc/get_all_centcom_jobs()
-	return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team Member","Emergency Response Team Leader","Intel Officer","Medical Officer","Deathsquad Commando","Research Officer","Special Operations Officer","Nanotrasen Navy Representative","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander")
+	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Deathsquad Commando","Research Officer","Special Operations Officer","Nanotrasen Navy Representative","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander")
+
+/proc/get_all_ERT_jobs()
+	return list("Emergency Response Team Officer","Emergency Response Team Engineer","Emergency Response Team Medic","Emergency Response Team Inquisitor","Emergency Response Team Janitor","Emergency Response Team Leader","Emergency Response Team Member")
 
 /proc/get_all_solgov_jobs()
 	return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader","Solar Federation General")
@@ -457,7 +470,7 @@
 			return ID.registered_name
 
 /proc/get_all_job_icons() //For all existing HUD icons
-	return GLOB.joblist + list("Prisoner")
+	return GLOB.joblist + get_all_ERT_jobs() + list("Prisoner")
 
 /obj/proc/GetJobName() //Used in secHUD icon generation
 	var/assignmentName = "Unknown"
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 2b74290215b..a663b73a6fd 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -23,5 +23,6 @@
 
 	uniform = /obj/item/clothing/under/color/random
 	shoes = /obj/item/clothing/shoes/black
+	id = /obj/item/card/id/assistant
 
 
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index dff7436f23e..acf54102a08 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -108,7 +108,7 @@
 	belt = /obj/item/storage/belt/utility/atmostech
 	shoes = /obj/item/clothing/shoes/workboots
 	l_ear = /obj/item/radio/headset/headset_eng
-	id = /obj/item/card/id/engineering
+	id = /obj/item/card/id/atmostech
 	pda = /obj/item/pda/atmos
 
 	backpack = /obj/item/storage/backpack/industrial/atmos
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 8dc3bf19cc0..d415c8c20cf 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -99,7 +99,7 @@
 	suit = /obj/item/clothing/suit/storage/labcoat/mortician
 	shoes = /obj/item/clothing/shoes/white
 	l_ear = /obj/item/radio/headset/headset_med
-	id = /obj/item/card/id/medical
+	id = /obj/item/card/id/coroner
 	suit_store = /obj/item/flashlight/pen
 	l_hand = /obj/item/clipboard
 	pda = /obj/item/pda/medical
@@ -162,7 +162,7 @@
 	shoes = /obj/item/clothing/shoes/white
 	l_ear = /obj/item/radio/headset/headset_med
 	glasses = /obj/item/clothing/glasses/science
-	id = /obj/item/card/id/medical
+	id = /obj/item/card/id/chemist
 	pda = /obj/item/pda/chemist
 
 	backpack = /obj/item/storage/backpack/chemistry
@@ -193,7 +193,7 @@
 	suit = /obj/item/clothing/suit/storage/labcoat/genetics
 	shoes = /obj/item/clothing/shoes/white
 	l_ear = /obj/item/radio/headset/headset_medsci
-	id = /obj/item/card/id/medical
+	id = /obj/item/card/id/geneticist
 	suit_store = /obj/item/flashlight/pen
 	pda = /obj/item/pda/geneticist
 
@@ -228,7 +228,7 @@
 	shoes = /obj/item/clothing/shoes/white
 	mask = /obj/item/clothing/mask/surgical
 	l_ear = /obj/item/radio/headset/headset_med
-	id = /obj/item/card/id/medical
+	id = /obj/item/card/id/virologist
 	suit_store = /obj/item/flashlight/pen
 	pda = /obj/item/pda/viro
 
@@ -259,7 +259,7 @@
 	suit = /obj/item/clothing/suit/storage/labcoat
 	shoes = /obj/item/clothing/shoes/laceup
 	l_ear = /obj/item/radio/headset/headset_med
-	id = /obj/item/card/id/medical
+	id = /obj/item/card/id/psychiatrist
 	suit_store = /obj/item/flashlight/pen
 	pda = /obj/item/pda/medical
 
@@ -299,7 +299,7 @@
 	head = /obj/item/clothing/head/soft/blue
 	mask = /obj/item/clothing/mask/cigarette
 	l_ear = /obj/item/radio/headset/headset_med
-	id = /obj/item/card/id/medical
+	id = /obj/item/card/id/paramedic
 	l_pocket = /obj/item/flashlight/pen
 	pda = /obj/item/pda/medical
 	backpack_contents = list(
diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
index 20ecf4a817f..d02683b4e3b 100644
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -118,5 +118,5 @@
 	belt = /obj/item/storage/belt/utility/full
 	shoes = /obj/item/clothing/shoes/black
 	l_ear = /obj/item/radio/headset/headset_sci
-	id = /obj/item/card/id/research
+	id = /obj/item/card/id/roboticist
 	pda = /obj/item/pda/roboticist
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index e61ffc9ae31..54b410ae0f5 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -78,7 +78,7 @@
 	head = /obj/item/clothing/head/warden
 	l_ear = /obj/item/radio/headset/headset_sec/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	id = /obj/item/card/id/security
+	id = /obj/item/card/id/warden
 	l_pocket = /obj/item/flash
 	suit_store = /obj/item/gun/energy/disabler
 	pda = /obj/item/pda/warden
@@ -124,7 +124,7 @@
 	head = /obj/item/clothing/head/det_hat
 	l_ear = /obj/item/radio/headset/headset_sec/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	id = /obj/item/card/id/security
+	id = /obj/item/card/id/detective
 	l_pocket = /obj/item/toy/crayon/white
 	r_pocket = /obj/item/lighter/zippo
 	pda = /obj/item/pda/detective
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 6b7f125b6c3..00199d2a514 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -35,7 +35,7 @@
 	head = /obj/item/clothing/head/caphat
 	l_ear = /obj/item/radio/headset/heads/captain/alt
 	glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
-	id = /obj/item/card/id/gold
+	id = /obj/item/card/id/captains_spare/assigned
 	pda = /obj/item/pda/captain
 	backpack_contents = list(
 		/obj/item/storage/box/ids = 1,
@@ -93,7 +93,7 @@
 	head = /obj/item/clothing/head/hopcap
 	glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
 	l_ear = /obj/item/radio/headset/heads/hop
-	id = /obj/item/card/id/silver
+	id = /obj/item/card/id/hop
 	pda = /obj/item/pda/heads/hop
 	backpack_contents = list(
 		/obj/item/storage/box/ids = 1,
@@ -141,7 +141,7 @@
 	shoes = /obj/item/clothing/shoes/centcom
 	glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
 	l_ear = /obj/item/radio/headset/heads/ntrep
-	id = /obj/item/card/id/nanotrasen
+	id = /obj/item/card/id/ntrep
 	l_pocket = /obj/item/lighter/zippo/nt_rep
 	pda = /obj/item/pda/heads/ntrep
 	backpack_contents = list(
@@ -185,7 +185,7 @@
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_ear = /obj/item/radio/headset/heads/blueshield/alt
 	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
-	id = /obj/item/card/id/nanotrasen
+	id = /obj/item/card/id/blueshield
 	pda = /obj/item/pda/heads/blueshield
 	backpack_contents = list(
 		/obj/item/storage/box/deathimp = 1,
@@ -231,7 +231,7 @@
 	head = /obj/item/clothing/head/powdered_wig
 	l_ear = /obj/item/radio/headset/heads/magistrate/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	id = /obj/item/card/id/nanotrasen
+	id = /obj/item/card/id/magistrate
 	l_pocket = /obj/item/flash
 	r_pocket = /obj/item/clothing/accessory/lawyers_badge
 	pda = /obj/item/pda/heads/magistrate
@@ -271,7 +271,7 @@
 	shoes = /obj/item/clothing/shoes/brown
 	l_ear = /obj/item/radio/headset/headset_iaa/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only
-	id = /obj/item/card/id/security
+	id = /obj/item/card/id/internalaffairsagent
 	l_pocket = /obj/item/laser_pointer
 	r_pocket = /obj/item/clothing/accessory/lawyers_badge
 	l_hand = /obj/item/storage/briefcase
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 22969894fa7..437e2253043 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -22,7 +22,7 @@
 	shoes = /obj/item/clothing/shoes/brown
 	l_ear = /obj/item/radio/headset/headset_cargo
 	glasses = /obj/item/clothing/glasses/sunglasses
-	id = /obj/item/card/id/supply
+	id = /obj/item/card/id/quartermaster
 	l_hand = /obj/item/clipboard
 	pda = /obj/item/pda/quartermaster
 
@@ -79,7 +79,7 @@
 	uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
 	l_pocket = /obj/item/reagent_containers/hypospray/autoinjector/survival
 	r_pocket = /obj/item/storage/bag/ore
-	id = /obj/item/card/id/supply
+	id = /obj/item/card/id/shaftminer
 	pda = /obj/item/pda/shaftminer
 	backpack_contents = list(
 		/obj/item/flashlight/seclite=1,\
@@ -149,6 +149,7 @@
 	shoes = /obj/item/clothing/shoes/black
 	l_ear = /obj/item/radio/headset/headset_service
 	glasses = /obj/item/clothing/glasses/sunglasses/reagent
+	id = /obj/item/card/id/bartender
 	pda = /obj/item/pda/bar
 	backpack_contents = list(
 		/obj/item/toy/russian_revolver = 1
@@ -191,6 +192,7 @@
 	shoes = /obj/item/clothing/shoes/black
 	head = /obj/item/clothing/head/chefhat
 	l_ear = /obj/item/radio/headset/headset_service
+	id = /obj/item/card/id/chef
 	pda = /obj/item/pda/chef
 	backpack_contents = list(
 		/obj/item/eftpos=1,\
@@ -231,7 +233,7 @@
 	l_ear = /obj/item/radio/headset/headset_service
 	suit_store = /obj/item/plant_analyzer
 	pda = /obj/item/pda/botanist
-
+	id = /obj/item/card/id/botanist
 	backpack = /obj/item/storage/backpack/botany
 	satchel = /obj/item/storage/backpack/satchel_hyd
 	dufflebag = /obj/item/storage/backpack/duffel/hydro
@@ -403,6 +405,7 @@
 	uniform = /obj/item/clothing/under/rank/civilian/janitor
 	shoes = /obj/item/clothing/shoes/black
 	l_ear = /obj/item/radio/headset/headset_service
+	id = /obj/item/card/id/janitor
 	pda = /obj/item/pda/janitor
 
 
@@ -432,6 +435,7 @@
 	l_pocket = /obj/item/laser_pointer
 	r_pocket = /obj/item/barcodescanner
 	l_hand = /obj/item/storage/bag/books
+	id = /obj/item/card/id/librarian
 	pda = /obj/item/pda/librarian
 	backpack_contents = list(
 		/obj/item/videocam/advanced = 1)
@@ -458,6 +462,7 @@
 	uniform = /obj/item/clothing/under/rank/civilian/barber
 	shoes = /obj/item/clothing/shoes/black
 	l_ear = /obj/item/radio/headset/headset_service
+	id = /obj/item/card/id/barber
 	backpack_contents = list(
 		/obj/item/storage/box/lip_stick = 1,
 		/obj/item/storage/box/barber = 1
@@ -484,3 +489,4 @@
 	jobtype = /datum/job/explorer
 	uniform = /obj/item/clothing/under/color/random
 	shoes = /obj/item/clothing/shoes/black
+	id = /obj/item/card/id/explorer
diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm
index 53372071aae..de9ff9aaf62 100644
--- a/code/game/jobs/job/support_chaplain.dm
+++ b/code/game/jobs/job/support_chaplain.dm
@@ -21,6 +21,7 @@
 	uniform = /obj/item/clothing/under/rank/civilian/chaplain
 	shoes = /obj/item/clothing/shoes/black
 	l_ear = /obj/item/radio/headset/headset_service
+	id = /obj/item/card/id/chaplain
 	pda = /obj/item/pda/chaplain
 	backpack_contents = list(
 		/obj/item/camera/spooky = 1,
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index b2873a390a8..f91d43f7523 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -341,7 +341,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 					data["jobs_service"] = GLOB.service_positions
 					data["jobs_supply"] = GLOB.supply_positions - "Head of Personnel"
 					data["jobs_assistant"] = GLOB.assistant_positions
-					data["jobs_centcom"] = get_all_centcom_jobs()
+					data["jobs_centcom"] = get_all_centcom_jobs() + get_all_ERT_jobs()
 					data["jobFormats"] = SSjobs.format_jobs_for_id_computer(modify)
 					data["current_skin"] = modify.icon_state
 					data["card_skins"] = format_card_skins(get_station_card_skins())
diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm
index 8ed0828e3b2..8f53c135c44 100644
--- a/code/game/machinery/tcomms/nttc.dm
+++ b/code/game/machinery/tcomms/nttc.dm
@@ -47,6 +47,8 @@
 		"Emergency Response Team Medic" = "dsquadradio",
 		"Emergency Response Team Member" = "dsquadradio",
 		"Emergency Response Team Officer" = "dsquadradio",
+		"Emergency Response Team Inquisitor" = "dsquadradio",
+		"Emergency Response Team Janitor" = "dsquadradio",
 		"Intel Officer" = "dsquadradio",
 		"Medical Officer" = "dsquadradio",
 		"Nanotrasen Navy Captain" = "dsquadradio",
@@ -129,7 +131,7 @@
 	/// List of Command jobs
 	var/list/heads = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security", "Magistrate", "AI")
 	/// List of ERT jobs
-	var/list/ert_jobs = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Leader", "Emergency Response Team Member")
+	var/list/ert_jobs = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Inquisitor", "Emergency Response Team Janitor", "Emergency Response Team Leader", "Emergency Response Team Member")
 	/// List of CentComm jobs
 	var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Intel Officer", "Medical Officer", "Nanotrasen Navy Captain", "Nanotrasen Navy Representative", "Research Officer", "Supreme Commander", "Thunderdome Overseer")
 	/// List of SolGov Marine jobs
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index b1d39649dca..31a7bd188b0 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -449,16 +449,39 @@
 							"silver",
 							"centcom",
 							"security",
+							"detective",
+							"warden",
+							"internalaffairsagent",
 							"medical",
-							"HoS",
+							"coroner",
+							"virologist",
+							"chemist",
+							"paramedic",
+							"psychiatrist",
 							"research",
+							"robotcist",
+							"quartermaster",
 							"cargo",
+							"shaftminer",
 							"engineering",
+							"atmostech",
+							"captain",
+							"HoP",
+							"HoS",
 							"CMO",
 							"RD",
 							"CE",
+							"assistant",
 							"clown",
 							"mime",
+							"barber",
+							"botanist",
+							"librarian",
+							"chaplain",
+							"bartender",
+							"chef",
+							"janitor",
+							"explorer",
 							"rainbow",
 							"prisoner",
 							"syndie",
@@ -469,6 +492,7 @@
 							"ERT_engineering",
 							"ERT_medical",
 							"ERT_janitorial",
+							"ERT_paranormal",
 						)
 						var/choice = input(user, "Select the appearance for this card.", "Agent Card Appearance") in appearances
 						if(!Adjacent(user))
@@ -672,9 +696,6 @@
 	access = get_all_centcom_access()
 	..()
 
-/obj/item/card/id/nanotrasen
-	name = "nanotrasen ID card"
-	icon_state = "nanotrasen"
 
 /obj/item/card/id/prisoner
 	name = "prisoner ID card"
@@ -692,30 +713,37 @@
 
 /obj/item/card/id/prisoner/one
 	name = "Prisoner #13-001"
+	icon_state = "prisonerone"
 	registered_name = "Prisoner #13-001"
 
 /obj/item/card/id/prisoner/two
 	name = "Prisoner #13-002"
+	icon_state = "prisonertwo"
 	registered_name = "Prisoner #13-002"
 
 /obj/item/card/id/prisoner/three
 	name = "Prisoner #13-003"
+	icon_state = "prisonerthree"
 	registered_name = "Prisoner #13-003"
 
 /obj/item/card/id/prisoner/four
 	name = "Prisoner #13-004"
+	icon_state = "prisonerfour"
 	registered_name = "Prisoner #13-004"
 
 /obj/item/card/id/prisoner/five
 	name = "Prisoner #13-005"
+	icon_state = "prisonerfive"
 	registered_name = "Prisoner #13-005"
 
 /obj/item/card/id/prisoner/six
 	name = "Prisoner #13-006"
+	icon_state = "prisonersix"
 	registered_name = "Prisoner #13-006"
 
 /obj/item/card/id/prisoner/seven
 	name = "Prisoner #13-007"
+	icon_state = "prisonerseven"
 	registered_name = "Prisoner #13-007"
 
 /obj/item/card/id/prisoner/random
@@ -738,30 +766,124 @@
 	icon_state = "medical"
 	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
 
+/obj/item/card/id/coroner
+	name = "Coroner ID"
+	registered_name = "Coroner"
+	icon_state = "coroner"
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
+
+/obj/item/card/id/virologist
+	name = "Virologist ID"
+	registered_name = "Virologist"
+	icon_state = "virologist"
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
+
+/obj/item/card/id/chemist
+	name = "Chemist ID"
+	registered_name = "Chemist"
+	icon_state = "chemist"
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
+
+/obj/item/card/id/paramedic
+	name = "Paramedic ID"
+	registered_name = "Paramedic"
+	icon_state = "paramedic"
+	access = list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MORGUE)
+
+/obj/item/card/id/psychiatrist
+	name = "Psychiatrist ID"
+	registered_name = "Psychiatrist"
+	icon_state = "psychiatrist"
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST)
+
 /obj/item/card/id/security
 	name = "Security ID"
 	registered_name = "Officer"
 	icon_state = "security"
 	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
 
+/obj/item/card/id/detective
+	name = "Detective ID"
+	registered_name = "Detective"
+	icon_state = "detective"
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS)
+
+/obj/item/card/id/warden
+	name = "Warden ID"
+	registered_name = "Warden"
+	icon_state = "warden"
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
+
+/obj/item/card/id/internalaffairsagent
+	name = "Internal Affairs Agent ID"
+	registered_name = "Internal Affairs Agent"
+	icon_state = "internalaffairsagent"
+	access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING)
+
+/obj/item/card/id/geneticist
+	name = "Geneticist ID"
+	registered_name = "Geneticist"
+	icon_state = "geneticist"
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
+
 /obj/item/card/id/research
 	name = "Research ID"
 	registered_name = "Scientist"
 	icon_state = "research"
 	access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM)
 
+/obj/item/card/id/roboticist
+	name = "Roboticist ID"
+	registered_name = "Roboticist"
+	icon_state = "roboticist"
+	access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
+
 /obj/item/card/id/supply
 	name = "Supply ID"
 	registered_name = "Cargonian"
 	icon_state = "cargo"
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
 
+/obj/item/card/id/quartermaster
+	name = "Quartermaster ID"
+	registered_name = "Quartermaster"
+	icon_state = "quartermaster"
+	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+
+/obj/item/card/id/shaftminer
+	name = "Shaftminer ID"
+	registered_name = "Shaftminer"
+	icon_state = "shaftminer"
+	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+
 /obj/item/card/id/engineering
 	name = "Engineering ID"
 	registered_name = "Engineer"
 	icon_state = "engineering"
 	access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
 
+/obj/item/card/id/atmostech
+	name = "Life Support Specialist ID"
+	registered_name = "Life Support Specialist"
+	icon_state = "atmostech"
+	access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
+
+/obj/item/card/id/captains_spare/assigned
+	name = "Captain ID"
+	registered_name = "Captain"
+	icon_state = "captain"
+
+/obj/item/card/id/hop
+	name = "Head of Personal ID"
+	registered_name = "HoP"
+	icon_state = "HoP"
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
+			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
+			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
+			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
+			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
+			            ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
+
 /obj/item/card/id/hos
 	name = "Head of Security ID"
 	registered_name = "HoS"
@@ -797,6 +919,45 @@
 			            ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
 			            ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
 
+/obj/item/card/id/ntrep
+	name = "Nanotrasen Representative ID"
+	registered_name = "NTRep"
+	icon_state = "ntrep"
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
+			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
+			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
+			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
+			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
+			            ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_NTREP)
+
+/obj/item/card/id/blueshield
+	name = "Blueshield ID"
+	registered_name = "Blueshield"
+	icon_state = "blueshield"
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
+			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
+			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
+			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
+			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
+			            ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BLUESHIELD)
+
+/obj/item/card/id/magistrate
+	name = "Magistrate ID"
+	registered_name = "Magistrate"
+	icon_state = "magistrate"
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
+			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
+			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
+			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
+			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
+			            ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAGISTRATE)
+
+/obj/item/card/id/assistant
+	name = "Assistant ID"
+	registered_name = "Assistant"
+	icon_state = "assistant"
+	access = list(ACCESS_MAINT_TUNNELS)
+
 /obj/item/card/id/clown
 	name = "Pink ID"
 	registered_name = "HONK!"
@@ -811,6 +972,53 @@
 	desc = "..."
 	access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
 
+/obj/item/card/id/barber
+	name = "Barber ID"
+	registered_name = "Barber"
+	icon_state = "barber"
+	access = list(ACCESS_MAINT_TUNNELS)
+
+/obj/item/card/id/botanist
+	name = "Botanist ID"
+	registered_name = "Botanist"
+	icon_state = "botanist"
+	access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE)
+
+/obj/item/card/id/librarian
+	name = "Librarian ID"
+	registered_name = "Librarian"
+	icon_state = "librarian"
+	access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
+
+/obj/item/card/id/chaplain
+	name = "Chaplain ID"
+	registered_name = "Chaplain"
+	icon_state = "chaplain"
+	access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS)
+
+/obj/item/card/id/bartender
+	name = "Bartender ID"
+	registered_name = "Bartender"
+	icon_state = "bartender"
+	access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
+
+/obj/item/card/id/chef
+	name = "Chef ID"
+	registered_name = "Chef"
+	icon_state = "chef"
+	access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE)
+
+/obj/item/card/id/janitor
+	name = "Janitor ID"
+	registered_name = "Janitor"
+	icon_state = "janitor"
+	access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE)
+
+/obj/item/card/id/explorer
+	name = "Explorer ID"
+	registered_name = "Explorer"
+	icon_state = "explorer"
+
 /obj/item/card/id/rainbow
 	name = "Rainbow ID"
 	icon_state = "rainbow"
@@ -850,6 +1058,12 @@
 /obj/item/card/id/ert/medic
 	icon_state = "ERT_medical"
 
+/obj/item/card/id/ert/paranormal
+	icon_state = "ERT_paranormal"
+
+/obj/item/card/id/ert/janitorial
+	icon_state = "ERT_janitorial"
+
 /obj/item/card/id/ert/deathsquad
 	icon_state = "deathsquad"
 
@@ -926,10 +1140,10 @@
 	override_name = 1
 
 /proc/get_station_card_skins()
-	return list("data","id","gold","silver","security","medical","research","cargo","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
+	return list("data","id","gold","silver","security","detective","warden","internalaffairsagent","medical","coroner","chemist","virologist","paramedic","psychiatrist","geneticist","research","roboticist","quartermaster","cargo","shaftminer","engineering","atmostech","captain","HoP","HoS","CMO","RD","CE","assistant","clown","mime","barber","botanist","librarian","chaplain","bartender","chef","janitor","rainbow","prisoner","explorer")
 
 /proc/get_centcom_card_skins()
-	return list("centcom","nanotrasen","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
+	return list("centcom","blueshield","magistrate","ntrep","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","ERT_paranormal","deathsquad","commander","syndie","TDred","TDgreen")
 
 /proc/get_all_card_skins()
 	return get_station_card_skins() + get_centcom_card_skins()
@@ -937,9 +1151,23 @@
 /proc/get_skin_desc(skin)
 	switch(skin)
 		if("id")
-			return "Standard"
+			return "Blank"
 		if("cargo")
-			return "Supply"
+			return "Cargo Technician"
+		if("shaftminer")
+			return "Shaft Miner"
+		if("medical")
+			return "Medical Doctor"
+		if("engineering")
+			return "Station Engineer"
+		if("security")
+			return "Security Officer"
+		if("internalaffairsagent")
+			return "Internal Affairs Agent"
+		if("atmostech")
+			return "Life Support Specialist"
+		if("HoP")
+			return "Head of Personal"
 		if("HoS")
 			return "Head of Security"
 		if("CMO")
@@ -960,6 +1188,8 @@
 			return "ERT Medical"
 		if("ERT_janitorial")
 			return "ERT Janitorial"
+		if("ERT_paranormal")
+			return "ERT Paranormal"
 		if("deathsquad")
 			return "Deathsquad"
 		if("syndie")
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 2855b01e69a..4a3332fa7c6 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -473,7 +473,7 @@
 	gloves = /obj/item/clothing/gloves/fingerless
 	shoes = /obj/item/clothing/shoes/workboots
 	l_ear = /obj/item/radio/headset/headset_cargo/mining
-	id = /obj/item/card/id/supply
+	id = /obj/item/card/id/shaftminer
 	l_pocket = /obj/item/reagent_containers/food/pill/patch/styptic
 	r_pocket = /obj/item/flashlight/seclite
 
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index f4d9a8e61ff..7a2c30d9f37 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -103,6 +103,11 @@
 /obj/item/pda/heads/ert/medical
 	icon_state = "pda-medical"
 
+/obj/item/pda/heads/ert/janitor
+	icon_state = "pda-janitor"
+
+/obj/item/pda/heads/ert/paranormal
+	icon_state = "pda-chaplain"
 
 /obj/item/pda/cargo
 	default_cartridge = /obj/item/cartridge/quartermaster
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index bf6ac46b5e6..88b7a5d1c30 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -122,6 +122,7 @@
 
 /datum/outfit/job/centcom/response_team/security
 	name = "RT Security"
+	rt_assignment = "Emergency Response Team Officer"
 	rt_job = "Emergency Response Team Officer"
 	rt_mob_job = "ERT Security"
 	uniform = /obj/item/clothing/under/rank/security/officer/sensor
@@ -211,6 +212,7 @@
 
 /datum/outfit/job/centcom/response_team/engineer
 	name = "RT Engineer"
+	rt_assignment = "Emergency Response Team Engineer"
 	rt_job = "Emergency Response Team Engineer"
 	rt_mob_job = "ERT Engineering"
 	back = /obj/item/storage/backpack/ert/engineer
@@ -295,6 +297,7 @@
 
 /datum/outfit/job/centcom/response_team/medic
 	name = "RT Medic"
+	rt_assignment = "Emergency Response Team Medic"
 	rt_job = "Emergency Response Team Medic"
 	rt_mob_job = "ERT Medical"
 	uniform = /obj/item/clothing/under/rank/medical/doctor
@@ -407,6 +410,7 @@
 
 /datum/outfit/job/centcom/response_team/paranormal
 	name = "RT Paranormal"
+	rt_assignment = "Emergency Response Team Inquisitor"
 	rt_job = "Emergency Response Team Inquisitor"
 	rt_mob_job = "ERT Paranormal"
 	uniform = /obj/item/clothing/under/rank/civilian/chaplain
@@ -416,8 +420,8 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
 	belt = /obj/item/storage/belt/security/response_team
-	id = /obj/item/card/id/centcom
-	pda = /obj/item/pda/centcom
+	id = /obj/item/card/id/ert/paranormal
+	pda = /obj/item/pda/heads/ert/paranormal
 	backpack_contents = list(
 		/obj/item/storage/box/zipties = 1,
 		/obj/item/flashlight/seclite = 1
@@ -474,6 +478,7 @@
 
 /datum/outfit/job/centcom/response_team/janitorial
 	name = "RT Janitor"
+	rt_assignment = "Emergency Response Team Janitor"
 	rt_job = "Emergency Response Team Janitor"
 	rt_mob_job = "ERT Janitor"
 	uniform = /obj/item/clothing/under/color/purple/sensor
@@ -481,8 +486,8 @@
 	belt = /obj/item/storage/belt/janitor/full
 	shoes = /obj/item/clothing/shoes/galoshes
 	l_ear = /obj/item/radio/headset/ert/alt
-	id = /obj/item/card/id/centcom
-	pda = /obj/item/pda/centcom
+	id = /obj/item/card/id/ert/janitorial
+	pda = /obj/item/pda/heads/ert/janitor
 	l_pocket = /obj/item/melee/classic_baton/telescopic
 	backpack_contents = list(
 		/obj/item/grenade/chem_grenade/antiweed = 2,
diff --git a/icons/goonstation/objects/pda_overlay.dmi b/icons/goonstation/objects/pda_overlay.dmi
index 74be20fc981..2205438f2cb 100644
Binary files a/icons/goonstation/objects/pda_overlay.dmi and b/icons/goonstation/objects/pda_overlay.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 45201f8e835..eb8a73d0d4e 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 41882bb12c0..89dc0fcac8e 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ