diff --git a/apps/nspanel-lovelace-ui/luibackend/icons.py b/apps/nspanel-lovelace-ui/luibackend/icons.py
index 51edd1f4..b7f2396a 100644
--- a/apps/nspanel-lovelace-ui/luibackend/icons.py
+++ b/apps/nspanel-lovelace-ui/luibackend/icons.py
@@ -27,8 +27,37 @@ sensor_mapping_off = {
 }
 
 sensor_mapping = {
+    "apparent_power": "flash",
+    "aqi": "smog",
+    "battery": "battery",
+    "carbon_dioxide": "smog",
+    "carbon_monoxide": "smog",
+    "current": "flash",
+    "date": "calendar",
+    "duration": "timer",
+    "energy": "flash",
+    "frequency": "chart-bell-curve",
+    "gas": "gas-cylinder",
+    "humidity": "air-humidifier",
+    "illuminance": "light",
+    "monetary": "cash",
+    "nitrogen_dioxide": "smog",
+    "nitrogen_monoxide": "smog",
+    "nitrous_oxide": "smog",
+    "ozone": "smog",
+    "pm1": "smog",
+    "pm10": "smog",
+    "pm25": "smog",
+    "power_factor": "flash",
+    "power": "flash",
+    "pressure": "gauge",
+    "reactive_power": "flash",
+    "signal_strength": "signal",
+    "sulphur_dioxide": "smog",
     "temperature": "thermometer",
-    "power": "flash"    
+    "timestamp": "calendar-clock",
+    "volatile_organic_compounds": "smog",
+    "voltage": "flash"
 }
 
 cover_mapping_open = {
@@ -37,8 +66,8 @@ cover_mapping_open = {
     "curtain":  "curtains-closed",
     "damper":   "checkbox-blank-circle",
     "door":     "door-open",
-    "garage":   "garage-open",
-    "gate":     "gate-open",
+    "garage":   "garage",
+    "gate":     "gate",
     "shade":    "blinds-open",
     "shutter":  "window-shutter-open",
     "window":   "window-open"
@@ -50,8 +79,8 @@ cover_mapping_closed = {
     "curtain":  "curtains",
     "damper":   "circle-slice-8",
     "door":     "door-closed",
-    "garage":   "garage",
-    "gate":     "gate",
+    "garage":   "garage-open",
+    "gate":     "gate-open",
     "shade":    "blinds",
     "shutter":  "window-shutter",
     "window":   "window-closed"