diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index b135e5e6625..eb58d39ea7c 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -80,13 +80,13 @@
 
 		if(head_organ.alt_head && head_organ.alt_head != "None")
 			var/datum/sprite_accessory/body_markings/head/H = marking_styles_list[marking_style]
-			if(marking.name != "None" && (!H.heads_allowed || !(head_organ.alt_head in H.heads_allowed)))
+			if(marking.name != "None" && (!H.heads_allowed || (!("All" in H.heads_allowed) && !(head_organ.alt_head in H.heads_allowed))))
 				return
 		else
 			if(!head_organ.alt_head || head_organ.alt_head == "None")
 				head_organ.alt_head = "None"
 				var/datum/sprite_accessory/body_markings/head/H = marking_styles_list[marking_style]
-				if(H.heads_allowed )
+				if(H.heads_allowed && !("All" in H.heads_allowed))
 					return
 
 	if(location == "tail" && marking.name != "None")
@@ -450,7 +450,7 @@
 				if(!(S.models_allowed && (robohead.company in S.models_allowed))) //Make sure they don't get markings incompatible with their head.
 					continue
 			else if(H.alt_head && H.alt_head != "None") //If the user's got an alt head, validate markings for that head.
-				if(!("All" in M.heads_allowed) && !(H.alt_head in M.heads_allowed))
+				if(!M.heads_allowed || (!("All" in M.heads_allowed) && !(H.alt_head in M.heads_allowed)))
 					continue
 			else
 				if(M.heads_allowed && !("All" in M.heads_allowed))
diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm
index 5e8c675bb18..272adcad52c 100644
--- a/code/modules/surgery/organs/organ_icon.dm
+++ b/code/modules/surgery/organs/organ_icon.dm
@@ -159,12 +159,12 @@ var/global/list/limb_icon_cache = list()
 				gender = "f"
 			else
 				gender = "m"
-		new_icon_state = "[icon_name][gender ? "_[gender]" : ""]"
-
 		if(limb_name == "head")
 			var/obj/item/organ/external/head/head_organ = src
 			head_organ.handle_alt_icon()
 
+		new_icon_state = "[icon_name][gender ? "_[gender]" : ""]"
+
 		if(skeletal)
 			icon_file = 'icons/mob/human_races/r_skeleton.dmi'
 		else if(status & ORGAN_ROBOT)