diff --git a/src/common/const.ts b/src/common/const.ts
index ae2717069c..bee36ffee8 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -13,6 +13,7 @@ import {
   mdiBullhorn,
   mdiCalendar,
   mdiCalendarClock,
+  mdiCarCoolantLevel,
   mdiCash,
   mdiClock,
   mdiCloudUpload,
@@ -55,6 +56,7 @@ import {
   mdiThermostat,
   mdiTimerOutline,
   mdiVideo,
+  mdiWater,
   mdiWaterPercent,
   mdiWeatherCloudy,
   mdiWeatherPouring,
@@ -154,7 +156,8 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   timestamp: mdiClock,
   volatile_organic_compounds: mdiMolecule,
   voltage: mdiSineWave,
-  // volume: TBD, => no well matching icon found
+  volume: mdiCarCoolantLevel,
+  water: mdiWater,
   weight: mdiWeight,
 };
 
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index bc77838a9a..8ad532f55c 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -121,6 +121,7 @@ const OVERRIDE_SENSOR_UNITS = {
   speed: ["ft/s", "in/d", "in/h", "km/h", "kn", "m/s", "mm/d", "mm/h", "mph"],
   temperature: ["°C", "°F", "K"],
   volume: ["fl. oz.", "ft³", "gal", "L", "mL", "m³"],
+  water: ["ft³", "gal", "L", "m³"],
   weight: ["g", "kg", "lb", "mg", "oz", "µg"],
 };