diff --git a/code/__HELPERS/_hyper_helpers.dm b/code/__HELPERS/_hyper_helpers.dm
index ecd654e7d..f5d0e8b90 100644
--- a/code/__HELPERS/_hyper_helpers.dm
+++ b/code/__HELPERS/_hyper_helpers.dm
@@ -4,8 +4,6 @@ GLOBAL_LIST_EMPTY(cosmetic_arms)
 GLOBAL_LIST_EMPTY(cosmetic_legs)
 
 /proc/init_cosmetic_parts(datum/cosmetic_part/type, list/global_list)
-	// if(!global_list.Find("default"))
-	// 	global_list += "default"
 	for(var/subtype in subtypesof(type))
 		var/datum/cosmetic_part/part = new subtype()
 		global_list[part.name] = part
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 64538fdba..57d46d42e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -845,28 +845,28 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat +=       "<h3 style='text-align:center;'>Head</h3>"
 			dat +=       "<a style='display:block; width:100px'" 
 			dat +=         "href='?_src_=prefs;preference=cosmetic_head;task=input'>"
-			dat +=         cosmetic_head.name
+			dat +=         cosmetic_head
 			dat +=       "</a>"
 			dat +=     "</div>"
 			dat +=     "<div style='flex: 1 1 0;'>"
 			dat +=       "<h3 style='text-align:center;'>Chest</h3>"
 			dat +=       "<a style='display:block; width:100px'" 
 			dat +=         "href='?_src_=prefs;preference=cosmetic_chest;task=input'>"
-			dat +=         cosmetic_chest.name
+			dat +=         cosmetic_chest
 			dat +=       "</a>"
 			dat +=     "</div>"
 			dat +=     "<div style='flex: 1 1 0;'>"
 			dat +=       "<h3 style='text-align:center;'>Arms</h3>"
 			dat +=       "<a style='display:block; width:100px'" 
 			dat +=         "href='?_src_=prefs;preference=cosmetic_arms;task=input'>"
-			dat +=         cosmetic_arms.name
+			dat +=         cosmetic_arms
 			dat +=       "</a>"
 			dat +=     "</div>"
 			dat +=     "<div style='flex: 1 1 0;'>"
 			dat +=       "<h3 style='text-align:center;'>Legs</h3>"
 			dat +=       "<a style='display:block; width:100px'" 
 			dat +=         "href='?_src_=prefs;preference=cosmetic_legs;task=input'>"
-			dat +=         cosmetic_legs.name
+			dat +=         cosmetic_legs
 			dat +=       "</a>"
 			dat +=     "</div>"
 			dat +=   "</div>"
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 5d9e13998..2aa20f993 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -326,11 +326,6 @@
 		C = owner
 		no_update = FALSE
 
-	if(cosmetic_icon)
-		if(cosmetic_icon.icon)
-			base_bp_icon = cosmetic_icon.icon
-		use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE
-
 	if(HAS_TRAIT(C, TRAIT_HUSK) && is_organic_limb())
 		species_id = "husk" //overrides species_id
 		dmg_overlay_type = "" //no damage overlay shown when husked
@@ -352,6 +347,11 @@
 		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