diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 6e207e39c2..7c7c75b8f8 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -203,7 +203,9 @@
 - type: alert
   id: Peckish
   category: Hunger
-  icons: [ /Textures/Interface/Alerts/Hunger/Peckish.png ]
+  icons:
+  - sprite: /Textures/Interface/Alerts/hunger.rsi
+    state: peckish
   name: alerts-hunger-name
   description: alerts-hunger-desc
 
@@ -233,21 +235,27 @@
 - type: alert
   id: Starving
   category: Hunger
-  icons: [ /Textures/Interface/Alerts/Hunger/Starving.png ]
+  icons:
+  - sprite: /Textures/Interface/Alerts/hunger.rsi
+    state: starving
   name: alerts-starving-name
   description: alerts-starving-desc
 
 - type: alert
   id: Thirsty
   category: Thirst
-  icons: [ /Textures/Interface/Alerts/Thirst/Thirsty.png ]
+  icons:
+  - sprite: /Textures/Interface/Alerts/thirst.rsi
+    state: thirsty
   name: alerts-thirsty-name
   description: alerts-thirsty-desc
 
 - type: alert
   id: Parched
   category: Thirst
-  icons: [ /Textures/Interface/Alerts/Thirst/Parched.png ]
+  icons:
+  - sprite: /Textures/Interface/Alerts/thirst.rsi
+    state: parched
   name: alerts-parched-name
   description: alerts-parched-desc
 
diff --git a/Resources/Textures/Interface/Alerts/Hunger/Overfed.png b/Resources/Textures/Interface/Alerts/Hunger/Overfed.png
deleted file mode 100644
index ef1eb0a208..0000000000
Binary files a/Resources/Textures/Interface/Alerts/Hunger/Overfed.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/Hunger/Peckish.png b/Resources/Textures/Interface/Alerts/Hunger/Peckish.png
deleted file mode 100644
index 1c72e56811..0000000000
Binary files a/Resources/Textures/Interface/Alerts/Hunger/Peckish.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/Hunger/Starving.png b/Resources/Textures/Interface/Alerts/Hunger/Starving.png
deleted file mode 100644
index 29d8b5eb0a..0000000000
Binary files a/Resources/Textures/Interface/Alerts/Hunger/Starving.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/Thirst/OverHydrated.png b/Resources/Textures/Interface/Alerts/Thirst/OverHydrated.png
deleted file mode 100644
index 48f6d2275f..0000000000
Binary files a/Resources/Textures/Interface/Alerts/Thirst/OverHydrated.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/Thirst/Parched.png b/Resources/Textures/Interface/Alerts/Thirst/Parched.png
deleted file mode 100644
index 82337a40b6..0000000000
Binary files a/Resources/Textures/Interface/Alerts/Thirst/Parched.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/Thirst/Thirsty.png b/Resources/Textures/Interface/Alerts/Thirst/Thirsty.png
deleted file mode 100644
index bed9947f90..0000000000
Binary files a/Resources/Textures/Interface/Alerts/Thirst/Thirsty.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/hunger.rsi/meta.json b/Resources/Textures/Interface/Alerts/hunger.rsi/meta.json
new file mode 100644
index 0000000000..77e0188816
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/hunger.rsi/meta.json
@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "GitHub @Keikiru, burgers.rsi (bigbite.png) modified by Swept and potato1234x originally from https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, bread.rsi (plate.png, garlic-slice.png) modified by potato1234x originally from https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5",
+    "size": { "x": 32, "y": 32 },
+    "states": [
+        { "name": "peckish", "directions": 1, "delays": [[1.0]] },
+        { "name": "starving", "directions": 1, "delays": [[0.5, 0.5]] },
+        { "name": "overfed", "directions": 1, "delays": [[1.0]] }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/hunger.rsi/overfed.png b/Resources/Textures/Interface/Alerts/hunger.rsi/overfed.png
new file mode 100644
index 0000000000..04ed003e05
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/hunger.rsi/overfed.png differ
diff --git a/Resources/Textures/Interface/Alerts/hunger.rsi/peckish.png b/Resources/Textures/Interface/Alerts/hunger.rsi/peckish.png
new file mode 100644
index 0000000000..e7f7d08a22
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/hunger.rsi/peckish.png differ
diff --git a/Resources/Textures/Interface/Alerts/hunger.rsi/starving.png b/Resources/Textures/Interface/Alerts/hunger.rsi/starving.png
new file mode 100644
index 0000000000..f9d9f14907
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/hunger.rsi/starving.png differ
diff --git a/Resources/Textures/Interface/Alerts/thirst.rsi/meta.json b/Resources/Textures/Interface/Alerts/thirst.rsi/meta.json
new file mode 100644
index 0000000000..3afe89dc61
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/thirst.rsi/meta.json
@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "GitHub @Keikiru, iceglass.rsi originally from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, parched.png big waterbottle derived from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, toilet.rsi originally from https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
+    "size": { "x": 32, "y": 32 },
+    "states": [
+        { "name": "thirsty", "directions": 1, "delays": [[1.0]] },
+        { "name": "parched", "directions": 1, "delays": [[0.5, 0.5]] },
+        { "name": "overhydrated", "directions": 1, "delays": [[1.0]] }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/thirst.rsi/overhydrated.png b/Resources/Textures/Interface/Alerts/thirst.rsi/overhydrated.png
new file mode 100644
index 0000000000..eda3395820
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/thirst.rsi/overhydrated.png differ
diff --git a/Resources/Textures/Interface/Alerts/thirst.rsi/parched.png b/Resources/Textures/Interface/Alerts/thirst.rsi/parched.png
new file mode 100644
index 0000000000..411e633b59
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/thirst.rsi/parched.png differ
diff --git a/Resources/Textures/Interface/Alerts/thirst.rsi/thirsty.png b/Resources/Textures/Interface/Alerts/thirst.rsi/thirsty.png
new file mode 100644
index 0000000000..fc7de1c9fa
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/thirst.rsi/thirsty.png differ