diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index cf9d38a6b4b..ca8b9bc8795 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -517,6 +517,10 @@
 
 	hud_used.item_action_list = list()
 	for(var/obj/item/I in src)
+		if(istype(I,/obj/item/clothing/under))
+			var/obj/item/clothing/under/U = I
+			if(U.hastie)
+				I = U.hastie
 		if(I.icon_action_button)
 			var/obj/screen/item_action/A = new(hud_used)
 			
@@ -546,16 +550,6 @@
 					A.screen_loc = ui_action_slot4
 				if(5)
 					A.screen_loc = ui_action_slot5
-				if(6)
-					A.screen_loc = ui_action_slot6
-				if(7)
-					A.screen_loc = ui_action_slot7
-				if(8)
-					A.screen_loc = ui_action_slot8
-				if(9)
-					A.screen_loc = ui_action_slot9
-				if(10)
-					A.screen_loc = ui_action_slot10
 					break //5 slots available, so no more can be added.
 			num++
 	src.client.screen += src.hud_used.item_action_list
\ No newline at end of file
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index 2d4796309e4..9766d356232 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -22,6 +22,9 @@
 		return
 
 	var/mob/living/carbon/target = targets[1]
+	
+	if(!target)
+		return
 
 	if(!(target.type in compatible_mobs))
 		user << "<span class='notice'>It'd be stupid to curse [target] with a horse's head!</span>"
diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm
index 8ad7042e959..c905bf88a97 100644
--- a/code/datums/spells/mind_transfer.dm
+++ b/code/datums/spells/mind_transfer.dm
@@ -16,6 +16,7 @@
 	var/msg_wait = 500 //how long in deciseconds it waits before telling that body doesn't feel right or mind swap robbed of a spell
 	var/paralysis_amount_caster = 20 //how much the caster is paralysed for after the spell
 	var/paralysis_amount_victim = 20 //how much the victim is paralysed for after the spell
+	icon_power_button = "spell_mind"
 
 /*
 Urist: I don't feel like figuring out how you store object spells so I'm leaving this for you to do.
diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm
index c81f38fd1c2..fb462846e8e 100644
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -525,43 +525,4 @@
 		src.hud_used.hotkey_ui_hidden = 0
 	else
 		client.screen -= src.hud_used.hotkeybuttons
-		src.hud_used.hotkey_ui_hidden = 1
-
-
-/mob/living/carbon/human/update_action_buttons()
-	var/num = 1
-	if(!src.hud_used) return
-	if(!src.client) return
-
-	if(!hud_used.hud_shown)	//Hud toggled to minimal
-		return
-
-	src.client.screen -= src.hud_used.item_action_list
-	hud_used.item_action_list = list()
-
-	for(var/obj/item/I in src)
-		if(I.icon_action_button)
-			var/obj/screen/item_action/A = new(src.hud_used)
-			A.icon = 'icons/mob/screen1_action.dmi'
-			A.icon_state = I.icon_action_button
-			if(I.action_button_name)
-				A.name = I.action_button_name
-			else
-				A.name = "Use [I.name]"
-			A.owner = I
-			hud_used.item_action_list += A
-			switch(num)
-				if(1)
-					A.screen_loc = ui_action_slot1
-				if(2)
-					A.screen_loc = ui_action_slot2
-				if(3)
-					A.screen_loc = ui_action_slot3
-				if(4)
-					A.screen_loc = ui_action_slot4
-				if(5)
-					A.screen_loc = ui_action_slot5
-					break //5 slots available, so no more can be added.
-			num++
-
-	src.client.screen += src.hud_used.item_action_list
\ No newline at end of file
+		src.hud_used.hotkey_ui_hidden = 1
\ No newline at end of file