diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 120e690c..23d1d686 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -47,17 +47,13 @@
 	name = "prescription health scanner HUD"
 	desc = "A heads-up display, made with a prescription lens, that scans the humans in view and provides accurate data about their health status."
 	icon_state = "healthhud"
-	hud_type = DATA_HUD_MEDICAL_ADVANCED
 	vision_correction = 1
-	glass_colour_type = /datum/client_colour/glass_colour/lightblue
 
 /obj/item/clothing/glasses/hud/health/gar
 	name = "gar health scanner HUD"
 	desc = "When you're scared, that's all the more reason to move forward!"
 	icon_state = "garh"
 	item_state = "garh"
-	hud_type = DATA_HUD_MEDICAL_ADVANCED
-	glass_colour_type = /datum/client_colour/glass_colour/lightblue
 	force = 10
 	throwforce = 10
 	throw_speed = 4
@@ -100,9 +96,7 @@
 	name = "prescription diagnostic HUD"
 	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens."
 	icon_state = "diagnostichud"
-	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
 	vision_correction = 1
-	glass_colour_type = /datum/client_colour/glass_colour/lightorange
 
 /obj/item/clothing/glasses/hud/diagnostic/night
 	name = "night vision diagnostic HUD"
@@ -124,9 +118,7 @@
 	name = "prescription security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records. This one has a prescription lens so you can see the banana peal that slipped you."
 	icon_state = "securityhud"
-	hud_type = DATA_HUD_SECURITY_ADVANCED
 	vision_correction = 1
-	glass_colour_type = /datum/client_colour/glass_colour/red
 
 /obj/item/clothing/glasses/hud/security/chameleon
 	name = "chameleon security HUD"
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 29234a2b..61960572 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -356,9 +356,9 @@
 
 /proc/get_all_jobs()
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
-				"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
-				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
-				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
+				"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", "Engineering Intern",
+				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Medical Resident",
+				"Research Director", "Scientist", "Roboticist", "Research Student", "Head of Security", "Warden", "Detective", "Security Officer", "Rookie")
 
 /proc/get_all_job_icons() //For all existing HUD icons
 	return get_all_jobs() + list("Prisoner")
diff --git a/code/modules/jobs/job_types/science.dm b/code/modules/jobs/job_types/science.dm
index 0eecd5ff..51d14d16 100644
--- a/code/modules/jobs/job_types/science.dm
+++ b/code/modules/jobs/job_types/science.dm
@@ -163,8 +163,8 @@ Junior Scientist
 	override_roundstart_spawn = /obj/effect/landmark/start/scientist
 
 /datum/outfit/job/scientist/junior
-	name = "Scientist"
-	jobtype = /datum/job/scientist
+	name = "Redesrch Student"
+	jobtype = /datum/job/junior_scientist
 
 	belt = /obj/item/pda/toxins
 	ears = /obj/item/radio/headset/headset_sci
diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm
index a394fff7..2f828072 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -462,8 +462,8 @@ Junior Security Officer
 
 
 /datum/outfit/job/security/junior
-	name = "Security Officer"
-	jobtype = /datum/job/officer
+	name = "Rookie"
+	jobtype = /datum/job/junior_officer
 
 	belt = /obj/item/pda/security
 	ears = /obj/item/radio/headset/headset_sec/alt
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 5c619c90..2df16ff0 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ