diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 0412c93626b..fa97f569194 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -37,11 +37,17 @@
 	extinguish()
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
+	overlays.Cut()
 	if(reagents.reagent_list.len)
 		var/datum/reagent/R = reagents.get_master_reagent()
-		icon_state = R.drink_icon
 		name = R.drink_name
 		desc = R.drink_desc
+		if(R.drink_icon)
+			icon_state = R.drink_icon
+		else
+			var/image/I = image(icon, "glassoverlay")
+			I.color = mix_color_from_reagents(reagents.reagent_list)
+			overlays += I
 	else
 		icon_state = "glass_empty"
 		name = "glass"
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index db77f30e76b..cdc214c3089 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -26,7 +26,7 @@
 	var/last_addiction_dose = 0
 	var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick.
 	var/current_cycle = 1
-	var/drink_icon = "glass_brown" // what icon state/name/description a drinking glass will use if this is the master reagent.
+	var/drink_icon = null
 	var/drink_name = "Glass of ..what?"
 	var/drink_desc = "You can't really tell what this is."
 
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 730c5d5632c..52eb53ac436 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ