diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 00e7b0bfc1..167fa989b2 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -59,7 +59,7 @@
 #define ui_borg_store "CENTER+2:16,SOUTH:5"			//borgs
 #define ui_borg_camera "CENTER+3:21,SOUTH:5"		//borgs
 #define ui_borg_album "CENTER+4:21,SOUTH:5"			//borgs
-#define ui_borg_language_menu "CENTER+4:21,SOUTH+1:5"	//borgs
+#define ui_borg_language_menu "EAST-1:27,SOUTH+2:8"	//borgs
 
 #define ui_monkey_head "CENTER-5:13,SOUTH:5"	//monkey
 #define ui_monkey_mask "CENTER-4:14,SOUTH:5"	//monkey
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index b1ef5697ba..11517d79b8 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -98,6 +98,16 @@
 	var/mob/living/silicon/S = usr
 	S.toggle_sensors()
 
+/obj/screen/robot/language_menu
+	name = "silicon language selection"
+	icon_state = "talk_wheel"
+
+/obj/screen/robot/language_menu/Click()
+	if(..())
+		return
+	var/mob/living/silicon/S = usr
+	S.open_language_menu(usr)
+
 /datum/hud/robot
 	ui_style = 'icons/mob/screen_cyborg.dmi'
 
@@ -106,7 +116,7 @@
 	var/mob/living/silicon/robot/mymobR = mymob
 	var/obj/screen/using
 
-	using = new/obj/screen/language_menu
+	using = new/obj/screen/robot/language_menu
 	using.screen_loc = ui_borg_language_menu
 	static_inventory += using
 
diff --git a/icons/mob/actions/actions_AI.dmi b/icons/mob/actions/actions_AI.dmi
index 2ddc7923cc..e3ff3aba93 100644
Binary files a/icons/mob/actions/actions_AI.dmi and b/icons/mob/actions/actions_AI.dmi differ
diff --git a/icons/mob/actions/backgrounds.dmi b/icons/mob/actions/backgrounds.dmi
index 82303c5862..3697fe4ff5 100644
Binary files a/icons/mob/actions/backgrounds.dmi and b/icons/mob/actions/backgrounds.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 8142e03498..d724747a50 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/screen_cyborg.dmi b/icons/mob/screen_cyborg.dmi
index d2f5e24b38..173f9b0332 100644
Binary files a/icons/mob/screen_cyborg.dmi and b/icons/mob/screen_cyborg.dmi differ