diff --git a/apps/predbat/predbat.py b/apps/predbat/predbat.py
index 870315e4d..f2c0f102a 100644
--- a/apps/predbat/predbat.py
+++ b/apps/predbat/predbat.py
@@ -77,8 +77,8 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "fraction",
-        "icon": "mdi:percent",
+        "unit": "*",
+        "icon": "mdi:multiplication",
         "default": 0.15,
     },
     {
@@ -88,7 +88,7 @@
         "min": 0,
         "max": 2.0,
         "step": 0.01,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.0,
     },
@@ -99,7 +99,7 @@
         "min": 0,
         "max": 2.0,
         "step": 0.01,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.0,
     },
@@ -110,7 +110,7 @@
         "min": 0,
         "max": 2.0,
         "step": 0.01,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.1,
     },
@@ -121,7 +121,7 @@
         "min": 0,
         "max": 2.0,
         "step": 0.01,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.0,
     },
@@ -132,7 +132,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.0,
     },
@@ -143,7 +143,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.0,
     },
@@ -154,7 +154,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:call-split",
         "default": 0.03,
     },
@@ -165,7 +165,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:call-split",
         "default": 0.03,
     },
@@ -176,7 +176,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:call-split",
         "default": 0.04,
     },
@@ -190,7 +190,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "default": 1.0,
     },
@@ -223,7 +223,7 @@
         "min": 0,
         "max": 1.0,
         "step": 0.01,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:call-split",
         "default": 0.08,
     },
@@ -305,7 +305,7 @@
         "min": 0,
         "max": 2.0,
         "step": 0.1,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "enable": "expert_mode",
         "default": 1.0,
@@ -341,7 +341,7 @@
         "min": 0.5,
         "max": 2.0,
         "step": 0.05,
-        "unit": "fraction",
+        "unit": "*",
         "icon": "mdi:call-split",
         "enable": "expert_mode",
         "default": 0.95,
@@ -372,7 +372,7 @@
         "min": 0.00,
         "max": 2.00,
         "step": 0.05,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "enable": "expert_mode",
         "default": 0.0,
@@ -384,7 +384,7 @@
         "min": 0.00,
         "max": 2.00,
         "step": 0.05,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "enable": "expert_mode",
         "default": 0.0,
@@ -549,7 +549,7 @@
         "min": 0,
         "max": 2.0,
         "step": 0.1,
-        "unit": "multiple",
+        "unit": "*",
         "icon": "mdi:multiplication",
         "enable": "iboost_enable",
         "default": 1.0,
@@ -573,7 +573,7 @@
         "min": 0,
         "max": 3500,
         "step": 100,
-        "unit": "w",
+        "unit": "W",
         "enable": "iboost_enable",
         "default": 2400,
         "restore": False,
@@ -585,7 +585,7 @@
         "min": 0,
         "max": 3500,
         "step": 100,
-        "unit": "w",
+        "unit": "W",
         "enable": "iboost_enable",
         "default": 500,
     },
@@ -10923,7 +10923,14 @@ def expose_config(self, name, value, quiet=True, event=False):
                         self.set_state(
                             entity_id=entity,
                             state=value,
-                            attributes={"friendly_name": item["friendly_name"], "min": item["min"], "max": item["max"], "step": item["step"], "icon": icon},
+                            attributes={
+                                "friendly_name": item["friendly_name"],
+                                "min": item["min"],
+                                "max": item["max"],
+                                "step": item["step"],
+                                "unit_of_measurement": item["unit"],
+                                "icon": icon,
+                            },
                         )
                     elif item["type"] == "switch":
                         icon = item.get("icon", "mdi:light-switch")