diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
index 7a8679171a2..7bf902556de 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
@@ -119,24 +119,28 @@
 	using.layer = 19
 	src.adding += using
 
-	//r hand
 	using = new src.h_type( src )
 	using.name = "r_hand"
 	using.dir = WEST
 	using.icon = 'screen1_alien.dmi'
-	using.icon_state = "equip"
+	using.icon_state = "hand_inactive"
+	if(mymob && !mymob.hand)	//This being 0 or null means the right hand is in use
+		using.icon_state = "hand_active"
 	using.screen_loc = ui_rhand
 	using.layer = 19
+	src.r_hand_hud_object = using
 	src.adding += using
 
-	//l hand
 	using = new src.h_type( src )
 	using.name = "l_hand"
 	using.dir = EAST
 	using.icon = 'screen1_alien.dmi'
-	using.icon_state = "equip"
+	using.icon_state = "hand_inactive"
+	if(mymob && mymob.hand)	//This being 1 means the left hand is in use
+		using.icon_state = "hand_active"
 	using.screen_loc = ui_lhand
 	using.layer = 19
+	src.l_hand_hud_object = using
 	src.adding += using
 
 	//pocket 1
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 5caedab07dd..06b4cb3830d 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -122,7 +122,7 @@
 
 	//Suit storage
 	var/confirm
-	if (wear_suit)
+	if (!s_store && wear_suit)
 		if(wear_suit.allowed)
 			if (istype(W, /obj/item/device/pda) || istype(W, /obj/item/weapon/pen))
 				confirm = 1
diff --git a/icons/mob/screen1_alien.dmi b/icons/mob/screen1_alien.dmi
index 7292a03a88b..1aa3f5904f7 100644
Binary files a/icons/mob/screen1_alien.dmi and b/icons/mob/screen1_alien.dmi differ