diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index 01d9702aa81..0bb9ed463c8 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -6,7 +6,7 @@
 /mob/living/bot/farmbot
 	name = "Farmbot"
 	desc = "The botanist's best friend."
-	icon = 'icons/obj/aibots.dmi'
+	icon = 'icons/obj/chemical_tanks.dmi'
 	icon_state = "farmbot0"
 	health = 50
 	maxHealth = 50
@@ -38,7 +38,7 @@
 
 /mob/living/bot/farmbot/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
 	var/list/data = ..()
-	
+
 	data["on"] = on
 	data["tank"] = !!tank
 	if(tank)
@@ -105,7 +105,7 @@
 			else
 				turn_on()
 			. = TRUE
-	
+
 	if(locked)
 		return TRUE
 	switch(action)
diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index 42e59d0c98e..0ee92fedb27 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -1,8 +1,8 @@
 /obj/structure/reagent_dispensers
 	name = "Dispenser"
 	desc = "..."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "watertank"
+	icon = 'icons/obj/chemical_tanks.dmi'
+	icon_state = "tank"
 	layer = TABLE_LAYER
 	density = TRUE
 	anchored = FALSE
@@ -76,14 +76,15 @@
 /obj/structure/reagent_dispensers/blob_act()
 	qdel(src)
 
+/*
+ * Tanks
+ */
 
-
-//Dispensers
+//Water
 /obj/structure/reagent_dispensers/watertank
-	name = "watertank"
-	desc = "A watertank."
-	icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit
-	icon_state = "watertank"
+	name = "water tank"
+	desc = "A water tank."
+	icon_state = "water"
 	amount_per_transfer_from_this = 10
 
 /obj/structure/reagent_dispensers/watertank/Initialize()
@@ -93,17 +94,17 @@
 /obj/structure/reagent_dispensers/watertank/high
 	name = "high-capacity water tank"
 	desc = "A highly-pressurized water tank made to hold vast amounts of water.."
-	icon_state = "watertank_high"
+	icon_state = "water_high"
 
 /obj/structure/reagent_dispensers/watertank/high/Initialize()
 	. = ..()
 	reagents.add_reagent("water", 4000)
 
+//Fuel
 /obj/structure/reagent_dispensers/fueltank
-	name = "fueltank"
-	desc = "A fueltank."
-	icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit
-	icon_state = "weldtank"
+	name = "fuel tank"
+	desc = "A fuel tank."
+	icon_state = "fuel"
 	amount_per_transfer_from_this = 10
 	var/modded = 0
 	var/obj/item/device/assembly_holder/rig = null
@@ -112,30 +113,45 @@
 	. = ..()
 	reagents.add_reagent("fuel",1000)
 
-//VOREStation Add
 /obj/structure/reagent_dispensers/fueltank/high
 	name = "high-capacity fuel tank"
 	desc = "A highly-pressurized fuel tank made to hold vast amounts of fuel."
-	icon_state = "weldtank_high"
+	icon_state = "fuel_high"
 
 /obj/structure/reagent_dispensers/fueltank/high/Initialize()
 	. = ..()
 	reagents.add_reagent("fuel",4000)
 
+//Foam
 /obj/structure/reagent_dispensers/foam
-	name = "foamtank"
+	name = "foam tank"
 	desc = "A foam tank."
-	icon = 'icons/obj/objects_vr.dmi'
-	icon_state = "foamtank"
+	icon_state = "foam"
 	amount_per_transfer_from_this = 10
 
 /obj/structure/reagent_dispensers/foam/Initialize()
 	. = ..()
 	reagents.add_reagent("firefoam",1000)
 
+//Helium3
+/obj/structure/reagent_dispensers/he3
+	name = "/improper He3 tank"
+	desc = "A Helium3 tank."
+	icon_state = "he3"
+	amount_per_transfer_from_this = 10
+
+/obj/structure/reagent_dispenser/he3/Initialize()
+	..()
+	reagents.add_reagent("helium3",1000)
+
+/*
+ * Misc
+ */
+
 /obj/structure/reagent_dispensers/fueltank/barrel
 	name = "hazardous barrel"
 	desc = "An open-topped barrel full of nasty-looking liquid."
+	icon = "icons/obj/objects_vr.dmi"
 	icon_state = "barrel"
 	modded = TRUE
 
@@ -433,7 +449,7 @@
 /obj/structure/reagent_dispensers/acid/Initialize()
 	. = ..()
 	reagents.add_reagent("sacid", 1000)
-	
+
 //Cooking oil refill tank
 /obj/structure/reagent_dispensers/cookingoil
 	name = "cooking oil tank"
@@ -457,14 +473,3 @@
 	reagents.splash_area(get_turf(src), 3)
 	visible_message(span("danger", "The [src] bursts open, spreading oil all over the area."))
 	qdel(src)
-
-/obj/structure/reagent_dispensers/he3
-	name = "fueltank"
-	desc = "A fueltank."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "weldtank"
-	amount_per_transfer_from_this = 10
-
-/obj/structure/reagent_dispenser/he3/Initialize()
-	..()
-	reagents.add_reagent("helium3",1000)
diff --git a/icons/obj/chemical_tanks.dmi b/icons/obj/chemical_tanks.dmi
new file mode 100644
index 00000000000..27754832044
Binary files /dev/null and b/icons/obj/chemical_tanks.dmi differ