diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 5a94a92572..bf3295d631 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/extinguisher
 	name = "fire extinguisher"
 	desc = "A traditional red fire extinguisher."
-	icon = 'icons/obj/items_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/items.dmi'
 	icon_state = "fire_extinguisher0"
 	item_state = "fire_extinguisher"
 	hitsound = 'sound/weapons/smash.ogg'
@@ -21,6 +21,7 @@
 	var/last_use = 1.0
 	var/safety = 1
 	var/sprite_name = "fire_extinguisher"
+	var/rand_overlays = 6
 
 /obj/item/weapon/extinguisher/mini
 	name = "fire extinguisher"
@@ -34,16 +35,20 @@
 	max_water = 150
 	spray_particles = 3
 	sprite_name = "miniFE"
+	rand_overlays = 0
 
 /obj/item/weapon/extinguisher/Initialize()
 	create_reagents(max_water)
-	reagents.add_reagent("firefoam", max_water) //VOREStation Edit
+	reagents.add_reagent("firefoam", max_water)
+	if(rand_overlays)
+		var/choice = rand(1,rand_overlays)
+		add_overlay("[item_state]O[choice]")
 	. = ..()
 
 /obj/item/weapon/extinguisher/examine(mob/user)
 	. = ..()
 	if(get_dist(user, src) == 0)
-		. += "[src] has [src.reagents.total_volume] units of foam left!" //VOREStation Edit - Foam not water
+		. += "[src] has [src.reagents.total_volume] units of foam left!"
 
 /obj/item/weapon/extinguisher/attack_self(mob/user as mob)
 	safety = !safety
@@ -72,7 +77,7 @@
 /obj/item/weapon/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag)
 	//TODO; Add support for reagents in water.
 
-	if( istype(target, /obj/structure/reagent_dispensers) && flag) //VOREStation Edit
+	if( istype(target, /obj/structure/reagent_dispensers) && flag)
 		var/obj/o = target
 		var/amount = o.reagents.trans_to_obj(src, 50)
 		to_chat(user, "<span class='notice'>You fill [src] with [amount] units of the contents of [target].</span>")
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index d4de5b0ed4..dc5f5057e6 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/items_vr.dmi b/icons/obj/items_vr.dmi
index 6e31f43624..ca82649d88 100644
Binary files a/icons/obj/items_vr.dmi and b/icons/obj/items_vr.dmi differ
diff --git a/icons/obj/zippo.dmi b/icons/obj/zippo.dmi
index 65deebfb46..0d4416cc64 100644
Binary files a/icons/obj/zippo.dmi and b/icons/obj/zippo.dmi differ