diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index f4c642a29fef0..93d716514f602 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -8,13 +8,9 @@ GLOBAL_LIST_EMPTY(facial_hair_styles_list)	//stores /datum/sprite_accessory/faci
 GLOBAL_LIST_EMPTY(underwear_list)		//stores /datum/sprite_accessory/underwear indexed by name
 GLOBAL_LIST_INIT(underwear_m, list("Briefs"))
 GLOBAL_LIST_INIT(underwear_f, list("Sports bra and briefs", "Bra and brief", "Bra and panties"))
-GLOBAL_LIST_INIT(underwear_n, list("Briefs", "Sports bra and briefs", "Bra and brief", "Bra and panties"))
-
 	//Undershirts
 GLOBAL_LIST_INIT(undershirt_m, list("None","Black undershirt", "White undershirt", "Beige undershirt", "Fitness shirt", "Beige undershirt(sleeveless)"))
 GLOBAL_LIST_INIT(undershirt_f, list("None","Black undershirt", "White undershirt", "Beige undershirt", "Beige undershirt(sleeveless)"))
-GLOBAL_LIST_INIT(undershirt_n, list("None","Black undershirt", "White undershirt", "Beige undershirt", "Fitness shirt", "Beige undershirt(sleeveless)"))
-
 	//Mutant Human bits
 GLOBAL_LIST_EMPTY(moth_wings_list)
 GLOBAL_LIST_EMPTY(tails_list_monkey)
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 6b3b208fb3434..3f7de74995864 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -217,18 +217,12 @@
 	f_style = "Shaved"
 	if(ishumanbasic(src))
 		h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
-	switch(gender)
-		if(MALE)
-			underwear = GLOB.underwear_m.Find("None")
-			undershirt = GLOB.undershirt_m.Find("None")
-		if(FEMALE)
-			underwear = GLOB.underwear_f.Find("None")
-			undershirt = GLOB.undershirt_f.Find("None")
-		else
-			underwear = GLOB.underwear_n.Find("None")
-			undershirt = GLOB.undershirt_n.Find("None")
-
-
+	if(gender == MALE)
+		underwear = GLOB.underwear_m.Find("None")
+		undershirt = GLOB.undershirt_m.Find("None")
+	else
+		underwear = GLOB.underwear_f.Find("None")
+		undershirt = GLOB.undershirt_f.Find("None")
 	regenerate_icons()
 
 
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 7cb8fdf08009b..ff454eb749dd7 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -464,17 +464,12 @@
 	quick_equip = sanitize_islist(quick_equip, QUICK_EQUIP_ORDER, MAX_QUICK_EQUIP_SLOTS, TRUE, VALID_EQUIP_SLOTS)
 	for(var/quick_equip_slots in quick_equip)
 		quick_equip_slots = sanitize_inlist(quick_equip_slots, SLOT_DRAW_ORDER[quick_equip], initial(quick_equip_slots))
-	switch(gender)
-		if(MALE)
-			underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
-			undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
-		if(FEMALE)
-			underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
-			undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
-		else
-			underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_n), initial(underwear))
-			undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_n), initial(undershirt))
-			
+	if(gender == MALE)
+		underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
+		undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
+	else
+		underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
+		undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
 	backpack = sanitize_integer(backpack, 1, length(GLOB.backpacklist), initial(backpack))
 
 	h_style = sanitize_inlist(h_style, GLOB.hair_styles_list, initial(h_style))
@@ -558,17 +553,12 @@
 	quick_equip = sanitize_islist(quick_equip, QUICK_EQUIP_ORDER, MAX_QUICK_EQUIP_SLOTS, TRUE, VALID_EQUIP_SLOTS)
 	for(var/quick_equip_slots in quick_equip)
 		quick_equip_slots = sanitize_inlist(quick_equip_slots, SLOT_DRAW_ORDER[quick_equip], initial(quick_equip_slots))
-	switch(gender)
-		if(MALE)
-			underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
-			undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
-		if(FEMALE)
-			underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
-			undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
-		else
-			underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_n), initial(underwear))
-			undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_n), initial(undershirt))
-	
+	if(gender == MALE)
+		underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
+		undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
+	else
+		underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
+	undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
 	backpack = sanitize_integer(backpack, 1, length(GLOB.backpacklist), initial(backpack))
 
 	h_style = sanitize_inlist(h_style, GLOB.hair_styles_list, initial(h_style))
diff --git a/code/modules/client/preferences_ui.dm b/code/modules/client/preferences_ui.dm
index 2d33e4a88429f..20dfa8001a369 100644
--- a/code/modules/client/preferences_ui.dm
+++ b/code/modules/client/preferences_ui.dm
@@ -156,12 +156,12 @@
 				"underwear" = list(
 					"male" = GLOB.underwear_m,
 					"female" = GLOB.underwear_f,
-					"plural" = GLOB.underwear_n
+					"plural" = GLOB.underwear_f + GLOB.underwear_m,
 				),
 				"undershirt" = list(
 					"male" = GLOB.undershirt_m,
 					"female" = GLOB.undershirt_f,
-					"plural" = GLOB.undershirt_n
+					"plural" = GLOB.undershirt_m + GLOB.undershirt_f,
 				),
 				"backpack" = GLOB.backpacklist,
 				)
@@ -339,13 +339,10 @@
 
 		if("underwear")
 			var/list/underwear_options
-			switch(gender)
-				if(MALE)
-					underwear_options = GLOB.underwear_m
-				if(FEMALE)
-					underwear_options = GLOB.underwear_f
-				else
-					underwear_options = GLOB.underwear_n
+			if(gender == MALE)
+				underwear_options = GLOB.underwear_m
+			else
+				underwear_options = GLOB.underwear_f
 
 			var/new_underwear = underwear_options.Find(params["newValue"])
 			if(!new_underwear)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 044cccb1dc684..a52abcfe70284 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -290,8 +290,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
 
 
 	if(species.species_flags & HAS_UNDERWEAR)
-		stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear_[underwear]"), ICON_OVERLAY)
-		stand_icon.Blend(new /icon('icons/mob/human.dmi', "undershirt_[undershirt]"), ICON_OVERLAY)
+		stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear_[underwear]_[gender]"), ICON_OVERLAY)
+		stand_icon.Blend(new /icon('icons/mob/human.dmi', "undershirt_[undershirt]_[gender]"), ICON_OVERLAY)
 
 	icon = stand_icon
 
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index db0070eb71465..4d099277a4af0 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ