diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 8aabd803bd3..bc3545cd51d 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -287,6 +287,8 @@
 	var/list/alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_LIVER, BP_KIDNEYS, BP_STOMACH, BP_APPENDIX) //what internal organs can be changed in character setup
 	var/list/possible_external_organs_modifications = list("Normal","Amputated","Prosthesis")
 
+	var/use_alt_hair_layer = FALSE
+
 /datum/species/proc/get_eyes(var/mob/living/carbon/human/H)
 	return
 
diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
index b37f17a5153..926c50fcb74 100644
--- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
@@ -138,6 +138,8 @@
 	var/sprint_temperature_factor = 1.15
 	var/move_charge_factor = 1
 
+	use_alt_hair_layer = TRUE
+
 /datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 	. = ..()
 	check_tag(H, H.client)
diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
index e42633d49f5..f1c73271d3d 100644
--- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
+++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
@@ -72,6 +72,7 @@
 		/mob/living/carbon/human/proc/tie_hair)
 
 	bodyfall_sound = /singleton/sound_category/bodyfall_sound
+	use_alt_hair_layer = FALSE
 
 /datum/species/machine/shell/get_species(var/reference, var/mob/living/carbon/human/H, var/records)
 	if(reference)
@@ -363,11 +364,11 @@
 	brute_mod = 0.9
 	grab_mod = 0.9
 	resist_mod = 8
-	
+
 	cold_level_1 = -1 //RaceDefault 50 Default -1
 	cold_level_2 = -1 //RaceDefault -1 Default -1
 	cold_level_3 = -1  //RaceDefault -1 Default -1
-	
+
 	heat_level_1 = 700  //RaceDefault 600 Default 700
 	heat_level_2 = 1400  //RaceDefault 1200 Default 1400
 	heat_level_3 = 2800  //RaceDefault 2400 Default 2800
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 96df2e5970d..0b14b16f167 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -102,24 +102,25 @@ There are several things that need to be remembered:
 #define SUIT_LAYER        15
 #define ID_LAYER_ALT      16
 #define TAIL_NORTH_LAYER  17
-#define GLASSES_LAYER     18
-#define BELT_LAYER_ALT    19
-#define SUIT_STORE_LAYER  20
-#define BACK_LAYER        21
-#define HAIR_LAYER        22
-#define GLASSES_LAYER_ALT 23
-#define L_EAR_LAYER       24
-#define R_EAR_LAYER       25
-#define FACEMASK_LAYER    26
-#define HEAD_LAYER        27
-#define COLLAR_LAYER      28
-#define HANDCUFF_LAYER    29
-#define LEGCUFF_LAYER     30
-#define L_HAND_LAYER      31
-#define R_HAND_LAYER      32
-#define WRISTS_LAYER      33
-#define FIRE_LAYER_UPPER  34
-#define TOTAL_LAYERS      34
+#define HAIR_LAYER_ALT    18
+#define GLASSES_LAYER     19
+#define BELT_LAYER_ALT    20
+#define SUIT_STORE_LAYER  21
+#define BACK_LAYER        22
+#define HAIR_LAYER        23
+#define GLASSES_LAYER_ALT 24
+#define L_EAR_LAYER       25
+#define R_EAR_LAYER       26
+#define FACEMASK_LAYER    27
+#define HEAD_LAYER        28
+#define COLLAR_LAYER      29
+#define HANDCUFF_LAYER    30
+#define LEGCUFF_LAYER     31
+#define L_HAND_LAYER      32
+#define R_HAND_LAYER      33
+#define WRISTS_LAYER      34
+#define FIRE_LAYER_UPPER  35
+#define TOTAL_LAYERS      35
 ////////////////////////////
 
 #define GET_BODY_TYPE (cached_bodytype || (cached_bodytype = species.get_bodytype()))
@@ -463,6 +464,7 @@ There are several things that need to be remembered:
 
 	//Reset our hair
 	overlays_raw[HAIR_LAYER] = null
+	overlays_raw[HAIR_LAYER_ALT] = null
 
 	var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD)
 	if(!head_organ || head_organ.is_stump() )
@@ -488,7 +490,8 @@ There are several things that need to be remembered:
 		else
 			set_light(0)
 
-	overlays_raw[HAIR_LAYER] = hair_icon
+	var/hair_layer = species.use_alt_hair_layer ? HAIR_LAYER_ALT : HAIR_LAYER
+	overlays_raw[hair_layer] = hair_icon
 
 	if(update_icons)
 		update_icon()
diff --git a/html/changelogs/geeves-ipc_screen_layer.yml b/html/changelogs/geeves-ipc_screen_layer.yml
new file mode 100644
index 00000000000..8402d160517
--- /dev/null
+++ b/html/changelogs/geeves-ipc_screen_layer.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Baseline screens now render under glasses."