diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 6ddcfee053..866c45ef86 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -176,6 +176,14 @@
         maxVol: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coffee.rsi
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-4
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: icon-
   - type: TrashOnEmpty
     solution: drink
 
@@ -194,7 +202,14 @@
         maxVol: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
-    state: icon-1
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-4
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: icon-
   - type: TrashOnEmpty
     solution: drink
 
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png
new file mode 100644
index 0000000000..d2a5ef967a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png
new file mode 100644
index 0000000000..c97ead8da8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png
new file mode 100644
index 0000000000..18ff175dad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png
new file mode 100644
index 0000000000..a60b6edb6d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png
new file mode 100644
index 0000000000..52a03df508
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon.png
deleted file mode 100644
index cc4cdaddf0..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
index db0ac608ed..6dfbe5d8c0 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"license": "CC-BY-SA-3.0",
+	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+	"states": [{
+            "name": "icon-0"
+        },
+        {
+            "name": "icon-1"
+        },
+		{
+            "name": "icon-2"
+        },
+		{
+            "name": "icon-3"
+        },
+		{
+            "name": "icon-4"
+        }
+	]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png
index 0e11389341..df42a8ec1a 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png
new file mode 100644
index 0000000000..ffbb58ec4c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png
new file mode 100644
index 0000000000..33c8d61792
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png
new file mode 100644
index 0000000000..b00f04faea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
index 80ac521b6f..6e813512e7 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
@@ -12,6 +12,15 @@
         },
         {
             "name": "icon-1"
+        },
+		{
+            "name": "icon-2"
+        },
+		{
+            "name": "icon-3"
+        },
+		{
+            "name": "icon-4"
         }
     ]
 }
\ No newline at end of file