diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index c224b38a09..ae74bf8ea5 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -75,13 +75,14 @@
 	..()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/emergency/phoron_double(src)
-//End Edit
+	new /obj/item/clothing/glasses/goggles(src)
 
 /obj/item/weapon/storage/box/engineer/New()
 	..()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-
+	new /obj/item/clothing/glasses/goggles(src)
+//VOREStation Edit End
 /obj/item/weapon/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains white gloves."
diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
index 3f9b611a9f..4d63805768 100644
--- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
@@ -2,10 +2,88 @@
 	name = "double emergency phoron tank"
 	desc = "An emergency air tank hastily painted red."
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_state = "emergency_double_nitrogen"
-	gauge_icon = "indicator_emergency_double"
+	icon_state = "emergency_double_vox"
+	gauge_icon = "indicator_double"
+	gauge_cap = 3
 	volume = 10
 
 /obj/item/weapon/tank/emergency/phoron_double/New()
 	..()
 	air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+
+//New icons
+/obj/item/weapon/tank/oxygen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "oxygen"
+	gauge_cap = 3
+	gauge_icon = "indicator_bigtank"
+// /obj/item/weapon/tank/oxygen/yellow
+// /obj/item/weapon/tank/oxygen/red
+
+/obj/item/weapon/tank/anesthetic
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "anesthetic"
+	gauge_cap = 3
+	gauge_icon = "indicator_bigtank"
+
+/obj/item/weapon/tank/air
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "oxygen"
+	gauge_cap = 3
+	gauge_icon = "indicator_bigtank"
+
+/obj/item/weapon/tank/phoron
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "phoron"
+
+/obj/item/weapon/tank/vox	//Can't be a child of phoron or the gas amount gets screwey.
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "plasma_fr"
+
+/obj/item/weapon/tank/emergency
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/oxygen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/oxygen/engi
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_engi"
+	gauge_icon = "indicator_engi"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/oxygen/double
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_double"
+	gauge_icon = "indicator_double"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/nitrogen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_nitrogen"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/nitrogen/double
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_double_vox"
+	gauge_icon = "indicator_double"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/phoron
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_p"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/nitrogen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "oxygen_fr"
+	gauge_icon = "indicator_bigtank"
+	gauge_cap = 3
diff --git a/icons/obj/tank_vr.dmi b/icons/obj/tank_vr.dmi
index e533775167..9e765a0dc1 100644
Binary files a/icons/obj/tank_vr.dmi and b/icons/obj/tank_vr.dmi differ