diff --git a/code/game/hud.dm b/code/game/hud.dm
index 3b3f93597a5..b46567040e1 100644
--- a/code/game/hud.dm
+++ b/code/game/hud.dm
@@ -18,6 +18,7 @@
 #define ui_back "6:14,1:5"
 #define ui_rhand "7:16,1:5"
 #define ui_lhand "8:16,1:5"
+#define ui_equip "7:16,2:5"
 #define ui_swaphand1 "7:16,2:5"
 #define ui_swaphand2 "8:16,2:5"
 #define ui_storage1 "9:18,1:5"
diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm
index d489bf24543..9fe37d3ce69 100644
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -294,6 +294,14 @@
 	using.layer = 20
 	src.adding += using
 
+	using = new src.h_type( src )
+	using.name = "equip"
+	using.icon = ui_style
+	using.icon_state = "act_equip"
+	using.screen_loc = ui_equip
+	using.layer = 20
+	src.adding += using
+
 /*
 	using = new src.h_type( src )
 	using.name = "intent"
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index e9cf67d60e4..f771488d26d 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
-
 /mob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0)) return 1
 
@@ -107,9 +105,6 @@
 				usr.hud_used.help_intent.icon_state = "help_small_active"
 				usr.hud_used.grab_intent.icon_state = "grab_small"
 				usr.hud_used.disarm_intent.icon_state = "disarm_small"
-		usr << "\blue Your intent is now \"[usr.a_intent]\"."
-	else
-		usr << "\red This mob type does not use intents."
 
 //This gets called when you press the delete button.
 /client/verb/delete_key_pressed()
diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index 944ef8122c3..726f141841a 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -303,6 +303,15 @@
 
 			usr.hud_used.other_update()
 
+		if("equip")
+			var/obj/item/I = usr.get_active_hand()
+			if(!I)
+				usr << "\blue You are not holding anything to equip."
+				return
+			if(ishuman(usr))
+				var/mob/living/carbon/human/H = usr
+				H.equip_to_appropriate_slot(I)
+
 		if("maprefresh")
 			var/obj/machinery/computer/security/seccomp = usr.machine
 
diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi
index e37b1cce29a..405e653687d 100644
Binary files a/icons/mob/screen1_Midnight.dmi and b/icons/mob/screen1_Midnight.dmi differ
diff --git a/icons/mob/screen1_Orange.dmi b/icons/mob/screen1_Orange.dmi
index fb1136a5347..5ace28041c6 100644
Binary files a/icons/mob/screen1_Orange.dmi and b/icons/mob/screen1_Orange.dmi differ
diff --git a/icons/mob/screen1_old.dmi b/icons/mob/screen1_old.dmi
index 37d67820992..03e76e44cb7 100644
Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ