diff --git a/code/modules/modular_computers/computers/modular_console.dm b/code/modules/modular_computers/computers/modular_console.dm
index 06291a06def..69f1012d9ad 100644
--- a/code/modules/modular_computers/computers/modular_console.dm
+++ b/code/modules/modular_computers/computers/modular_console.dm
@@ -6,6 +6,7 @@
 	icon_state = "console"
 	icon_state_unpowered = "console"
 	icon_state_menu = "menu"
+	var/keyboard_icon_state_menu = "keyboard13"
 	battery_powered = 0
 	anchored = 1
 	density = 1
@@ -26,5 +27,7 @@
 		return
 	if(active_program)
 		overlays.Add(active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu)
+		overlays.Add(active_program.keyboard_icon_state ? active_program.keyboard_icon_state : keyboard_icon_state_menu)
 	else
-		overlays.Add(icon_state_menu)
\ No newline at end of file
+		overlays.Add(icon_state_menu)
+		overlays.Add(keyboard_icon_state_menu)
diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm
index 1e713416fd9..fe1f81edf1c 100644
--- a/code/modules/modular_computers/file_system/program.dm
+++ b/code/modules/modular_computers/file_system/program.dm
@@ -9,6 +9,7 @@
 	var/atom/movable/computer = null		// Device that runs this program.
 	var/filedesc = "Unknown Program"		// User-friendly name of this program.
 	var/program_icon_state = null			// Overlay for this program, selected by computer
+	var/keyboard_icon_state = null			// Program-specific keboard icon state 
 	var/requires_ntnet = 0					// Set to 1 for program to require nonstop NTNet connection to run. If NTNet connection is lost program crashes.
 	var/requires_ntnet_feature = 0			// Optional, if above is set to 1 checks for specific function of NTNet (currently NTNET_SOFTWAREDOWNLOAD, NTNET_PEERTOPEER, NTNET_SYSTEMCONTROL and NTNET_COMMUNICATION)
 	var/ntnet_status = 1					// NTNet status, updated every tick by computer running this program. Don't use this for checks if NTNet works, computers do that. Use this for calculations, etc.
diff --git a/code/modules/modular_computers/file_system/programs/engineering.dm b/code/modules/modular_computers/file_system/programs/engineering.dm
index 022a7f26d0d..4d39b346c31 100644
--- a/code/modules/modular_computers/file_system/programs/engineering.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering.dm
@@ -5,6 +5,7 @@
 	filedesc = "Power Monitoring"
 	nanomodule_path = /datum/nano_module/power_monitor/
 	program_icon_state = "power_monitor"
+	keyboard_icon_state = "keyboard9"
 	requires_ntnet = 1
 
 /datum/computer_file/program/alarm_monitor
@@ -12,6 +13,7 @@
 	filedesc = "Alarm Monitoring"
 	nanomodule_path = /datum/nano_module/alarm_monitor/engineering
 	program_icon_state = "alarm_monitor"
+	keyboard_icon_state = "keyboard4"
 	requires_ntnet = 1
 
 /datum/computer_file/program/atmos_control
@@ -19,6 +21,7 @@
 	filedesc = "Atmosphere Control"
 	nanomodule_path = /datum/nano_module/atmos_control
 	program_icon_state = "atmos_control"
+	keyboard_icon_state = "keyboard4"
 	required_access = access_atmospherics
 	requires_ntnet = 1
 	requires_ntnet_feature = NTNET_SYSTEMCONTROL
@@ -28,7 +31,8 @@
 	filename = "rconconsole"
 	filedesc = "RCON Remote Control"
 	nanomodule_path = /datum/nano_module/rcon
-	program_icon_state = "rcon_console"
+	program_icon_state = "generic"
+	keyboard_icon_state = "keyboard1"
 	required_access = access_engine
 	requires_ntnet = 1
 	requires_ntnet_feature = NTNET_SYSTEMCONTROL
@@ -38,5 +42,6 @@
 	filename = "sensormonitor"
 	filedesc = "Suit Sensors Monitoring"
 	nanomodule_path = /datum/nano_module/crew_monitor
-	program_icon_state = "suit_sensors"
+	program_icon_state = "crew"
+	keyboard_icon_state = "keyboard7"
 	requires_ntnet = 1
\ No newline at end of file
diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi
index a2889055444..d0a5a46583c 100644
Binary files a/icons/obj/modular_console.dmi and b/icons/obj/modular_console.dmi differ
diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_laptop.dmi
index 4d390512746..eafc969b04d 100644
Binary files a/icons/obj/modular_laptop.dmi and b/icons/obj/modular_laptop.dmi differ