diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index bdaf5f7d75c..c743a60c801 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -812,8 +812,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	standing.alpha = alpha
 	standing.color = color
 	standing.layer = layer2use
-	if(istype(clip_mask)) //VOREStation Edit - For taur bodies/tails clipping off parts of uniforms and suits.
-		standing.filters += filter(type = "alpha", icon = clip_mask)
 
 	if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits.
 		standing.filters += filter(type = "alpha", icon = clip_mask)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 58ea2ad9d5d..3afc5d64a5f 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -32,7 +32,10 @@
 		for(var/obj/item/i in contents)
 			var/i_state = i.item_state
 			if(!i_state) i_state = i.icon_state
-			standing.add_overlay(image(icon = INV_BELT_DEF_ICON, icon_state = i_state))
+			var/image/add_icon = image(icon = INV_BELT_DEF_ICON, icon_state = i_state)
+			if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits.
+				standing.filters += filter(type = "alpha", icon = clip_mask)
+			standing.add_overlay(add_icon)
 	return standing
 
 /obj/item/weapon/storage/update_icon()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index cb595bd9489..f4bfa564608 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -778,7 +778,7 @@
 	var/image/standing = ..()
 	if(taurized) //Special snowflake var on suits
 		standing.pixel_x = -16
-		standing.layer = BODY_LAYER + 15 // 15 is above tail layer, so will not be covered by taurbody.
+		standing.layer = BODY_LAYER + 16 // 16 is above tail layer, so will not be covered by taurbody.
 	return standing
 
 /obj/item/clothing/suit/apply_accessories(var/image/standing)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 381e7d07718..b75c3b10376 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -807,8 +807,11 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 		if(ubelt.show_above_suit)
 			belt_layer = BELT_LAYER_ALT
 
+
+	var/icon/c_mask = tail_style?.clip_mask
+
 	//NB: this uses a var from above
-	overlays_standing[belt_layer] = belt.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_belt_str, default_icon = INV_BELT_DEF_ICON, default_layer = belt_layer)
+	overlays_standing[belt_layer] = belt.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_belt_str, default_icon = INV_BELT_DEF_ICON, default_layer = belt_layer, clip_mask = c_mask)
 
 	apply_layer(belt_layer)
 
@@ -961,7 +964,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 	if(tail_alt && tail_layer == TAIL_NORTH_LAYER)
 		tail_layer = TAIL_NORTH_LAYER_ALT
 	if(src.tail_style && src.tail_style.clip_mask_state)
-		tail_layer = TAIL_SOUTH_LAYER		// Use default, let clip mask handle everything
+		tail_layer = TAIL_NORTH_LAYER		// Use default, let clip mask handle everything
 
 	var/image/tail_image = get_tail_image()
 	if(tail_image)
@@ -1004,7 +1007,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 	if(tail_alt && tail_layer == TAIL_NORTH_LAYER)
 		tail_layer = TAIL_NORTH_LAYER_ALT
 	if(src.tail_style && src.tail_style.clip_mask_state)
-		tail_layer = TAIL_SOUTH_LAYER		// Use default, let clip mask handle everything
+		tail_layer = TAIL_NORTH_LAYER		// Use default, let clip mask handle everything
 	var/image/tail_overlay = overlays_standing[tail_layer]
 
 	remove_layer(TAIL_NORTH_LAYER)
@@ -1028,6 +1031,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 
 	var/t_state = "[species.get_tail(src)]_once"
 	var/tail_layer = GET_TAIL_LAYER
+	if(src.tail_style && src.tail_style.clip_mask_state)
+		tail_layer = TAIL_NORTH_LAYER		// Use default, let clip mask handle everything
 
 	var/image/tail_overlay = overlays_standing[tail_layer]
 	if(tail_overlay && tail_overlay.icon_state == t_state)