diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 26e88657fa7..5aa4c53704b 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -228,7 +228,7 @@
 /obj/machinery/computer/security/mining
 	name = "outpost camera monitor"
 	desc = "Used to access the various cameras on the outpost."
-	icon_keyboard = "mining_key"
+	icon_keyboard = "tech_key"
 	icon_screen = "mining"
 	light_color = "#F9BBFC"
 	network = list("Mining Outpost")
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index a8aa3a45b4b..89294b00fa6 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -76,16 +76,17 @@
 			add_overlay("[icon_keyboard]_off")
 		return
 
-	// This whole block lets screens ignore lighting and be visible even in the darkest room
+	// This whole block lets screens and keyboards ignore lighting and be visible even in the darkest room
 	var/overlay_state = icon_screen
 	if(stat & BROKEN)
 		overlay_state = "[icon_state]_broken"
 	add_overlay("[overlay_state]")
 	if(!(stat & BROKEN) && light)
-		underlays += emissive_appearance(icon, "[icon_state]_light_mask")
+		underlays += emissive_appearance(icon, "[icon_state]_lightmask")
 
 	if(icon_keyboard)
 		add_overlay("[icon_keyboard]")
+		underlays += emissive_appearance(icon, "[icon_keyboard]_lightmask")
 
 /obj/machinery/computer/power_change()
 	..()
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 46dc31c78a4..e13f77f4667 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -44,7 +44,7 @@
 	desc = "Used to control the satellite network."
 	circuit = /obj/item/circuitboard/computer/sat_control
 	icon_screen = "accelerator"
-	icon_keyboard = "accelerator_key"
+	icon_keyboard = "rd_key"
 	var/notice
 
 /obj/machinery/computer/sat_control/attack_hand(mob/user)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 36d151ced6d..5387e77f2f0 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -1,7 +1,7 @@
 /obj/machinery/computer/telescience
 	name = "telepad control console"
 	desc = "Used to teleport objects to and from the telescience telepad."
-	icon_keyboard = "telesci_key"
+	icon_keyboard = "tech_key"
 	icon_screen = "telesci"
 	circuit = /obj/item/circuitboard/telesci_console
 	req_access = list(ACCESS_RESEARCH)
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 8d312238a15..f3df608ed78 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ