diff --git a/code/game/hud.dm b/code/game/hud.dm
index 5539c8c3c40..c276b260c9f 100644
--- a/code/game/hud.dm
+++ b/code/game/hud.dm
@@ -35,19 +35,19 @@
 #define ui_monkey_back "6:14,1:5"	//monkey
 
 //Lower right, persistant menu
-#define ui_dropbutton "13:26,1:5"
-#define ui_throw "13:26,1:5"
-#define ui_pull "13:26,2:7"
-#define ui_acti "12:24,1:5"
+#define ui_dropbutton "11:22,1:5"
+#define ui_throw "11:22,1:5"
+#define ui_pull "12:24,1:5"
+#define ui_movi "12:24,1:5"
 
-#define ui_movi "13:26,2:7"
+#define ui_acti "13:26,1:5"
 #define ui_zonesel "14:28,1:5"
 
 //Gun buttons
-#define ui_gun1 "11:22,2:7"
-#define ui_gun2 "10:20,2:7"
-#define ui_gun3 "9:18,2:7"
-#define ui_gun_select "11:22,1:5"
+#define ui_gun1 "13:26,2:5"
+#define ui_gun2 "12:24,2:5"
+#define ui_gun3 "11:22,2:5"
+#define ui_gun_select "14:28,2:5"
 
 //Middle right (damage indicators)
 #define ui_pressure "14:28,6:13"
@@ -67,12 +67,15 @@
 #define ui_health "14:28,7:15"
 #define ui_internal "14:28,8:17"
 
+//For non-human compatibility
 									//borgs
 #define ui_borg_health "14:28,6:13" //borgs have the health display where humans have the pressure damage indicator.
 #define ui_alien_health "14:28,6:13" //aliens have the health display where humans have the pressure damage indicator.
 #define ui_throw_old "13:26,2:7"
 #define ui_movi_old "12:24,2:7"
 #define ui_pull_old "14:28,2:7"
+#define ui_dropbutton_old "12:24,1:5"
+#define ui_pull_borg "12:24,1:5"
 
 //Pop-up inventory
 #define ui_shoes "2:8,1:5"
@@ -92,10 +95,10 @@
 
 
 //Intent small buttons
-#define ui_help_small "12:16,1:-3"
-#define ui_disarm_small "12:16,1:12"
-#define ui_grab_small "12:32,1:12"
-#define ui_harm_small "12:32,1:-3"
+#define ui_help_small "13:18,1:-3"
+#define ui_disarm_small "13:18,1:12"
+#define ui_grab_small "13:34,1:12"
+#define ui_harm_small "13:34,1:-3"
 
 
 
diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
index 67223c85fb2..7b2accc6227 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
@@ -146,7 +146,7 @@
 	using.name = "drop"
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = "act_drop"
-	using.screen_loc = ui_dropbutton
+	using.screen_loc = ui_dropbutton_old
 	using.layer = 19
 	src.adding += using
 
diff --git a/code/modules/mob/living/carbon/alien/larva/hud.dm b/code/modules/mob/living/carbon/alien/larva/hud.dm
index 9da16a0b3bf..2614a992bf2 100644
--- a/code/modules/mob/living/carbon/alien/larva/hud.dm
+++ b/code/modules/mob/living/carbon/alien/larva/hud.dm
@@ -56,7 +56,7 @@
 	using.dir = SOUTHWEST
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
-	using.screen_loc = ui_movi_old
+	using.screen_loc = ui_acti
 	using.layer = 20
 	src.adding += using
 	move_intent = using
diff --git a/code/modules/mob/living/silicon/robot/hud.dm b/code/modules/mob/living/silicon/robot/hud.dm
index d272c96f3a4..41100e1066c 100644
--- a/code/modules/mob/living/silicon/robot/hud.dm
+++ b/code/modules/mob/living/silicon/robot/hud.dm
@@ -202,7 +202,7 @@
 	mymob.pullin.icon = 'screen1_robot.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull_old
+	mymob.pullin.screen_loc = ui_pull_borg
 
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_robot.dmi'
diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi
index 42d15482c22..e37b1cce29a 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 e3762ef4b2b..fb1136a5347 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 98ea94f656d..37d67820992 100644
Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ
diff --git a/icons/mob/zone_sel.dmi b/icons/mob/zone_sel.dmi
index 7f8bb1c4741..b7549296d2c 100644
Binary files a/icons/mob/zone_sel.dmi and b/icons/mob/zone_sel.dmi differ