diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index af3c8d1d959..31a94bee551 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -767,13 +767,14 @@
 	owner.update_sight()
 
 /obj/item/organ/eyes/Remove(mob/living/carbon/M, special = 0)
+	..()
 	M.sight ^= sight_flags
 	if(ishuman(M) && eye_color)
 		var/mob/living/carbon/human/HMN = owner
 		HMN.eye_color = old_eye_color
-		HMN.regenerate_icons()
+	M.regenerate_icons()
 	M.update_tint()
-	..()
+
 
 /obj/item/organ/eyes/night_vision
 	name = "shadow eyes"
@@ -801,13 +802,11 @@
 	sight_flags = SEE_MOBS
 
 
-
-
 ///Robotic
 
 /obj/item/organ/eyes/robotic
 	name = "robotic eyes"
-	icon_state = "cybernetic eyeballs"
+	icon_state = "cybernetic_eyeballs"
 	desc = "Your vision is augmented."
 
 /obj/item/organ/eyes/robotic/emp_act(severity)