diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index d76c978bed..184c458754 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -9,7 +9,17 @@
     price: 750
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
-    state: fueltank
+    layers:
+      - state: fueltank-2
+      - state: fueltank-2-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: fueltank-2-
+  - type: ExaminableSolution
+    solution: tank
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
@@ -43,7 +53,15 @@
     price: 2500
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
-    state: highfueltank
+    layers:
+      - state: highfueltank-2
+      - state: highfueltank-2-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 7
+    fillBaseName: highfueltank-2-
   - type: SolutionContainerManager
     solutions:
       tank:
@@ -66,7 +84,17 @@
     price: 500
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
-    state: watertank
+    layers:
+      - state: watertank-2
+      - state: watertank-2-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: watertank-2-
+  - type: ExaminableSolution
+    solution: tank
 
 - type: entity
   parent: WaterTank
@@ -101,7 +129,15 @@
   components:
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
-    state: highwatertank
+    layers:
+      - state: highwatertank-2
+      - state: highwatertank-2-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 7
+    fillBaseName: highwatertank-2-
   - type: SolutionContainerManager
     solutions:
       tank:
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png
new file mode 100644
index 0000000000..7762e72127
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png
new file mode 100644
index 0000000000..28611bf058
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png
new file mode 100644
index 0000000000..c4cb4609d5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png
new file mode 100644
index 0000000000..5a193dc798
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-1.png
new file mode 100644
index 0000000000..7ee4ba996c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-1.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-2.png
new file mode 100644
index 0000000000..94399242b9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-3.png
new file mode 100644
index 0000000000..3a44e4c45c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-3.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-4.png
new file mode 100644
index 0000000000..4bd1de4bb6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-4.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-5.png
new file mode 100644
index 0000000000..41a42d683d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-5.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-6.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-6.png
new file mode 100644
index 0000000000..2da7e8de26
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-6.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-7.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-7.png
new file mode 100644
index 0000000000..3d880f1322
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-7.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png
new file mode 100644
index 0000000000..221b2c62f5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-1.png
new file mode 100644
index 0000000000..7ee4ba996c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-1.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-2.png
new file mode 100644
index 0000000000..94399242b9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-3.png
new file mode 100644
index 0000000000..3a44e4c45c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-3.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-4.png
new file mode 100644
index 0000000000..0d05a27c5d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-4.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-5.png
new file mode 100644
index 0000000000..50b6075df5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-5.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-6.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-6.png
new file mode 100644
index 0000000000..5d0e0c5713
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-6.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-7.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-7.png
new file mode 100644
index 0000000000..e610d87d82
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-7.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png
new file mode 100644
index 0000000000..817873ed92
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
index 4b2af414d1..fdcadad7c5 100644
--- a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
@@ -21,6 +21,84 @@
     },
     {
       "name": "watercooler"
+    },
+    {
+      "name": "watertank-2"
+    },
+    {
+      "name": "watertank-2-1"
+    },
+    {
+      "name": "watertank-2-2"
+    },
+    {
+      "name": "watertank-2-3"
+    },
+    {
+      "name": "watertank-2-4"
+    },
+    {
+      "name": "watertank-2-5"
+    },
+    {
+      "name": "fueltank-2"
+    },
+    {
+      "name": "fueltank-2-1"
+    },
+    {
+      "name": "fueltank-2-2"
+    },
+    {
+      "name": "fueltank-2-3"
+    },
+    {
+      "name": "highwatertank-2"
+    },
+    {
+      "name": "highwatertank-2-1"
+    },
+    {
+      "name": "highwatertank-2-2"
+    },
+    {
+      "name": "highwatertank-2-3"
+    },
+    {
+      "name": "highwatertank-2-4"
+    },
+    {
+      "name": "highwatertank-2-5"
+    },
+    {
+      "name": "highwatertank-2-6"
+    },
+    {
+      "name": "highwatertank-2-7"
+    },
+    {
+      "name": "highfueltank-2"
+    },
+    {
+      "name": "highfueltank-2-1"
+    },
+    {
+      "name": "highfueltank-2-2"
+    },
+    {
+      "name": "highfueltank-2-3"
+    },
+    {
+      "name": "highfueltank-2-4"
+    },
+    {
+      "name": "highfueltank-2-5"
+    },
+    {
+      "name": "highfueltank-2-6"
+    },
+    {
+      "name": "highfueltank-2-7"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-1.png
new file mode 100644
index 0000000000..41c5afb881
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-1.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-2.png
new file mode 100644
index 0000000000..6c353994c4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-3.png
new file mode 100644
index 0000000000..f0218c89d2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-3.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-4.png
new file mode 100644
index 0000000000..75505d0e5c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-4.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-5.png
new file mode 100644
index 0000000000..e81b6e9974
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-5.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png
new file mode 100644
index 0000000000..184f831458
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png differ