diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 4c224a515..6b68f3b8a 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -690,6 +690,8 @@ generate/load female uniform sprites matching all previously decided variables
 				. += "-[BP.digitigrade_type]"
 		if(BP.dmg_overlay_type)
 			. += "-[BP.dmg_overlay_type]"
+		if(BP.cosmetic_icon)
+			. += "-cosm[BP.cosmetic_icon]"
 		if(BP.body_markings)
 			. += "-[BP.body_markings]"
 		else
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index d9572dcdb..3541840a4 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -339,8 +339,6 @@
 			. += "-digitigrade[BP.use_digitigrade]"
 		if(BP.animal_origin)
 			. += "-[BP.animal_origin]"
-		if(BP.cosmetic_icon)
-			. += "-cosm[BP.cosmetic_icon]"
 		if(BP.status == BODYPART_ORGANIC)
 			. += "-organic"
 		else
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 3c63aba30..c25299f0a 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -347,11 +347,6 @@
 		base_bp_icon = S?.icon_limbs || DEFAULT_BODYPART_ICON
 		species_id = S.limbs_id
 
-		if(cosmetic_icon && is_organic_limb())
-			if(cosmetic_icon.icon)
-				base_bp_icon = cosmetic_icon.icon
-				use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE
-
 		species_flags_list = H.dna.species.species_traits
 
 		//body marking memes
@@ -392,6 +387,11 @@
 			else
 				digitigrade_type = null
 
+		if(cosmetic_icon && is_organic_limb())
+			if(cosmetic_icon.icon)
+				base_bp_icon = cosmetic_icon.icon
+				use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE
+
 		if("mam_body_markings" in S.default_features)
 			var/datum/sprite_accessory/Smark
 			Smark = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]