diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 78386c1f79..0ff3ef3fba 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -333,10 +333,10 @@
 				m_type = 2
 
 		if("wag","wags")
-			if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || ((dna.features["tail_human"] != "None") && !("waggingtail_human" in dna.species.mutant_bodyparts))))
+			if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || ((dna.features["mam_tail"] != "None") && !("mam_waggingtail" in dna.species.mutant_bodyparts)) || ((dna.features["tail_human"] != "None") && !("waggingtail_human" in dna.species.mutant_bodyparts))))
 				message = "<B>[src]</B> wags \his tail."
 				startTailWag()
-			else if(dna && dna.species && (("waggingtail_lizard" in dna.species.mutant_bodyparts) || ("waggingtail_human" in dna.species.mutant_bodyparts)))
+			else if(dna && dna.species && (("waggingtail_lizard" in dna.species.mutant_bodyparts) || ("mam_waggingtail" in dna.species.mutant_bodyparts) || ("waggingtail_human" in dna.species.mutant_bodyparts)))
 				endTailWag()
 			else
 				src << "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>"
@@ -384,6 +384,9 @@
 	if("tail_human" in dna.species.mutant_bodyparts)
 		dna.species.mutant_bodyparts -= "tail_human"
 		dna.species.mutant_bodyparts |= "waggingtail_human"
+	if("mam_tail" in dna.species.mutant_bodyparts)
+		dna.species.mutant_bodyparts -= "mam_tail"
+		dna.species.mutant_bodyparts |= "mam_waggingtail"
 	update_body()
 
 
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 458fca37e1..5739bf379d 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -1480,12 +1480,14 @@
 	icon_state = "belly"
 	gender_specific = 1
 
+/*
 /datum/sprite_accessory/mam_body_markings/handsfeet
 	name = "Hands & Feet"
 	icon_state = "handsfeet"
 	color_src = MUTCOLORS3
 
 /datum/sprite_accessory/mam_body_markings/bellyhandsfeet
-	name = "Belly,Hands,Feet"
+	name = "Belly, Hands, & Feet"
 	icon_state = "bellyhandsfeet"
-	gender_specific = 1
\ No newline at end of file
+	gender_specific = 1
+*/
diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi
index 85ed098961..0a2c9f9e37 100644
Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ