diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 701b8ac28ef..8d2fde546e3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1,4 +1,4 @@
-# TODO: Find remaining cans and move to drinks_cans
+# TODO: Find remaining cans and move to drinks_cans   b-52
 # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml
 # When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_glass.yml
 - type: entity
@@ -312,6 +312,16 @@
         reagents:
         - ReagentId: ArnoldPalmer
           Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    layers:
+      - state: icon_empty
+      - state: fill-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: fill-
+    changeColor: false
   - type: Icon
     sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
     state: icon
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png
new file mode 100644
index 00000000000..5388d5f4d61
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png
new file mode 100644
index 00000000000..50dd9f17682
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png
new file mode 100644
index 00000000000..2348a91a5a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png
new file mode 100644
index 00000000000..776d81f0ff0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-5.png
new file mode 100644
index 00000000000..ebac631f0a7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png
new file mode 100644
index 00000000000..c4b0f70ef0e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
index f76e6118413..6b5f532ce84 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
@@ -1,14 +1,34 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png
new file mode 100644
index 00000000000..9bc3efba81e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png
new file mode 100644
index 00000000000..f4fbc995d24
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png
new file mode 100644
index 00000000000..8b917708d91
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png
new file mode 100644
index 00000000000..5adc80beb48
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-5.png
new file mode 100644
index 00000000000..384486c2bb7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png
new file mode 100644
index 00000000000..a75713fd074
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
index d16d731d7f8..e9613b3486d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
@@ -1,22 +1,88 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "size": {
-      "x": 32,
-      "y": 32
+    "size":
+    {
+        "x": 32,
+        "y": 32
     },
-    "states": [
-      {
-        "name": "icon",
-        "delays": [
-        [
-            1,
-            1,
-            1,
-            1
-        ]
-      ]
-    }
-  ]
-}
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+		{
+			"name": "fill-4",
+			"delays":
+			[
+				[
+					1.0,
+					1.0,
+					1.0,
+					1.0
+				]
+			]
+		},
+		{
+            "name": "fill-5",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png
new file mode 100644
index 00000000000..3d3fbce79ed
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png
new file mode 100644
index 00000000000..9a9c80cad08
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png
new file mode 100644
index 00000000000..38d7004a4e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png
new file mode 100644
index 00000000000..e0cdeea7954
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-5.png
new file mode 100644
index 00000000000..ae10ecfdb7d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png
index 88fdd5e79b9..48c098c0c33 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png
new file mode 100644
index 00000000000..1db09fb0af2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
index f76e6118413..6b5f532ce84 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
@@ -1,14 +1,34 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
-}
+}
\ No newline at end of file