diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 8b5c73e32cb..9bf9e8e0f58 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -1,6 +1,8 @@
 /obj/machinery/computer/camera_advanced/shuttle_docker
 	name = "navigation computer"
 	desc = "Used to designate a precise transit location for a spacecraft."
+	icon_screen = "navigation"
+	icon_keyboard = "med_key"
 	jump_action = null
 	var/datum/action/innate/shuttledocker_rotate/rotate_action = new
 	var/datum/action/innate/shuttledocker_place/place_action = new
@@ -282,8 +284,6 @@
 
 /mob/camera/aiEye/remote/shuttle_docker/update_remote_sight(mob/living/user)
 	user.sight = SEE_TURFS
-	//user.lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
-	//user.sync_lighting_plane_alpha()
 	return TRUE
 
 /datum/action/innate/shuttledocker_rotate
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
index 532fedc5497..0a40901059f 100644
--- a/code/modules/shuttle/syndicate.dm
+++ b/code/modules/shuttle/syndicate.dm
@@ -64,7 +64,7 @@
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate
 	name = "syndicate shuttle navigation computer"
 	desc = "Used to designate a precise transit location for the syndicate shuttle."
-	icon_screen = "syndishuttle"
+	icon_screen = "syndinavigation"
 	icon_keyboard = "syndie_key"
 	shuttleId = "syndicate"
 	shuttlePortId = "syndicate_custom"
@@ -74,7 +74,7 @@
 	see_hidden = TRUE
 	resistance_flags = INDESTRUCTIBLE
 
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/SST
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst
 	name = "SST shuttle navigation computer"
 	desc = "Used to designate a precise transit location for the SST shuttle."
 	shuttleId = "sst"
@@ -83,7 +83,7 @@
 	x_offset = 0
 	y_offset = 0
 
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/SIT
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit
 	name = "SIT shuttle navigation computer"
 	desc = "Used to designate a precise transit location for the SIT shuttle."
 	shuttleId = "sit"
diff --git a/code/modules/shuttle/vox.dm b/code/modules/shuttle/vox.dm
index 7b3be543e20..3899a23dee1 100644
--- a/code/modules/shuttle/vox.dm
+++ b/code/modules/shuttle/vox.dm
@@ -8,8 +8,8 @@
 /obj/machinery/computer/camera_advanced/shuttle_docker/vox
 	name = "skipjack navigation computer"
 	desc = "Used to designate a precise transit location for the skipjack."
-	icon_screen = "shuttle"
-	icon_keyboard = "tech_key"
+	icon_screen = "navigation"
+	icon_keyboard = "med_key"
 	shuttleId = "skipjack"
 	shuttlePortId = "skipjack_custom"
 	view_range = 13
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 394b4071c1d..c51b8d7050b 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ