diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 9ab5a52fa..5cf43e8fd 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -149,6 +149,11 @@
 	var/color2 = random_short_color()
 	var/color3 = random_short_color()
 
+	var/cosmetic_head = pick(GLOB.cosmetic_heads)
+	var/cosmetic_chest = pick(GLOB.cosmetic_chests)
+	var/cosmetic_arms = pick(GLOB.cosmetic_arms)
+	var/cosmetic_legs = pick(GLOB.cosmetic_legs)
+
 	//CIT CHANGE - changes this entire return to support cit's snowflake parts
 	return(list(
 		"mcolor" = color1,
@@ -238,12 +243,12 @@
 		"flavor_text"		= "",
 		"silicon_flavor_text"		= "",
 		"ooc_text"			= "",
-		"cosmetic_head" = GLOB.cosmetic_heads["default"],
-		"cosmetic_chest" = GLOB.cosmetic_chests["default"],
-		"cosmetic_l_arm" = GLOB.cosmetic_arms["default"],
-		"cosmetic_r_arm" = GLOB.cosmetic_arms["default"],
-		"cosmetic_l_leg" = GLOB.cosmetic_legs["default"],
-		"cosmetic_r_leg" = GLOB.cosmetic_legs["default"]))
+		"cosmetic_head" = GLOB.cosmetic_heads[cosmetic_head],
+		"cosmetic_chest" = GLOB.cosmetic_chests[cosmetic_chest],
+		"cosmetic_l_arm" = GLOB.cosmetic_arms[cosmetic_arms],
+		"cosmetic_r_arm" = GLOB.cosmetic_arms[cosmetic_arms],
+		"cosmetic_l_leg" = GLOB.cosmetic_legs[cosmetic_legs],
+		"cosmetic_r_leg" = GLOB.cosmetic_legs[cosmetic_legs]))
 
 /proc/random_hair_style(gender)
 	switch(gender)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 082b7610c..ad598159e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -840,7 +840,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "<div style='width:100%;display:block;'>"
 			dat +=   "<h2>Cosmetic Parts</h2>"
-			dat +=   "<div style='display:flex; align-items:stretch; justify-content:space-between;'>"
+			dat +=   "<div style='display:flex; align-items:stretch; justify-content:space-around;'>"
 			dat +=     "<div style='flex: 1 1 0;'>"
 			dat +=       "<h3 style='text-align:center;'>Head</h3>"
 			dat +=       "<a style='display:block; width:100px'" 
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 2aa20f993..3c63aba30 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -350,7 +350,7 @@
 		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
+				use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE
 
 		species_flags_list = H.dna.species.species_traits