diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index bb706824b92a..e08a71f81e12 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -4,7 +4,3 @@
 
 /mob/living/carbon/proc/remove_overlay(cache_index)
 	return
-
-/mob/living/carbon/update_transform()
-	. = ..()
-	update_icons()
diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
index 39628fe453a8..80981490e704 100644
--- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm
+++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
@@ -93,6 +93,11 @@
 	update_inv_resource()
 	update_icons()
 
+/mob/living/carbon/xenomorph/set_body_position(new_value)
+	. = ..()
+	if(. != new_value)
+		update_icons() // Snowflake handler for xeno resting icons
+
 /mob/living/carbon/xenomorph/update_inv_pockets()
 	var/datum/custom_hud/alien/ui_datum = GLOB.custom_huds_list[HUD_ALIEN]
 	if(l_store)
diff --git a/code/modules/mob/living/living_health_procs.dm b/code/modules/mob/living/living_health_procs.dm
index a4bc9f526383..b5fd52d8ce11 100644
--- a/code/modules/mob/living/living_health_procs.dm
+++ b/code/modules/mob/living/living_health_procs.dm
@@ -175,14 +175,14 @@
 	VAR_PRIVATE/knocked_down_timer
 
 /mob/living/proc/knocked_down_callback()
-	REMOVE_TRAIT(src, TRAIT_FLOORED, KNOCKEDDOWN_TRAIT)
+	remove_traits(list(TRAIT_FLOORED, TRAIT_INCAPACITATED), KNOCKEDDOWN_TRAIT)
 	knocked_down = 0
 	handle_regular_status_updates(FALSE)
 	knocked_down_timer = null
 
 /mob/living/proc/knocked_down_callback_check()
 	if(knocked_down)
-		ADD_TRAIT(src, TRAIT_FLOORED, KNOCKEDDOWN_TRAIT)
+		add_traits(list(TRAIT_FLOORED, TRAIT_INCAPACITATED), KNOCKEDDOWN_TRAIT)
 
 	if(knocked_down && knocked_down < recovery_constant)
 		knocked_down_timer = addtimer(CALLBACK(src, PROC_REF(knocked_down_callback)), (knocked_down/recovery_constant) * 2 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE|TIMER_STOPPABLE) // times whatever amount we have per tick
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 2c4a510f4c68..b4a6e59e52e2 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -78,7 +78,7 @@
 		death()
 
 	if (stat != DEAD) //Alive.
-		if (HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || HAS_TRAIT(src, TRAIT_INCAPACITATED)|| HAS_TRAIT(src, TRAIT_FLOORED) || !has_power) //Stunned etc.
+		if (HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || HAS_TRAIT(src, TRAIT_INCAPACITATED) || !has_power) //Stunned etc.
 			set_stat(UNCONSCIOUS)
 			if(regular_update)
 				if (HAS_TRAIT(src, TRAIT_INCAPACITATED))
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 229ce4c5a7f6..2c02286247ea 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -313,10 +313,8 @@ var/global/list/limb_types_by_name = list(
 
 /// Returns if the mob is incapacitated and unable to perform general actions
 /mob/proc/is_mob_incapacitated(ignore_restrained)
-	// TODO: Replace this by signal/traits entirely eventually
-	// TRAIT_FLOORED being considered incapacitated is a legacy CM Feature that should be removed at some point
 	// note that stat includes knockout via unconscious
-	return (stat || (!ignore_restrained && is_mob_restrained()) || (status_flags & FAKEDEATH) || HAS_TRAIT(src, TRAIT_FLOORED) || HAS_TRAIT(src, TRAIT_INCAPACITATED))
+	return (stat || (!ignore_restrained && is_mob_restrained()) || (status_flags & FAKEDEATH) || HAS_TRAIT(src, TRAIT_INCAPACITATED))
 
 /mob/proc/get_eye_protection()
 	return EYE_PROTECTION_NONE