diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index ddf7fa6bc6..5eecc6962a 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -19,6 +19,13 @@
 	open = round(rand(0, 1))
 	update_icon()
 
+/obj/structure/toilet/Destroy()
+	if(loc)
+		for(var/A in contents)
+			var/atom/movable/AM = A
+			AM.forceMove(loc)
+	return ..()
+
 /obj/structure/toilet/attack_hand(mob/living/user)
 	. = ..()
 	if(.)
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 9899d219bf..50e818abe6 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -32,7 +32,7 @@
 	for (var/x in 1 to PILL_STYLE_COUNT)
 		var/list/SL = list()
 		SL["id"] = x
-		SL["htmltag"] = assets.icon_tag("pill[x]")
+		SL["htmltag"] = assets.icon_class_name("pill[x]")
 		pillStyles += list(SL)
 
 	. = ..()