diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index ace72d08bdb..735ba45483a 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -216,8 +216,8 @@
 		icon_state = "water_cup_e"
 
 /obj/item/weapon/reagent_containers/food/drinks/sillycup/MouseDrop(obj/over_object as obj)
-	if(!reagents.total_volume)
-		if(istype(over_object, /obj/structure/reagent_dispensers/water_cooler))
+	if(!reagents.total_volume && istype(over_object, /obj/structure/reagent_dispensers/water_cooler))
+		if(over_object.Adjacent(usr))
 			var/obj/structure/reagent_dispensers/water_cooler/W = over_object
 			if(W.cupholder && W.cups < 10)
 				W.cups++
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 7f44439047d..8c5184956eb 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -311,7 +311,7 @@
 		new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc)
 		cups--
 		update_icon()
-	return
+		return
 
 /obj/structure/reagent_dispensers/water_cooler/update_icon()
 	icon_state = "water_cooler"
diff --git a/icons/atmos/tank.dmi b/icons/atmos/tank.dmi
index 857b3239a1e..322f43e8f09 100644
Binary files a/icons/atmos/tank.dmi and b/icons/atmos/tank.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 3656dadce45..388575deb13 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/paper.dmi b/icons/obj/paper.dmi
index 1f881a5de50..5402b928296 100644
Binary files a/icons/obj/paper.dmi and b/icons/obj/paper.dmi differ