diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index 9b33350886e..7ac5b3e6aa0 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -25,7 +25,7 @@
 
 /obj/item/reagent_containers/pill/random_drugs/Initialize(mapload)
 	. = ..()
-	icon_state = "pill[rand(1,20)]"
+	icon_state = "pill[rand(1,28)]"
 
 	name = "[pick_list("chemistry_tools.json", "CYBERPUNK_drug_prefixes")] [pick_list("chemistry_tools.json", "CYBERPUNK_drug_suffixes")]"
 
diff --git a/code/modules/asset_cache/assets/asset_chem_master.dm b/code/modules/asset_cache/assets/asset_chem_master.dm
index a91776becdd..76b4ca160a2 100644
--- a/code/modules/asset_cache/assets/asset_chem_master.dm
+++ b/code/modules/asset_cache/assets/asset_chem_master.dm
@@ -3,7 +3,7 @@
 	name = "chem_master"
 
 /datum/asset/spritesheet/chem_master/create_spritesheets()
-	for(var/pill_type in 1 to 20)
+	for(var/pill_type in 1 to 28)
 		Insert("pill[pill_type]", 'icons/obj/chemical.dmi', "pill[pill_type]")
 	for(var/bandaid_type in 1 to 21)
 		Insert("bandaid[bandaid_type]", 'icons/obj/chemical.dmi', "bandaid[bandaid_type]")
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 417063a8325..a51034df84d 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -1,4 +1,4 @@
-#define MAX_PILL_SPRITE 20 //max icon state of the pill sprites
+#define MAX_PILL_SPRITE 28 //max icon state of the pill sprites
 #define MAX_PATCH_SPRITE 21 //max icon state of the patch sprites
 #define MAX_CUSTOM_NAME_LEN 64 // Max length of a custom pill/condiment/whatever
 
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index f8293408638..07c31d908e1 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -14,7 +14,7 @@
 /obj/item/reagent_containers/pill/Initialize(mapload)
 	. = ..()
 	if(!icon_state)
-		icon_state = "pill[rand(1, 20)]"
+		icon_state = "pill[rand(1, 28)]"
 
 /obj/item/reagent_containers/pill/activate_self(mob/user)
 	if(..())
@@ -79,13 +79,13 @@
 /obj/item/reagent_containers/pill/tox
 	name = "\improper Toxin pill"
 	desc = "Highly toxic."
-	icon_state = "pill21"
+	icon_state = "pill_skull"
 	list_reagents = list("toxin" = 50)
 
 /obj/item/reagent_containers/pill/initropidril
 	name = "\improper Initropidril pill"
 	desc = "Don't swallow this."
-	icon_state = "pill21"
+	icon_state = "pill_skull"
 	list_reagents = list("initropidril" = 50)
 
 /obj/item/reagent_containers/pill/fakedeath
@@ -204,7 +204,7 @@
 /obj/item/reagent_containers/pill/lazarus_reagent
 	name = "\improper Lazarus Reagent pill"
 	desc = "Miraculous drug used for revival. Use with caution. Improper use may cause bodies to violently blow apart."
-	icon_state = "pill9"
+	icon_state = "pill26"
 	list_reagents = list("lazarus_reagent" = 1)
 
 /obj/item/reagent_containers/pill/rezadone
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 49dde27ba2b..338fe01d38b 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ