diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm
index be0dcf91d21..412ec06cc0f 100644
--- a/code/modules/hydroponics/trays/tray_reagents.dm
+++ b/code/modules/hydroponics/trays/tray_reagents.dm
@@ -128,29 +128,6 @@
 /obj/item/reagent_containers/glass/fertilizer/update_icon()
 	cut_overlays()
 
-	if(reagents.total_volume)
-		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "plastic_jug10")
-
-		var/percent = round((reagents.total_volume / volume) * 100)
-		switch(percent)
-			if(1 to 10)
-				filling.icon_state = "plastic_jug-10"
-			if(11 to 29)
-				filling.icon_state = "plastic_jug25"
-			if(30 to 45)
-				filling.icon_state = "plastic_jug40"
-			if(46 to 61)
-				filling.icon_state = "plastic_jug55"
-			if(62 to 77)
-				filling.icon_state = "plastic_jug70"
-			if(78 to 92)
-				filling.icon_state = "plastic_jug85"
-			if(99 to INFINITY)
-				filling.icon_state = "plastic_jug100"
-
-		filling.color = reagents.get_color()
-		add_overlay(filling)
-
 	if(!is_open_container())
 		add_overlay("lid_jug")
 
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 18b8c104700..8a1a006a40a 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -6,7 +6,7 @@
 		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
 		)
-	icon_state = "dropper0"
+	icon_state = "dropper"
 	item_state = "dropper"
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(1,2,3,4,5)
@@ -91,10 +91,11 @@
 	update_icon()
 
 /obj/item/reagent_containers/dropper/update_icon()
-	if(reagents.total_volume)
-		icon_state = "dropper1"
-	else
-		icon_state = "dropper0"
+	cut_overlays()
+	if(reagents)
+		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]")
+		filling.color = reagents.get_color()
+		add_overlay(filling)
 
 /obj/item/reagent_containers/dropper/AltClick(mob/user)
 	var/N = input("Amount per transfer from this:", "[src]") as null|anything in possible_transfer_amounts
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 9908c67c533..231a6903ee3 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -136,31 +136,31 @@
 /obj/item/reagent_containers/pill/corophenidate
 	name = "2u Corophenidate Pill"
 	desc = "Improves the ability to concentrate."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/corophenidate = 2)
 
 /obj/item/reagent_containers/pill/emoxanyl
 	name = "2u Emoxanyl Pill"
 	desc = "Used to treat anxiety disorders, depression and epilepsy."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/emoxanyl = 2)
 
 /obj/item/reagent_containers/pill/minaphobin
 	name = "2u Minaphobin Pill"
 	desc = "Used to treat anxiety disorders and depression."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/minaphobin = 2)
 
 /obj/item/reagent_containers/pill/nerospectan
 	name = "2u Nerospectan Pill"
 	desc = "Used to treat a large variety of disorders including tourettes, depression, anxiety and psychosis."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/nerospectan = 2)
 
 /obj/item/reagent_containers/pill/neurapan
 	name = "2u Neurapan Pill"
 	desc = "Used to treat a large variety of disorders including tourettes, depression, anxiety and psychosis."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/neurapan = 2)
 
 /obj/item/reagent_containers/pill/neurostabin
@@ -172,13 +172,13 @@
 /obj/item/reagent_containers/pill/orastabin
 	name = "2u Orastabin Pill"
 	desc = "Used to treat anxiety disorders and speech impediments."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/orastabin = 2)
 
 /obj/item/reagent_containers/pill/parvosil
 	name = "2u Parvosil Pill"
 	desc = "Used to treat anxiety disorders such as phobias and social anxiety."
-	icon_state = "pill8"
+	icon_state = "pill22"
 	reagents_to_add = list(/decl/reagent/mental/parvosil = 2)
 
 /obj/item/reagent_containers/pill/inaprovaline
@@ -226,7 +226,7 @@
 /obj/item/reagent_containers/pill/happy
 	name = "Happy Pill"
 	desc = "Happy happy joy joy!"
-	icon_state = "pill18"
+	icon_state = "pill_happy"
 	reagents_to_add = list(/decl/reagent/space_drugs = 15, /decl/reagent/sugar = 15)
 
 /obj/item/reagent_containers/pill/zoom
diff --git a/html/changelogs/wezzy_chemsprite.yml b/html/changelogs/wezzy_chemsprite.yml
new file mode 100644
index 00000000000..8b28c8d0f9f
--- /dev/null
+++ b/html/changelogs/wezzy_chemsprite.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow, Kokonut
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - imageadd: "Adds new sprites for pills and pill bottles, by Kokonut. Resprites Chem-master to have the same color pallete as the chemical dispensers, and the chemical cartriges. Adds new chemical jugs, ported from Goon, and new dropper sprite from TG."
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 0ac820f1795..f407dccd244 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 263aeb1cf63..cf5d330e066 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ