diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm
index afa86dd9647..c19d939f31e 100644
--- a/code/modules/client/preferences/species_features/lizard.dm
+++ b/code/modules/client/preferences/species_features/lizard.dm
@@ -7,7 +7,7 @@
 	lizard.Blend(eyes, ICON_OVERLAY)
 
 	if (include_snout)
-		lizard.Blend(icon('icons/mob/species/mutant_bodyparts.dmi', "m_snout_round_ADJ", EAST), ICON_OVERLAY)
+		lizard.Blend(icon('icons/mob/species/lizard/lizard_misc.dmi', "m_snout_round_ADJ", EAST), ICON_OVERLAY)
 
 	for (var/name in sprite_accessories)
 		var/datum/sprite_accessory/sprite_accessory = sprite_accessories[name]
@@ -46,7 +46,7 @@
 
 		if (sprite_accessory.icon_state != "none")
 			var/icon/body_markings_icon = icon(
-				'icons/mob/species/mutant_bodyparts.dmi',
+				'icons/mob/species/lizard/lizard_misc.dmi',
 				"m_body_markings_[sprite_accessory.icon_state]_ADJ",
 			)
 
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index a7800f8839f..7c2b2051d3f 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1688,7 +1688,7 @@
 /////////////////////////////
 
 /datum/sprite_accessory/body_markings
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/lizard/lizard_misc.dmi'
 
 /datum/sprite_accessory/body_markings/none
 	name = "None"
@@ -1710,9 +1710,11 @@
 	gender_specific = 1
 
 /datum/sprite_accessory/tails
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
 	em_block = TRUE
 
+/datum/sprite_accessory/tails/lizard
+	icon = 'icons/mob/species/lizard/lizard_tails.dmi'
+
 /datum/sprite_accessory/tails/lizard/smooth
 	name = "Smooth"
 	icon_state = "smooth"
@@ -1731,11 +1733,13 @@
 
 /datum/sprite_accessory/tails/human/cat
 	name = "Cat"
+	icon = 'icons/mob/species/human/cat_features.dmi'
 	icon_state = "cat"
 	color_src = HAIR
 
 /datum/sprite_accessory/tails/monkey
 	name = "Monkey"
+	icon = 'icons/mob/species/monkey/monkey_tail.dmi'
 	icon_state = "monkey"
 	color_src = FALSE
 
@@ -1784,7 +1788,7 @@
 	icon_state = "hibiscus"
 
 /datum/sprite_accessory/snouts
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/lizard/lizard_misc.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/snouts/sharp
@@ -1804,7 +1808,7 @@
 	icon_state = "roundlight"
 
 /datum/sprite_accessory/horns
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/lizard/lizard_misc.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/horns/none
@@ -1832,7 +1836,7 @@
 	icon_state = "angler"
 
 /datum/sprite_accessory/ears
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/human/cat_features.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/ears/none
@@ -1850,11 +1854,11 @@
 	icon_state = "none"
 
 /datum/sprite_accessory/wings
-	icon = 'icons/mob/clothing/wings.dmi'
+	icon = 'icons/mob/species/wings.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/wings_open
-	icon = 'icons/mob/clothing/wings.dmi'
+	icon = 'icons/mob/species/wings.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/wings/angel
@@ -1975,7 +1979,7 @@
 	dimension_y = 32
 
 /datum/sprite_accessory/frills
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/lizard/lizard_misc.dmi'
 
 /datum/sprite_accessory/frills/none
 	name = "None"
@@ -1994,11 +1998,11 @@
 	icon_state = "aqua"
 
 /datum/sprite_accessory/spines
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/lizard/lizard_spines.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/spines_animated
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/lizard/lizard_spines.dmi'
 	em_block = TRUE
 
 /datum/sprite_accessory/spines/none
@@ -2060,7 +2064,7 @@
 	name = DIGITIGRADE_LEGS
 
 /datum/sprite_accessory/caps
-	icon = 'icons/mob/species/mutant_bodyparts.dmi'
+	icon = 'icons/mob/species/mush_cap.dmi'
 	color_src = HAIR
 	em_block = TRUE
 
@@ -2165,7 +2169,7 @@
 /datum/sprite_accessory/moth_wings/plasmafire
 	name = "Plasmafire"
 	icon_state = "plasmafire"
-	
+
 /datum/sprite_accessory/moth_wings/moffra
 	name = "Moffra"
 	icon_state = "moffra"
@@ -2252,7 +2256,7 @@
 /datum/sprite_accessory/moth_antennae/plasmafire
 	name = "Plasmafire"
 	icon_state = "plasmafire"
-	
+
 /datum/sprite_accessory/moth_antennae/moffra
 	name = "Moffra"
 	icon_state = "moffra"
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index df929ebfac0..d094e698b77 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1757,7 +1757,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 			var/list/wings = list()
 			for(var/W in wings_icons)
 				var/datum/sprite_accessory/S = GLOB.wings_list[W] //Gets the datum for every wing this species has, then prompts user with a radial menu
-				var/image/img = image(icon = 'icons/mob/clothing/wings.dmi', icon_state = "m_wingsopen_[S.icon_state]_BEHIND") //Process the HUD elements
+				var/image/img = image(icon = 'icons/mob/species/wings.dmi', icon_state = "m_wingsopen_[S.icon_state]_BEHIND") //Process the HUD elements
 				img.transform *= 0.5
 				img.pixel_x = -32
 				if(wings[S.name])
diff --git a/icons/mob/species/human/cat_features.dmi b/icons/mob/species/human/cat_features.dmi
new file mode 100644
index 00000000000..7e25db1c3a0
Binary files /dev/null and b/icons/mob/species/human/cat_features.dmi differ
diff --git a/icons/mob/species/lizard/lizard_misc.dmi b/icons/mob/species/lizard/lizard_misc.dmi
new file mode 100644
index 00000000000..399cb999530
Binary files /dev/null and b/icons/mob/species/lizard/lizard_misc.dmi differ
diff --git a/icons/mob/species/lizard/lizard_spines.dmi b/icons/mob/species/lizard/lizard_spines.dmi
new file mode 100644
index 00000000000..eaadb820ebc
Binary files /dev/null and b/icons/mob/species/lizard/lizard_spines.dmi differ
diff --git a/icons/mob/species/lizard/lizard_tails.dmi b/icons/mob/species/lizard/lizard_tails.dmi
new file mode 100644
index 00000000000..677e7a54903
Binary files /dev/null and b/icons/mob/species/lizard/lizard_tails.dmi differ
diff --git a/icons/mob/species/monkey/monkey_tail.dmi b/icons/mob/species/monkey/monkey_tail.dmi
new file mode 100644
index 00000000000..2a06af25b79
Binary files /dev/null and b/icons/mob/species/monkey/monkey_tail.dmi differ
diff --git a/icons/mob/species/mush_cap.dmi b/icons/mob/species/mush_cap.dmi
new file mode 100644
index 00000000000..f373fb48131
Binary files /dev/null and b/icons/mob/species/mush_cap.dmi differ
diff --git a/icons/mob/species/mutant_bodyparts.dmi b/icons/mob/species/mutant_bodyparts.dmi
deleted file mode 100644
index c41af7c0551..00000000000
Binary files a/icons/mob/species/mutant_bodyparts.dmi and /dev/null differ
diff --git a/icons/mob/clothing/wings.dmi b/icons/mob/species/wings.dmi
similarity index 100%
rename from icons/mob/clothing/wings.dmi
rename to icons/mob/species/wings.dmi