diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm
index 29d7295feac..be9b78dc1e2 100644
--- a/code/_onclick/hud/other_mobs.dm
+++ b/code/_onclick/hud/other_mobs.dm
@@ -1,3 +1,15 @@
+/mob/living/simple_animal/create_mob_hud()
+	hud_used = new /datum/hud/simple(src)
+
+/datum/hud/simple/New(mob/user)
+	..()
+	var/obj/screen/using
+	using = new /obj/screen/act_intent/simple()
+	using.icon_state = mymob.a_intent
+	static_inventory += using
+	action_intent = using
+
+
 /mob/living/simple_animal/pet/create_mob_hud()
 	if(client && !hud_used)
 		hud_used = new /datum/hud/corgi(src)
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 5bf3a483cd8..89917bb2cc1 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -71,17 +71,14 @@
 	if(ishuman(usr))
 		var/_x = text2num(params2list(params)["icon-x"])
 		var/_y = text2num(params2list(params)["icon-y"])
-
 		if(_x<=16 && _y<=16)
 			usr.a_intent_change(INTENT_HARM)
 		else if(_x<=16 && _y>=17)
 			usr.a_intent_change(INTENT_HELP)
 		else if(_x>=17 && _y<=16)
 			usr.a_intent_change(INTENT_GRAB)
-
 		else if(_x>=17 && _y>=17)
 			usr.a_intent_change(INTENT_DISARM)
-
 	else
 		usr.a_intent_change("right")
 
@@ -97,6 +94,11 @@
 	name = "run/walk toggle"
 	icon_state = "running"
 
+
+/obj/screen/act_intent/simple
+	icon = 'icons/mob/screen_robot.dmi'
+	screen_loc = ui_acti
+
 /obj/screen/mov_intent/Click()
 	if(iscarbon(usr))
 		var/mob/living/carbon/C = usr
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 05d70f50919..4f48c854b09 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -79,11 +79,6 @@
 	var/deathmessage = ""
 	var/death_sound = null //The sound played on death
 
-	// Action Datums
-
-	var/datum/action/innate/simpleanimal/toggleintent/toggleintent_action
-
-
 
 /mob/living/simple_animal/New()
 	..()
@@ -95,8 +90,6 @@
 		if(!istype(collar))
 			collar = new(src)
 		regenerate_icons()
-	toggleintent_action = new()
-	toggleintent_action.Grant(src)
 
 /mob/living/simple_animal/Destroy()
 	if(collar)
@@ -579,31 +572,3 @@
 /mob/living/simple_animal/SetEarDeaf()
 	return
 
-
-
-// Actions
-
-/datum/action/innate/simpleanimal/toggleintent
-	name = "Toggle Intent"
-	icon_icon = 'icons/mob/screen_bot.dmi'
-	button_icon_state = "help"
-
-/datum/action/innate/simpleanimal/toggleintent/New(var/Target)
-	. = ..(Target)
-	UpdateButtonIcon()
-
-/datum/action/innate/simpleanimal/toggleintent/Activate()
-	var/mob/living/simple_animal/user = owner
-	if(user.a_intent == INTENT_HELP)
-		user.a_intent = INTENT_HARM
-	else
-		user.a_intent = INTENT_HELP
-	UpdateButtonIcon()
-
-/datum/action/innate/simpleanimal/toggleintent/UpdateButtonIcon()
-	var/mob/living/simple_animal/user = owner
-	if(user.a_intent == INTENT_HARM)
-		button_icon_state = "harm"
-	else
-		button_icon_state = "help"
-	return ..()
\ No newline at end of file
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index d622c78f680..46b5d1b0606 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -356,7 +356,7 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
 			if(hud_used && hud_used.action_intent)
 				hud_used.action_intent.icon_state = "[a_intent]"
 
-		else if(isrobot(src) || islarva(src))
+		else if(isrobot(src) || islarva(src) || isanimal(src))
 			switch(input)
 				if(INTENT_HELP)
 					a_intent = INTENT_HELP