diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 3f6758c6ad..e55323fb3a 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -162,6 +162,12 @@
 		update_icon()
 	return 1
 
+/obj/screen/zone_sel/proc/set_selected_zone(bodypart)
+	var/old_selecting = selecting
+	selecting = bodypart
+	if(old_selecting != selecting)
+		update_icon()
+
 /obj/screen/zone_sel/update_icon()
 	overlays.Cut()
 	overlays += image('icons/mob/zone_sel.dmi', "[selecting]")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3e0bbcd9ff..714bde7096 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1024,7 +1024,7 @@ mob/proc/yank_out_object()
 /client/verb/body_toggle_head()
 	set name = "body-toggle-head"
 	set hidden = 1
-	toggle_zone_sel(list(BP_HEAD,BP_EYES,BP_MOUTH))
+	toggle_zone_sel(list(BP_HEAD, O_EYES, O_MOUTH))
 
 /client/verb/body_r_arm()
 	set name = "body-r-arm"
@@ -1039,7 +1039,7 @@ mob/proc/yank_out_object()
 /client/verb/body_chest()
 	set name = "body-chest"
 	set hidden = 1
-	toggle_zone_sel(list(BP_CHEST))
+	toggle_zone_sel(list(BP_TORSO))
 
 /client/verb/body_groin()
 	set name = "body-groin"