diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm
index e64b00553a365b..5b08b0122d818b 100644
--- a/code/datums/mood_events/drink_events.dm
+++ b/code/datums/mood_events/drink_events.dm
@@ -49,6 +49,6 @@
 	timeout = 10 MINUTES
 
 /datum/mood_event/wellcheers
-	description = "What a tasty can of Wellcheers! The salty grape taste is a great pick-me-up."
+	description = "What a tasty can of Wellcheers! The salty grape flavor is a great pick-me-up."
 	mood_change = 3
 	timeout = 7 MINUTES
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 7952142bc43ac3..4fe48c629efdd9 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -615,12 +615,12 @@
 
 /datum/reagent/consumable/wellcheers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_drowsiness(3 SECONDS * REM * seconds_per_tick)
-	switch(affected_mob.mob_mood.mood_level)
-		if (MOOD_LEVEL_SAD4 to MOOD_LEVEL_SAD2)
+	switch(affected_mob.mob_mood.sanity_level)
+		if (SANITY_INSANE to SANITY_CRAZY)
 			affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, 0)
-		if (MOOD_LEVEL_SAD2 to MOOD_LEVEL_HAPPY2)
+		if (SANITY_UNSTABLE to SANITY_DISTURBED)
 			affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers)
-		if (MOOD_LEVEL_HAPPY2 to MOOD_LEVEL_HAPPY4)
+		if (SANITY_NEUTRAL to SANITY_GREAT)
 			affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, 0)
 	return ..()
 
diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm
index 0256585a32aa6a..0be90bc7a70f7e 100644
--- a/code/modules/reagents/reagent_containers/cups/soda.dm
+++ b/code/modules/reagents/reagent_containers/cups/soda.dm
@@ -306,7 +306,7 @@
 /obj/item/reagent_containers/cup/soda_cans/beer
 	name = "space beer"
 	desc = "Canned beer. In space."
-	icon_state = "beer"
+	icon_state = "space_beer"
 	volume = 40
 	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 40)
 	drink_type = GRAIN
diff --git a/icons/mob/inhands/items/drinks_lefthand.dmi b/icons/mob/inhands/items/drinks_lefthand.dmi
index b1aa5e67822baa..fb2d9c22dd491c 100644
Binary files a/icons/mob/inhands/items/drinks_lefthand.dmi and b/icons/mob/inhands/items/drinks_lefthand.dmi differ
diff --git a/icons/mob/inhands/items/drinks_righthand.dmi b/icons/mob/inhands/items/drinks_righthand.dmi
index 3d1110960443ff..13f9dc0a0264d4 100644
Binary files a/icons/mob/inhands/items/drinks_righthand.dmi and b/icons/mob/inhands/items/drinks_righthand.dmi differ
diff --git a/icons/obj/drinks/soda.dmi b/icons/obj/drinks/soda.dmi
index d636412b86ad0f..f061e029c4dc9e 100644
Binary files a/icons/obj/drinks/soda.dmi and b/icons/obj/drinks/soda.dmi differ
diff --git a/icons/obj/service/janitor.dmi b/icons/obj/service/janitor.dmi
index 05a9e0b1773ae6..8c73a99b416424 100644
Binary files a/icons/obj/service/janitor.dmi and b/icons/obj/service/janitor.dmi differ