diff --git a/apps/nspanel-lovelace-ui/color.py b/apps/nspanel-lovelace-ui/color.py
index a4ff030a..0ca15c05 100644
--- a/apps/nspanel-lovelace-ui/color.py
+++ b/apps/nspanel-lovelace-ui/color.py
@@ -19,6 +19,12 @@ def pos_to_color(x, y):
     rgb = hsv2rgb(hsv[0],hsv[1],hsv[2])
     return rgb
 
+def rgb_brightness(rgb_color, brightness):
+    red = rgb_color[0]/255*brightness
+    green = rgb_color[1]/255*brightness
+    blue = rgb_color[2]/255*brightness
+    return [red, green, blue]
+
 def rgb_dec565(rgb_color):
     red = rgb_color[0]
     green = rgb_color[1]
diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
index 6eb90f4c..0bf29691 100644
--- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
+++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
@@ -1,7 +1,7 @@
 import json
 import datetime
 import hassapi as hass
-from color import pos_to_color, rgb_dec565
+from color import pos_to_color, rgb_dec565, rgb_brightness
 
 # check Babel
 import importlib
@@ -367,7 +367,10 @@ class NsPanelLovelaceUI:
       icon_color = 17299
 
       if "rgb_color" in entity.attributes:
-        icon_color = rgb_dec565(entity.attributes.rgb_color)
+        color = entity.attributes.rgb_color
+        if "brightness" in entity.attributes:
+          color = rgb_brightness(color, entity.attributes.brightness)
+        icon_color = rgb_dec565(color)
 
       return f",{item_type},{item},1,{icon_color},{name},{switch_val}"