diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 2174359e64..58395f6f9b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -44,46 +44,60 @@
 
 - type: entity
   parent: DrinkBaseCup
+  id: DrinkBaseMug
+  abstract: true
+  name: base mug
+  description: A mug.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/mug.rsi
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-3
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: icon-
+
+- type: entity
+  parent: DrinkBaseMug
   id: DrinkMug
   name: mug
   description: A plain white mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugBlack
   name: mug black
   description: A sleek black mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_black.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugBlue
   name: mug blue
   description: A blue and black mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_blue.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugGreen
   name: mug green
   description: A pale green and pink mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_green.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseCup #this one doesn't have the proper layers in the rsi
   id: DrinkMugDog
   name: funny dog mug
   description: It looks like a cartoon beagle.
@@ -93,64 +107,58 @@
     state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugHeart
   name: mug heart
   description: A white mug, it prominently features a red heart.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_heart.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugMetal
   name: mug metal
   description: A metal mug. You're not sure which metal.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_metal.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugMoebius
   name: mug moebius
   description: A mug with a Moebius Laboratories logo on it. Not even your morning coffee is safe from corporate advertising.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_moebius.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugOne
   name: "#1 mug"
   description: "A white mug, it prominently features a #1."
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_one.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugRainbow
   name: mug rainbow
   description: A rainbow mug. The colors are almost as blinding as a welder.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_rainbow.rsi
-    state: icon-3
 
 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
   id: DrinkMugRed
   name: mug red
   description: A red and black mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_red.rsi
-    state: icon-3
 
 - type: entity
   parent: DrinkBaseCup
@@ -158,7 +166,6 @@
   name: Hot chocolate
   description: A heated drink consisting melted chocolate and heated milk.
   components:
-  - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coco.rsi
 
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png
index f6e6b9039d..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png
index 94cb197ef2..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png
index 4a73fa52fc..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png
index 31f5aa2508..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png
index 0781822f51..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png
index 45b46d9ccc..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png
index 0b79c72877..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png
index 5913371ac7..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png
index eb4a2d9787..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png
index a8186059b0..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png
index 973550bfb4..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png
index 657ec8c8da..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png
index 1141389a58..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png
index 9fbbefb3ab..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png
index 3e3e5b6ec0..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png
index 32e763a9fc..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png
index 315312dc8e..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png
index bc9594a474..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png
index 3d3b64cf51..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png
index af79b56d77..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png
index ef49a13740..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png
index f77dd6927a..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png
index f7008d15d4..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png
index 777aaba6aa..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png
index b59f2acf15..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png
index dd6efd4d0f..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png
index e715ab9113..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png
index 5e7753dbe3..af27fd3485 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png
index f6ce683902..39360e1cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png
index 5ed92d27cc..c46dd0db14 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png differ