diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index e4514ac09b0..f75b07f22be 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -11,10 +11,15 @@
 	var/processing = 0
 	var/icon_keyboard = "generic_key"
 	var/icon_screen = "generic"
-	var/light_range_on = 2
-	var/light_power_on = 1
+	var/light_range_on = 3
+	var/light_power_on = 2
+	var/overlay_layer
 	atom_say_verb = "beeps"
 
+/obj/machinery/computer/New()
+	overlay_layer = layer
+	..()	
+	
 /obj/machinery/computer/initialize()
 	power_change()
 	update_icon()
@@ -65,18 +70,18 @@
 
 /obj/machinery/computer/update_icon()
 	overlays.Cut()
-
-	var/overlay_layer = LIGHTING_LAYER+0.1
-
 	if(stat & NOPOWER)
 		if(icon_keyboard)
 			overlays += image(icon,"[icon_keyboard]_off",overlay_layer)
 		return
-	overlays += image(icon, icon_keyboard ,overlay_layer)
+
 	if(stat & BROKEN)
 		overlays += image(icon,"[icon_state]_broken",overlay_layer)
 	else
 		overlays += image(icon,icon_screen,overlay_layer)
+	
+	if(icon_keyboard)
+		overlays += image(icon, icon_keyboard ,overlay_layer)
 
 
 /obj/machinery/computer/power_change()
@@ -87,7 +92,6 @@
 	else
 		set_light(light_range_on, light_power_on)
 
-
 /obj/machinery/computer/proc/set_broken()
 	stat |= BROKEN
 	update_icon()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 2d2327c190c..c3ab9221a20 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -77,7 +77,8 @@
 									/obj/machinery/suit_storage_unit,			/obj/machinery/clonepod, \
 									/obj/machinery/dna_scannernew,		/obj/machinery/telecomms, \
 									/obj/machinery/nuclearbomb,			/obj/machinery/particle_accelerator, \
-									/obj/machinery/recharge_station,	/obj/machinery/smartfridge)
+									/obj/machinery/recharge_station,	/obj/machinery/smartfridge, \
+									/obj/machinery/computer)
 
 	//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
 	var/obj/item/held_item = null