diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index a3c511df48..f76dac86bf 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -37,25 +37,26 @@
 /obj/item/weapon/reagent_containers/glass/bottle/update_icon()
 	cut_overlays()
 
-	if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4"))
+	if(reagents.total_volume)
 		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)
-			if(0 to 9)		filling.icon_state = "[icon_state]--10"
-			if(10 to 24) 	filling.icon_state = "[icon_state]-10"
-			if(25 to 49)	filling.icon_state = "[icon_state]-25"
-			if(50 to 74)	filling.icon_state = "[icon_state]-50"
-			if(75 to 79)	filling.icon_state = "[icon_state]-75"
-			if(80 to 90)	filling.icon_state = "[icon_state]-80"
-			if(91 to INFINITY)	filling.icon_state = "[icon_state]-100"
+			if(0.1 to 20)	filling.icon_state = "[icon_state]-10"
+			if(20 to 40) 	filling.icon_state = "[icon_state]-20"
+			if(40 to 60)	filling.icon_state = "[icon_state]-40"
+			if(60 to 80)	filling.icon_state = "[icon_state]-60"
+			if(80 to 100)	filling.icon_state = "[icon_state]-80"
+			if(100 to INFINITY)	filling.icon_state = "[icon_state]-100"
 
 		filling.color = reagents.get_color()
 		add_overlay(filling)
 
 	if (!is_open_container())
-		var/image/lid = image(icon, src, "lid_bottle")
-		add_overlay(lid)
+		add_overlay("lid_[initial(icon_state)]")
+
+	if (label_text)
+		add_overlay("label_[initial(icon_state)]")
 
 /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
 	name = "inaprovaline bottle"
diff --git a/code/modules/reagents/machinery/chem_master_vr.dm b/code/modules/reagents/machinery/chem_master_vr.dm
deleted file mode 100644
index 551132e7c4..0000000000
--- a/code/modules/reagents/machinery/chem_master_vr.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/obj/machinery/chem_master
-	icon = 'icons/obj/chemical_vr.dmi'
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 12b4694e21..b18f175ad6 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -148,6 +148,7 @@
 	else
 		name = "[base_name] ([label_text])"
 	desc = "[base_desc] It is labeled \"[label_text]\"."
+	update_icon()
 
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
@@ -187,13 +188,12 @@
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)
-			if(0 to 9)		filling.icon_state = "[icon_state]-10"
-			if(10 to 24) 	filling.icon_state = "[icon_state]10"
-			if(25 to 49)	filling.icon_state = "[icon_state]25"
-			if(50 to 74)	filling.icon_state = "[icon_state]50"
-			if(75 to 79)	filling.icon_state = "[icon_state]75"
-			if(80 to 90)	filling.icon_state = "[icon_state]80"
-			if(91 to INFINITY)	filling.icon_state = "[icon_state]100"
+			if(0.1 to 20)	filling.icon_state = "[icon_state]-10"
+			if(20 to 40) 	filling.icon_state = "[icon_state]-20"
+			if(40 to 60)	filling.icon_state = "[icon_state]-40"
+			if(60 to 80)	filling.icon_state = "[icon_state]-60"
+			if(80 to 100)	filling.icon_state = "[icon_state]-80"
+			if(100 to INFINITY)	filling.icon_state = "[icon_state]-100"
 
 		filling.color = reagents.get_color()
 		add_overlay(filling)
@@ -201,6 +201,9 @@
 	if (!is_open_container())
 		add_overlay("lid_[initial(icon_state)]")
 
+	if (label_text)
+		add_overlay("label_[initial(icon_state)]")
+
 /obj/item/weapon/reagent_containers/glass/beaker/large
 	name = "large beaker"
 	desc = "A large beaker."
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index fb8c8d2c3d..ed4dab3407 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi
index ce49f9d4e8..1046726245 100644
Binary files a/icons/obj/chemical_vr.dmi and b/icons/obj/chemical_vr.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index ebf7292781..a0088064db 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index d80feb7101..84b7173d00 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3543,7 +3543,6 @@
 #include "code\modules\reagents\hoses\hose.dm"
 #include "code\modules\reagents\hoses\hose_connector.dm"
 #include "code\modules\reagents\machinery\chem_master.dm"
-#include "code\modules\reagents\machinery\chem_master_vr.dm"
 #include "code\modules\reagents\machinery\chemalyzer.dm"
 #include "code\modules\reagents\machinery\distillery.dm"
 #include "code\modules\reagents\machinery\grinder.dm"