diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 712265bbb2..2bb3eba3ff 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -9,14 +9,33 @@
 	//var/darkness_view = 0//Base human is 2
 	//var/invisa_view = 0
 	var/prescription = 0
+	var/toggleable = 0
+	var/active = 1
 	body_parts_covered = EYES
 
+/obj/item/clothing/glasses/attack_self(mob/user)
+	if(toggleable)
+		if(active)
+			active = 0
+			icon_state = "degoggles"
+			vision_flags = 0
+			user.update_inv_glasses()
+			usr << "You deactivate the optical matrix on the [src]."
+		else
+			active = 1
+			icon_state = initial(icon_state)
+			vision_flags = initial(vision_flags)
+			user.update_inv_glasses()
+			usr << "You activate the optical matrix on the [src]."
+
 /obj/item/clothing/glasses/meson
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
 	item_state = "glasses"
+	icon_action_button = "action_meson" //This doesn't actually matter, the action button is generated from the current icon_state. But, this is the only way to get it to show up.
 	origin_tech = "magnets=2;engineering=2"
+	toggleable = 1
 	vision_flags = SEE_TURFS
 
 /obj/item/clothing/glasses/meson/prescription
@@ -57,7 +76,9 @@
 	desc = "Very confusing glasses."
 	icon_state = "material"
 	item_state = "glasses"
+	icon_action_button = "action_material"
 	origin_tech = "magnets=3;engineering=3"
+	toggleable = 1
 	vision_flags = SEE_OBJS
 
 /obj/item/clothing/glasses/regular
@@ -175,6 +196,7 @@
 	icon_state = "thermal"
 	item_state = "glasses"
 	origin_tech = "magnets=3"
+	toggleable = 1
 	vision_flags = SEE_MOBS
 	invisa_view = 2
 
@@ -194,6 +216,7 @@
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
+	icon_action_button = "action_meson"
 	origin_tech = "magnets=3;syndicate=4"
 
 /obj/item/clothing/glasses/thermal/monocle
@@ -201,6 +224,7 @@
 	desc = "A monocle thermal."
 	icon_state = "thermoncle"
 	flags = null //doesn't protect eyes because it's a monocle, duh
+	toggleable = 0
 	body_parts_covered = 0
 
 /obj/item/clothing/glasses/thermal/eyepatch
@@ -208,6 +232,7 @@
 	desc = "An eyepatch with built-in thermal optics"
 	icon_state = "eyepatch"
 	item_state = "eyepatch"
+	toggleable = 0
 	body_parts_covered = 0
 
 /obj/item/clothing/glasses/thermal/jensen
@@ -215,3 +240,4 @@
 	desc = "A set of implantable lenses designed to augment your vision"
 	icon_state = "thermalimplants"
 	item_state = "syringe_kit"
+	toggleable = 0
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 272f79fc8d..486e578cb6 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 4c32803e21..ac7af620b1 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ