diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 57b66b734b..d9a201f697 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -15,23 +15,6 @@
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.7
 	w_class = 3
-	action_button_name = "Toggle Visor"
-	var/flipped = 0 //Piggybacked from cap flipping.
-
-/obj/item/clothing/head/helmet/dropped()
-	src.icon_state = initial(icon_state)
-	src.flipped=0
-	..()
-
-/obj/item/clothing/head/helmet/attack_self(mob/user)
-	src.flipped = !src.flipped
-	if(src.flipped)
-		icon_state = "[icon_state]up"
-		user << "You activate the visor."
-	else
-		src.icon_state = initial(icon_state)
-		user << "You push the visor into the helmet."
-	update_clothing_icon()	//so our mob-overlays update
 
 /obj/item/clothing/head/helmet/riot
 	name = "riot helmet"
@@ -42,6 +25,7 @@
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
 	action_button_name = "Toggle Visor"
+	var/flipped = 0 //Piggybacked from cap flipping.
 
 /obj/item/clothing/head/helmet/riot/dropped()
 	src.icon_state = initial(icon_state)
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 6b161abf45..6e5f141444 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 038748bb8d..ab15a3ff1a 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ