diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
index 2a890e001ce..8d9ce20eeb3 100644
--- a/code/__DEFINES/hud.dm
+++ b/code/__DEFINES/hud.dm
@@ -14,20 +14,18 @@
 #define DIAG_HUD		"9" // Silicon health bar
 #define DIAG_BATT_HUD	"10"// Borg/Mech power meter
 #define DIAG_MECH_HUD	"11"// Mech health bar
-#define STATUS_HUD_OOC	"12"// STATUS_HUD without virus db check for someone being ill.
-#define SPECIALROLE_HUD "13" //for antag huds. these are used at the /mob level
-#define DIAG_BOT_HUD	"14"// Bot HUDS
-#define PLANT_NUTRIENT_HUD	"15"// Plant nutrient level
-#define PLANT_WATER_HUD		"16"// Plant water level
-#define PLANT_STATUS_HUD	"17"// Plant harvest/dead
-#define PLANT_HEALTH_HUD	"18"// Plant health
-#define PLANT_TOXIN_HUD		"19"// Toxin level
-#define PLANT_PEST_HUD		"20"// Pest level
-#define PLANT_WEED_HUD		"21"// Weed level
-#define DIAG_TRACK_HUD		"22"// Mech tracking beacon
-#define DIAG_AIRLOCK_HUD 	"23" // Airlock shock overlay
-//#define DIAG_PATH_HUD 		"24"//Bot path indicators
-#define GLAND_HUD 			"25"//Gland indicators for abductors
+#define SPECIALROLE_HUD "12" //for antag huds. these are used at the /mob level
+#define DIAG_BOT_HUD	"13"// Bot HUDS
+#define PLANT_NUTRIENT_HUD	"14"// Plant nutrient level
+#define PLANT_WATER_HUD		"15"// Plant water level
+#define PLANT_STATUS_HUD	"16"// Plant harvest/dead
+#define PLANT_HEALTH_HUD	"17"// Plant health
+#define PLANT_TOXIN_HUD		"18"// Toxin level
+#define PLANT_PEST_HUD		"19"// Pest level
+#define PLANT_WEED_HUD		"20"// Weed level
+#define DIAG_TRACK_HUD		"21"// Mech tracking beacon
+#define DIAG_AIRLOCK_HUD 	"22" // Airlock shock overlay
+#define GLAND_HUD 			"23"//Gland indicators for abductors
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index b66fd765cbb..56b502ab1c1 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -42,15 +42,42 @@
 
 /atom/proc/prepare_huds()
 	hud_list = list()
+	var/static/list/hud_dmis = list(
+		SPECIALROLE_HUD = 'icons/mob/hud/antaghud.dmi',
+
+		DIAG_TRACK_HUD = 'icons/mob/hud/diaghud.dmi',
+		DIAG_AIRLOCK_HUD = 'icons/mob/hud/diaghud.dmi',
+		DIAG_STAT_HUD = 'icons/mob/hud/diaghud.dmi',
+		DIAG_HUD = 'icons/mob/hud/diaghud.dmi',
+		DIAG_BATT_HUD = 'icons/mob/hud/diaghud.dmi',
+		DIAG_MECH_HUD = 'icons/mob/hud/diaghud.dmi',
+		DIAG_BOT_HUD = 'icons/mob/hud/diaghud.dmi',
+
+		PLANT_NUTRIENT_HUD = 'icons/mob/hud/hydrohud.dmi',
+		PLANT_WATER_HUD = 'icons/mob/hud/hydrohud.dmi',
+		PLANT_STATUS_HUD = 'icons/mob/hud/hydrohud.dmi',
+		PLANT_HEALTH_HUD = 'icons/mob/hud/hydrohud.dmi',
+		PLANT_TOXIN_HUD = 'icons/mob/hud/hydrohud.dmi',
+		PLANT_PEST_HUD = 'icons/mob/hud/hydrohud.dmi',
+		PLANT_WEED_HUD = 'icons/mob/hud/hydrohud.dmi',
+
+		HEALTH_HUD = 'icons/mob/hud/medhud.dmi',
+		STATUS_HUD = 'icons/mob/hud/medhud.dmi',
+
+		ID_HUD = 'icons/mob/hud/sechud.dmi',
+		WANTED_HUD = 'icons/mob/hud/sechud.dmi',
+		IMPMINDSHIELD_HUD = 'icons/mob/hud/sechud.dmi',
+		IMPCHEM_HUD = 'icons/mob/hud/sechud.dmi',
+		IMPTRACK_HUD = 'icons/mob/hud/sechud.dmi',
+	)
+
 	for(var/hud in hud_possible)
-		var/hint = hud_possible[hud]
-		switch(hint)
-			if(HUD_LIST_LIST)
-				hud_list[hud] = list()
-			else
-				var/image/I = image('icons/mob/hud.dmi', src, "")
-				I.appearance_flags = RESET_COLOR | RESET_TRANSFORM
-				hud_list[hud] = I
+		var/use_this_dmi = hud_dmis[hud]
+		if(!use_this_dmi)
+			use_this_dmi = 'icons/mob/hud/hud_misc.dmi'
+		var/image/I = image(use_this_dmi, src, "")
+		I.appearance_flags = RESET_COLOR | RESET_TRANSFORM
+		hud_list[hud] = I
 
 /mob/proc/generate_name()
 	return name
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
deleted file mode 100644
index 8a42cfd9cd8..00000000000
Binary files a/icons/mob/hud.dmi and /dev/null differ
diff --git a/icons/mob/hud/antaghud.dmi b/icons/mob/hud/antaghud.dmi
new file mode 100644
index 00000000000..3b6ba79189e
Binary files /dev/null and b/icons/mob/hud/antaghud.dmi differ
diff --git a/icons/mob/hud/diaghud.dmi b/icons/mob/hud/diaghud.dmi
new file mode 100644
index 00000000000..a450f39c589
Binary files /dev/null and b/icons/mob/hud/diaghud.dmi differ
diff --git a/icons/mob/hud/hud_misc.dmi b/icons/mob/hud/hud_misc.dmi
new file mode 100644
index 00000000000..7e81764ab0a
Binary files /dev/null and b/icons/mob/hud/hud_misc.dmi differ
diff --git a/icons/mob/hud/hydrohud.dmi b/icons/mob/hud/hydrohud.dmi
new file mode 100644
index 00000000000..adc4a3d6819
Binary files /dev/null and b/icons/mob/hud/hydrohud.dmi differ
diff --git a/icons/mob/hud/medhud.dmi b/icons/mob/hud/medhud.dmi
new file mode 100644
index 00000000000..8a46e47f0c2
Binary files /dev/null and b/icons/mob/hud/medhud.dmi differ
diff --git a/icons/mob/hud/sechud.dmi b/icons/mob/hud/sechud.dmi
new file mode 100644
index 00000000000..a8a9c7a9bfa
Binary files /dev/null and b/icons/mob/hud/sechud.dmi differ