diff --git a/custom_configuration/nspanel_blank.tft b/custom_configuration/nspanel_blank.tft
index 3e89ecc..1a7e177 100644
Binary files a/custom_configuration/nspanel_blank.tft and b/custom_configuration/nspanel_blank.tft differ
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index ef32ede..f883a7e 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -23,9 +23,6 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 🖼️ Home Assistant [Icon Page](https://htmlpreview.github.io/?https://github.com/jobr99/Generate-HASP-Fonts/blob/master/cheatsheet.html)
 
 
-🎨 [Color Converter](https://nodtem66.github.io/nextion-hmi-color-convert/index.html)
-
-
 📌 Step by Step - [Setup Video](https://www.youtube.com/watch?v=3afPFg6kUdc)
 
 
@@ -38,7 +35,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 🎉 Roadmap Roadmap can be found here [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap)
 
 
-ℹ️ Version: v.3.2
+ℹ️ Version: v.3.2.1
 
 '
 
@@ -332,8 +329,9 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         entity:
           domain:
             - binary_sensor
-            - sensor
+            - input_boolean
             - light
+            - sensor
             - switch
     chip01_icon:
       name: Chip 01 - ICON (Optional)
@@ -2358,7 +2356,7 @@ trigger_variables:
 
 variables:
   ##### GENERAL #####
-  blueprint_version: "3.2"
+  blueprint_version: "3.2.1"
   language: !input "language"
   date_format: !input "date_format"
   time_format: !input "time_format"
@@ -2544,15 +2542,15 @@ variables:
   home_button03_icon_color03: ""
   home_button04_icon: !input "home_button04_icon"  #E1ED
   home_button04_icon_color01_value: !input "home_button04_icon_color01"
-  home_button04_icon_color01: '{{ ((home_button04_icon_color01_value[0] //(2**3)) *(2**11))+((home_button04_icon_color01_value[1] //(2**2)) *(2**5))+(home_button04_icon_color01_value[2] //(2**3)) }}' # Notification
+  home_button04_icon_color01: '{% set rgb = home_button04_icon_color01_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_button04_icon_color02_value: !input "home_button04_icon_color02"
-  home_button04_icon_color02: '{{ ((home_button04_icon_color02_value[0] //(2**3)) *(2**11))+((home_button04_icon_color02_value[1] //(2**2)) *(2**5))+(home_button04_icon_color02_value[2] //(2**3)) }}' # RED Notification
+  home_button04_icon_color02: '{% set rgb = home_button04_icon_color02_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_button05_icon: !input "home_button05_icon"  #E432
   home_button05_icon_color_value: !input "home_button05_icon_color"
-  home_button05_icon_color: '{{ ((home_button05_icon_color_value[0] //(2**3)) *(2**11))+((home_button05_icon_color_value[1] //(2**2)) *(2**5))+(home_button05_icon_color_value[2] //(2**3)) }}'
+  home_button05_icon_color: '{% set rgb = home_button05_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_button06_icon: !input "home_button06_icon"  #EDCF
   home_button06_icon_color_value: !input "home_button06_icon_color"
-  home_button06_icon_color: '{{ ((home_button06_icon_color_value[0] //(2**3)) *(2**11))+((home_button06_icon_color_value[1] //(2**2)) *(2**5))+(home_button06_icon_color_value[2] //(2**3)) }}'
+  home_button06_icon_color: '{% set rgb = home_button06_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_button07_icon: ""
   home_button07_icon_color: ""
 
@@ -2560,80 +2558,80 @@ variables:
   home_value01: !input "home_value01"
   home_value01_icon: !input "home_value01_icon"
   home_value01_icon_color_value: !input "home_value01_icon_color"
-  home_value01_icon_color: '{{ ((home_value01_icon_color_value[0] //(2**3)) *(2**11))+((home_value01_icon_color_value[1] //(2**2)) *(2**5))+(home_value01_icon_color_value[2] //(2**3)) }}'
+  home_value01_icon_color: '{% set rgb = home_value01_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_value01_label_color_value: !input "home_value01_label_color"
-  home_value01_label_color: '{{ ((home_value01_label_color_value[0] //(2**3)) *(2**11))+((home_value01_label_color_value[1] //(2**2)) *(2**5))+(home_value01_label_color_value[2] //(2**3)) }}'
+  home_value01_label_color: '{% set rgb = home_value01_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_value02: !input "home_value02"
   home_value02_icon: !input "home_value02_icon"
   home_value02_icon_color_value: !input "home_value02_icon_color"
-  home_value02_icon_color: '{{ ((home_value02_icon_color_value[0] //(2**3)) *(2**11))+((home_value02_icon_color_value[1] //(2**2)) *(2**5))+(home_value02_icon_color_value[2] //(2**3)) }}'
+  home_value02_icon_color: '{% set rgb = home_value02_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_value02_label_color_value: !input "home_value02_label_color"
-  home_value02_label_color: '{{ ((home_value02_label_color_value[0] //(2**3)) *(2**11))+((home_value02_label_color_value[1] //(2**2)) *(2**5))+(home_value02_label_color_value[2] //(2**3)) }}'
+  home_value02_label_color: '{% set rgb = home_value02_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_value03: !input "home_value03"
   home_value03_icon: !input "home_value03_icon"
   home_value03_icon_color_value: !input "home_value03_icon_color"
-  home_value03_icon_color: '{{ ((home_value03_icon_color_value[0] //(2**3)) *(2**11))+((home_value03_icon_color_value[1] //(2**2)) *(2**5))+(home_value03_icon_color_value[2] //(2**3)) }}'
+  home_value03_icon_color: '{% set rgb = home_value03_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_value03_label_color_value: !input "home_value03_label_color"
-  home_value03_label_color: '{{ ((home_value03_label_color_value[0] //(2**3)) *(2**11))+((home_value03_label_color_value[1] //(2**2)) *(2**5))+(home_value03_label_color_value[2] //(2**3)) }}'
+  home_value03_label_color: '{% set rgb = home_value03_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
 
   ### Home Page - Chips ###
   chip01: !input "chip01"
   chip01_icon: !input "chip01_icon"
   chip01_icon_color_value: !input "chip01_icon_color"
-  chip01_icon_color: '{{ ((chip01_icon_color_value[0] //(2**3)) *(2**11))+((chip01_icon_color_value[1] //(2**2)) *(2**5))+(chip01_icon_color_value[2] //(2**3)) }}'
+  chip01_icon_color: '{% set rgb = chip01_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   chip02: !input "chip02"
   chip02_icon: !input "chip02_icon"
   chip02_icon_color_value: !input "chip02_icon_color"
-  chip02_icon_color: '{{ ((chip02_icon_color_value[0] //(2**3)) *(2**11))+((chip02_icon_color_value[1] //(2**2)) *(2**5))+(chip02_icon_color_value[2] //(2**3)) }}'
+  chip02_icon_color: '{% set rgb = chip02_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   chip03: !input "chip03"
   chip03_icon: !input "chip03_icon"
   chip03_icon_color_value: !input "chip03_icon_color"
-  chip03_icon_color: '{{ ((chip03_icon_color_value[0] //(2**3)) *(2**11))+((chip03_icon_color_value[1] //(2**2)) *(2**5))+(chip03_icon_color_value[2] //(2**3)) }}'
+  chip03_icon_color: '{% set rgb = chip03_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   chip04: !input "chip04"
   chip04_icon: !input "chip04_icon"
   chip04_icon_color_value: !input "chip04_icon_color"
-  chip04_icon_color: '{{ ((chip04_icon_color_value[0] //(2**3)) *(2**11))+((chip04_icon_color_value[1] //(2**2)) *(2**5))+(chip04_icon_color_value[2] //(2**3)) }}'
+  chip04_icon_color: '{% set rgb = chip04_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   chip05: !input "chip05"
   chip05_icon: !input "chip05_icon"
   chip05_icon_color_value: !input "chip05_icon_color"
-  chip05_icon_color: '{{ ((chip05_icon_color_value[0] //(2**3)) *(2**11))+((chip05_icon_color_value[1] //(2**2)) *(2**5))+(chip05_icon_color_value[2] //(2**3)) }}'
+  chip05_icon_color: '{% set rgb = chip05_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   chip06: !input "chip06"
   chip06_icon: !input "chip06_icon"
   chip06_icon_color_value: !input "chip06_icon_color"
-  chip06_icon_color: '{{ ((chip06_icon_color_value[0] //(2**3)) *(2**11))+((chip06_icon_color_value[1] //(2**2)) *(2**5))+(chip06_icon_color_value[2] //(2**3)) }}'
+  chip06_icon_color: '{% set rgb = chip06_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   chip07: !input "chip07"
   chip07_icon: !input "chip07_icon"
   chip07_icon_color_value: !input "chip07_icon_color"
-  chip07_icon_color: '{{ ((chip07_icon_color_value[0] //(2**3)) *(2**11))+((chip07_icon_color_value[1] //(2**2)) *(2**5))+(chip07_icon_color_value[2] //(2**3)) }}'
+  chip07_icon_color: '{% set rgb = chip07_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
 
   ### Home Page - Chips General ###
   relay01_icon: !input "relay01_icon" #E3A5
   relay01_icon_color_value: !input "relay01_icon_color"
-  relay01_icon_color: '{{ ((relay01_icon_color_value[0] //(2**3)) *(2**11))+((relay01_icon_color_value[1] //(2**2)) *(2**5))+(relay01_icon_color_value[2] //(2**3)) }}'
+  relay01_icon_color: '{% set rgb = relay01_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   relay02_icon: !input "relay02_icon" #E3A8
   relay02_icon_color_value: !input "relay02_icon_color"
-  relay02_icon_color: '{{ ((relay02_icon_color_value[0] //(2**3)) *(2**11))+((relay02_icon_color_value[1] //(2**2)) *(2**5))+(relay02_icon_color_value[2] //(2**3)) }}'
+  relay02_icon_color: '{% set rgb = relay02_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   thermostat_icon: !input "thermostat_icon"  #E50E
   thermostat_icon_color_value: !input "thermostat_icon_color"
-  thermostat_icon_color: '{{ ((thermostat_icon_color_value[0] //(2**3)) *(2**11))+((thermostat_icon_color_value[1] //(2**2)) *(2**5))+(thermostat_icon_color_value[2] //(2**3)) }}'
+  thermostat_icon_color: '{% set rgb = thermostat_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   heat_icon: !input "heat_icon"  #\U0000E50F
 
   ### Home Page - General ###
   home_outdoor_temp_label_color_value: !input "home_outdoor_temp_label_color"
-  home_outdoor_temp_label_color: '{{ ((home_outdoor_temp_label_color_value[0] //(2**3)) *(2**11))+((home_outdoor_temp_label_color_value[1] //(2**2)) *(2**5))+(home_outdoor_temp_label_color_value[2] //(2**3)) }}'
+  home_outdoor_temp_label_color: '{% set rgb = home_outdoor_temp_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_indoor_temp_icon: !input "home_indoor_temp_icon"  #E50E
   home_indoor_temp_icon_color_value: !input "home_indoor_temp_icon_color"
-  home_indoor_temp_icon_color: '{{ ((home_indoor_temp_icon_color_value[0] //(2**3)) *(2**11))+((home_indoor_temp_icon_color_value[1] //(2**2)) *(2**5))+(home_indoor_temp_icon_color_value[2] //(2**3)) }}'
+  home_indoor_temp_icon_color: '{% set rgb = home_indoor_temp_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   home_indoor_temp_label_color_value: !input "home_indoor_temp_label_color"
-  home_indoor_temp_label_color: '{{ ((home_indoor_temp_label_color_value[0] //(2**3)) *(2**11))+((home_indoor_temp_label_color_value[1] //(2**2)) *(2**5))+(home_indoor_temp_label_color_value[2] //(2**3)) }}'
+  home_indoor_temp_label_color: '{% set rgb = home_indoor_temp_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   time_label_color_value: !input "time_label_color"
-  time_label_color: '{{ ((time_label_color_value[0] //(2**3)) *(2**11))+((time_label_color_value[1] //(2**2)) *(2**5))+(time_label_color_value[2] //(2**3)) }}'
+  time_label_color: '{% set rgb = time_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   date_label_color_value: !input "date_label_color"
-  date_label_color: '{{ ((date_label_color_value[0] //(2**3)) *(2**11))+((date_label_color_value[1] //(2**2)) *(2**5))+(date_label_color_value[2] //(2**3)) }}'
+  date_label_color: '{% set rgb = date_label_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   right_button_color_value: !input "right_button_color"
-  right_button_color: '{{ ((right_button_color_value[0] //(2**3)) *(2**11))+((right_button_color_value[1] //(2**2)) *(2**5))+(right_button_color_value[2] //(2**3)) }}'
+  right_button_color: '{% set rgb = right_button_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   left_button_color_value: !input "left_button_color"
-  left_button_color: '{{ ((left_button_color_value[0] //(2**3)) *(2**11))+((left_button_color_value[1] //(2**2)) *(2**5))+(left_button_color_value[2] //(2**3)) }}'
+  left_button_color: '{% set rgb = left_button_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
 
   ##### BUTTON Page Labels #####
   button_page01_label: !input button_page01_label
@@ -2646,224 +2644,224 @@ variables:
   entity01_name: !input "entity01_name"
   entity01_icon: !input "entity01_icon"
   entity01_icon_color_value: !input "entity01_icon_color"
-  entity01_icon_color: '{{ ((entity01_icon_color_value[0] //(2**3)) *(2**11))+((entity01_icon_color_value[1] //(2**2)) *(2**5))+(entity01_icon_color_value[2] //(2**3)) }}'
+  entity01_icon_color: '{% set rgb = entity01_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity01_confirm: !input "entity01_confirm"
 
   entity02: !input "entity02"
   entity02_name: !input "entity02_name"
   entity02_icon: !input "entity02_icon"
   entity02_icon_color_value: !input "entity02_icon_color"
-  entity02_icon_color: '{{ ((entity02_icon_color_value[0] //(2**3)) *(2**11))+((entity02_icon_color_value[1] //(2**2)) *(2**5))+(entity02_icon_color_value[2] //(2**3)) }}'
+  entity02_icon_color: '{% set rgb = entity02_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity02_confirm: !input "entity02_confirm"
 
   entity03: !input "entity03"
   entity03_name: !input "entity03_name"
   entity03_icon: !input "entity03_icon"
   entity03_icon_color_value: !input "entity03_icon_color"
-  entity03_icon_color: '{{ ((entity03_icon_color_value[0] //(2**3)) *(2**11))+((entity03_icon_color_value[1] //(2**2)) *(2**5))+(entity03_icon_color_value[2] //(2**3)) }}'
+  entity03_icon_color: '{% set rgb = entity03_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity03_confirm: !input "entity03_confirm"
 
   entity04: !input "entity04"
   entity04_name: !input "entity04_name"
   entity04_icon: !input "entity04_icon"
   entity04_icon_color_value: !input "entity04_icon_color"
-  entity04_icon_color: '{{ ((entity04_icon_color_value[0] //(2**3)) *(2**11))+((entity04_icon_color_value[1] //(2**2)) *(2**5))+(entity04_icon_color_value[2] //(2**3)) }}'
+  entity04_icon_color: '{% set rgb = entity04_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity04_confirm: !input "entity04_confirm"
 
   entity05: !input "entity05"
   entity05_name: !input "entity05_name"
   entity05_icon: !input "entity05_icon"
   entity05_icon_color_value: !input "entity05_icon_color"
-  entity05_icon_color: '{{ ((entity05_icon_color_value[0] //(2**3)) *(2**11))+((entity05_icon_color_value[1] //(2**2)) *(2**5))+(entity05_icon_color_value[2] //(2**3)) }}'
+  entity05_icon_color: '{% set rgb = entity05_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity05_confirm: !input "entity05_confirm"
 
   entity06: !input "entity06"
   entity06_name: !input "entity06_name"
   entity06_icon: !input "entity06_icon"
   entity06_icon_color_value: !input "entity06_icon_color"
-  entity06_icon_color: '{{ ((entity06_icon_color_value[0] //(2**3)) *(2**11))+((entity06_icon_color_value[1] //(2**2)) *(2**5))+(entity06_icon_color_value[2] //(2**3)) }}'
+  entity06_icon_color: '{% set rgb = entity06_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity06_confirm: !input "entity06_confirm"
 
   entity07: !input "entity07"
   entity07_name: !input "entity07_name"
   entity07_icon: !input "entity07_icon"
   entity07_icon_color_value: !input "entity07_icon_color"
-  entity07_icon_color: '{{ ((entity07_icon_color_value[0] //(2**3)) *(2**11))+((entity07_icon_color_value[1] //(2**2)) *(2**5))+(entity07_icon_color_value[2] //(2**3)) }}'
+  entity07_icon_color: '{% set rgb = entity07_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity07_confirm: !input "entity07_confirm"
 
   entity08: !input "entity08"
   entity08_name: !input "entity08_name"
   entity08_icon: !input "entity08_icon"
   entity08_icon_color_value: !input "entity08_icon_color"
-  entity08_icon_color: '{{ ((entity08_icon_color_value[0] //(2**3)) *(2**11))+((entity08_icon_color_value[1] //(2**2)) *(2**5))+(entity08_icon_color_value[2] //(2**3)) }}'
+  entity08_icon_color: '{% set rgb = entity08_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity08_confirm: !input "entity08_confirm"
 
   entity09: !input "entity09"
   entity09_name: !input "entity09_name"
   entity09_icon: !input "entity09_icon"
   entity09_icon_color_value: !input "entity09_icon_color"
-  entity09_icon_color: '{{ ((entity09_icon_color_value[0] //(2**3)) *(2**11))+((entity09_icon_color_value[1] //(2**2)) *(2**5))+(entity09_icon_color_value[2] //(2**3)) }}'
+  entity09_icon_color: '{% set rgb = entity09_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity09_confirm: !input "entity09_confirm"
 
   entity10: !input "entity10"
   entity10_name: !input "entity10_name"
   entity10_icon: !input "entity10_icon"
   entity10_icon_color_value: !input "entity10_icon_color"
-  entity10_icon_color: '{{ ((entity10_icon_color_value[0] //(2**3)) *(2**11))+((entity10_icon_color_value[1] //(2**2)) *(2**5))+(entity10_icon_color_value[2] //(2**3)) }}'
+  entity10_icon_color: '{% set rgb = entity10_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity10_confirm: !input "entity10_confirm"
 
   entity11: !input "entity11"
   entity11_name: !input "entity11_name"
   entity11_icon: !input "entity11_icon"
   entity11_icon_color_value: !input "entity11_icon_color"
-  entity11_icon_color: '{{ ((entity11_icon_color_value[0] //(2**3)) *(2**11))+((entity11_icon_color_value[1] //(2**2)) *(2**5))+(entity11_icon_color_value[2] //(2**3)) }}'
+  entity11_icon_color: '{% set rgb = entity11_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity11_confirm: !input "entity11_confirm"
 
   entity12: !input "entity12"
   entity12_name: !input "entity12_name"
   entity12_icon: !input "entity12_icon"
   entity12_icon_color_value: !input "entity12_icon_color"
-  entity12_icon_color: '{{ ((entity12_icon_color_value[0] //(2**3)) *(2**11))+((entity12_icon_color_value[1] //(2**2)) *(2**5))+(entity12_icon_color_value[2] //(2**3)) }}'
+  entity12_icon_color: '{% set rgb = entity12_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity12_confirm: !input "entity12_confirm"
 
   entity13: !input "entity13"
   entity13_name: !input "entity13_name"
   entity13_icon: !input "entity13_icon"
   entity13_icon_color_value: !input "entity13_icon_color"
-  entity13_icon_color: '{{ ((entity13_icon_color_value[0] //(2**3)) *(2**11))+((entity13_icon_color_value[1] //(2**2)) *(2**5))+(entity13_icon_color_value[2] //(2**3)) }}'
+  entity13_icon_color: '{% set rgb = entity13_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity13_confirm: !input "entity13_confirm"
 
   entity14: !input "entity14"
   entity14_name: !input "entity14_name"
   entity14_icon: !input "entity14_icon"
   entity14_icon_color_value: !input "entity14_icon_color"
-  entity14_icon_color: '{{ ((entity14_icon_color_value[0] //(2**3)) *(2**11))+((entity14_icon_color_value[1] //(2**2)) *(2**5))+(entity14_icon_color_value[2] //(2**3)) }}'
+  entity14_icon_color: '{% set rgb = entity14_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity14_confirm: !input "entity14_confirm"
 
   entity15: !input "entity15"
   entity15_name: !input "entity15_name"
   entity15_icon: !input "entity15_icon"
   entity15_icon_color_value: !input "entity15_icon_color"
-  entity15_icon_color: '{{ ((entity15_icon_color_value[0] //(2**3)) *(2**11))+((entity15_icon_color_value[1] //(2**2)) *(2**5))+(entity15_icon_color_value[2] //(2**3)) }}'
+  entity15_icon_color: '{% set rgb = entity15_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity15_confirm: !input "entity15_confirm"
 
   entity16: !input "entity16"
   entity16_name: !input "entity16_name"
   entity16_icon: !input "entity16_icon"
   entity16_icon_color_value: !input "entity16_icon_color"
-  entity16_icon_color: '{{ ((entity16_icon_color_value[0] //(2**3)) *(2**11))+((entity16_icon_color_value[1] //(2**2)) *(2**5))+(entity16_icon_color_value[2] //(2**3)) }}'
+  entity16_icon_color: '{% set rgb = entity16_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity16_confirm: !input "entity16_confirm"
 
   entity17: !input "entity17"
   entity17_name: !input "entity17_name"
   entity17_icon: !input "entity17_icon"
   entity17_icon_color_value: !input "entity17_icon_color"
-  entity17_icon_color: '{{ ((entity17_icon_color_value[0] //(2**3)) *(2**11))+((entity17_icon_color_value[1] //(2**2)) *(2**5))+(entity17_icon_color_value[2] //(2**3)) }}'
+  entity17_icon_color: '{% set rgb = entity17_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity17_confirm: !input "entity17_confirm"
 
   entity18: !input "entity18"
   entity18_name: !input "entity18_name"
   entity18_icon: !input "entity18_icon"
   entity18_icon_color_value: !input "entity18_icon_color"
-  entity18_icon_color: '{{ ((entity18_icon_color_value[0] //(2**3)) *(2**11))+((entity18_icon_color_value[1] //(2**2)) *(2**5))+(entity18_icon_color_value[2] //(2**3)) }}'
+  entity18_icon_color: '{% set rgb = entity18_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity18_confirm: !input "entity18_confirm"
 
   entity19: !input "entity19"
   entity19_name: !input "entity19_name"
   entity19_icon: !input "entity19_icon"
   entity19_icon_color_value: !input "entity19_icon_color"
-  entity19_icon_color: '{{ ((entity19_icon_color_value[0] //(2**3)) *(2**11))+((entity19_icon_color_value[1] //(2**2)) *(2**5))+(entity19_icon_color_value[2] //(2**3)) }}'
+  entity19_icon_color: '{% set rgb = entity19_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity19_confirm: !input "entity19_confirm"
 
   entity20: !input "entity20"
   entity20_name: !input "entity20_name"
   entity20_icon: !input "entity20_icon"
   entity20_icon_color_value: !input "entity20_icon_color"
-  entity20_icon_color: '{{ ((entity20_icon_color_value[0] //(2**3)) *(2**11))+((entity20_icon_color_value[1] //(2**2)) *(2**5))+(entity20_icon_color_value[2] //(2**3)) }}'
+  entity20_icon_color: '{% set rgb = entity20_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity20_confirm: !input "entity20_confirm"
 
   entity21: !input "entity21"
   entity21_name: !input "entity21_name"
   entity21_icon: !input "entity21_icon"
   entity21_icon_color_value: !input "entity21_icon_color"
-  entity21_icon_color: '{{ ((entity21_icon_color_value[0] //(2**3)) *(2**11))+((entity21_icon_color_value[1] //(2**2)) *(2**5))+(entity21_icon_color_value[2] //(2**3)) }}'
+  entity21_icon_color: '{% set rgb = entity21_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity21_confirm: !input "entity21_confirm"
 
   entity22: !input "entity22"
   entity22_name: !input "entity22_name"
   entity22_icon: !input "entity22_icon"
   entity22_icon_color_value: !input "entity22_icon_color"
-  entity22_icon_color: '{{ ((entity22_icon_color_value[0] //(2**3)) *(2**11))+((entity22_icon_color_value[1] //(2**2)) *(2**5))+(entity22_icon_color_value[2] //(2**3)) }}'
+  entity22_icon_color: '{% set rgb = entity22_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity22_confirm: !input "entity22_confirm"
 
   entity23: !input "entity23"
   entity23_name: !input "entity23_name"
   entity23_icon: !input "entity23_icon"
   entity23_icon_color_value: !input "entity23_icon_color"
-  entity23_icon_color: '{{ ((entity23_icon_color_value[0] //(2**3)) *(2**11))+((entity23_icon_color_value[1] //(2**2)) *(2**5))+(entity23_icon_color_value[2] //(2**3)) }}'
+  entity23_icon_color: '{% set rgb = entity23_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity23_confirm: !input "entity23_confirm"
 
   entity24: !input "entity24"
   entity24_name: !input "entity24_name"
   entity24_icon: !input "entity24_icon"
   entity24_icon_color_value: !input "entity24_icon_color"
-  entity24_icon_color: '{{ ((entity24_icon_color_value[0] //(2**3)) *(2**11))+((entity24_icon_color_value[1] //(2**2)) *(2**5))+(entity24_icon_color_value[2] //(2**3)) }}'
+  entity24_icon_color: '{% set rgb = entity24_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity24_confirm: !input "entity24_confirm"
 
   entity25: !input "entity25"
   entity25_name: !input "entity25_name"
   entity25_icon: !input "entity25_icon"
   entity25_icon_color_value: !input "entity25_icon_color"
-  entity25_icon_color: '{{ ((entity25_icon_color_value[0] //(2**3)) *(2**11))+((entity25_icon_color_value[1] //(2**2)) *(2**5))+(entity25_icon_color_value[2] //(2**3)) }}'
+  entity25_icon_color: '{% set rgb = entity25_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity25_confirm: !input "entity25_confirm"
 
   entity26: !input "entity26"
   entity26_name: !input "entity26_name"
   entity26_icon: !input "entity26_icon"
   entity26_icon_color_value: !input "entity26_icon_color"
-  entity26_icon_color: '{{ ((entity26_icon_color_value[0] //(2**3)) *(2**11))+((entity26_icon_color_value[1] //(2**2)) *(2**5))+(entity26_icon_color_value[2] //(2**3)) }}'
+  entity26_icon_color: '{% set rgb = entity26_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity26_confirm: !input "entity26_confirm"
 
   entity27: !input "entity27"
   entity27_name: !input "entity27_name"
   entity27_icon: !input "entity27_icon"
   entity27_icon_color_value: !input "entity27_icon_color"
-  entity27_icon_color: '{{ ((entity27_icon_color_value[0] //(2**3)) *(2**11))+((entity27_icon_color_value[1] //(2**2)) *(2**5))+(entity27_icon_color_value[2] //(2**3)) }}'
+  entity27_icon_color: '{% set rgb = entity27_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity27_confirm: !input "entity27_confirm"
 
   entity28: !input "entity28"
   entity28_name: !input "entity28_name"
   entity28_icon: !input "entity28_icon"
   entity28_icon_color_value: !input "entity28_icon_color"
-  entity28_icon_color: '{{ ((entity28_icon_color_value[0] //(2**3)) *(2**11))+((entity28_icon_color_value[1] //(2**2)) *(2**5))+(entity28_icon_color_value[2] //(2**3)) }}'
+  entity28_icon_color: '{% set rgb = entity28_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity28_confirm: !input "entity28_confirm"
 
   entity29: !input "entity29"
   entity29_name: !input "entity29_name"
   entity29_icon: !input "entity29_icon"
   entity29_icon_color_value: !input "entity29_icon_color"
-  entity29_icon_color: '{{ ((entity29_icon_color_value[0] //(2**3)) *(2**11))+((entity29_icon_color_value[1] //(2**2)) *(2**5))+(entity29_icon_color_value[2] //(2**3)) }}'
+  entity29_icon_color: '{% set rgb = entity29_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity29_confirm: !input "entity29_confirm"
 
   entity30: !input "entity30"
   entity30_name: !input "entity30_name"
   entity30_icon: !input "entity30_icon"
   entity30_icon_color_value: !input "entity30_icon_color"
-  entity30_icon_color: '{{ ((entity30_icon_color_value[0] //(2**3)) *(2**11))+((entity30_icon_color_value[1] //(2**2)) *(2**5))+(entity30_icon_color_value[2] //(2**3)) }}'
+  entity30_icon_color: '{% set rgb = entity30_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity30_confirm: !input "entity30_confirm"
 
   entity31: !input "entity31"
   entity31_name: !input "entity31_name"
   entity31_icon: !input "entity31_icon"
   entity31_icon_color_value: !input "entity31_icon_color"
-  entity31_icon_color: '{{ ((entity31_icon_color_value[0] //(2**3)) *(2**11))+((entity31_icon_color_value[1] //(2**2)) *(2**5))+(entity31_icon_color_value[2] //(2**3)) }}'
+  entity31_icon_color: '{% set rgb = entity31_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity31_confirm: !input "entity31_confirm"
 
   entity32: !input "entity32"
   entity32_name: !input "entity32_name"
   entity32_icon: !input "entity32_icon"
   entity32_icon_color_value: !input "entity32_icon_color"
-  entity32_icon_color: '{{ ((entity32_icon_color_value[0] //(2**3)) *(2**11))+((entity32_icon_color_value[1] //(2**2)) *(2**5))+(entity32_icon_color_value[2] //(2**3)) }}'
+  entity32_icon_color: '{% set rgb = entity32_icon_color_value %}{{ rgb if is_number(rgb) else ((rgb[0] //(2**3)) *(2**11))+((rgb[1] //(2**2)) *(2**5))+(rgb[2] //(2**3)) }}'
   entity32_confirm: !input "entity32_confirm"
 
   ##### ENTITIES #####
@@ -4194,15 +4192,6 @@ action:
             data:
               cmd: page home
 
-      ##### BOOT NSPANEL - automation reload #####
-      - conditions:
-          - condition: trigger
-            id: automation_reloaded
-        sequence:
-          - service: button.press
-            target:
-              entity_id: "{{ reboot_button }}"
-
       ##### PAGE CHANGED - changes when page changed #####
       - alias: Page changed
         conditions:
@@ -4223,7 +4212,7 @@ action:
               ## PAGE HOME ##
               - conditions: '{{ trigger.event.data.new_state.state == page_home }}'
                 alias: 'home page'
-                sequence:
+                sequence: &refresh_page_home
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -4638,6 +4627,13 @@ action:
                         data:
                           component: home.button05_icon
                           message: "{{ home_button05_icon }}"
+                    else:
+                      - delay:
+                          milliseconds: "{{ delay_value }}"
+                      - service: "{{ command_text_printf }}"
+                        data:
+                          component: home.button05_icon
+                          message: "{{ blank_icon }}"
 
                   ###### ENTITIES - Icon ######
                   - if:
@@ -4659,6 +4655,13 @@ action:
                         data:
                           component: home.button06_icon
                           message: "{{ home_button06_icon }}"
+                    else:
+                      - delay:
+                          milliseconds: "{{ delay_value }}"
+                      - service: "{{ command_text_printf }}"
+                        data:
+                          component: home.button06_icon
+                          message: "{{ blank_icon }}"
 
                   ###### SHOW All component when page loading done #####
                   - delay:
@@ -4668,7 +4671,7 @@ action:
               ## PAGE BUTTONPAGE01 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage01 }}'
                 alias: 'buttonpage01 page'
-                sequence:
+                sequence: &refresh_page_buttonpage01
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -4919,7 +4922,7 @@ action:
               ## PAGE BUTTONPAGE02 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage02 }}'
                 alias: 'buttonpage02 page'
-                sequence:
+                sequence: &refresh_page_buttonpage02
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -5170,7 +5173,7 @@ action:
               ## PAGE BUTTONPAGE03 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage03 }}'
                 alias: 'buttonpage03 page'
-                sequence:
+                sequence: &refresh_page_buttonpage03
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -5421,7 +5424,7 @@ action:
               ## PAGE BUTTONPAGE04 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage04 }}'
                 alias: 'buttonpage04 page'
-                sequence:
+                sequence: &refresh_page_buttonpage04
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -5838,7 +5841,7 @@ action:
               ## ENTITY PAGE 01 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage01 }}'
                 alias: 'entity01 page'
-                sequence:
+                sequence: &refresh_page_entitypage01
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -5927,7 +5930,7 @@ action:
               ## ENTITY PAGE 02 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage02 }}'
                 alias: 'entity02 page'
-                sequence:
+                sequence: &refresh_page_entitypage02
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -6016,7 +6019,7 @@ action:
               ## ENTITY PAGE 03 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage03 }}'
                 alias: 'entity03 page'
-                sequence:
+                sequence: &refresh_page_entitypage03
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -6099,7 +6102,7 @@ action:
               ## ENTITY PAGE 04 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage04 }}'
                 alias: 'entity04 page'
-                sequence:
+                sequence: &refresh_page_entitypage04
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -6445,6 +6448,48 @@ action:
                 alias: 'screensaver page'
                 sequence:
 
+      ##### BOOT NSPANEL - automation reload #####
+      - conditions:
+          - condition: trigger
+            id: automation_reloaded
+        sequence:
+          - choose:
+            ## PAGE HOME ##
+            - conditions: '{{ states(current_page) == page_home }}'
+              sequence: *refresh_page_home
+            
+            ## PAGE BUTTONPAGE01 ##
+            - conditions: '{{ states(current_page) == page_buttonpage01 }}'
+              sequence: *refresh_page_buttonpage01
+
+            ## PAGE BUTTONPAGE02 ##
+            - conditions: '{{ states(current_page) == page_buttonpage02 }}'
+              sequence: *refresh_page_buttonpage02
+
+            ## PAGE BUTTONPAGE03 ##
+            - conditions: '{{ states(current_page) == page_buttonpage03 }}'
+              sequence: *refresh_page_buttonpage03
+
+            ## PAGE BUTTONPAGE04 ##
+            - conditions: '{{ states(current_page) == page_buttonpage04 }}'
+              sequence: *refresh_page_buttonpage04
+
+            ## ENTITY PAGE 01 ##
+            - conditions: '{{ states(current_page) == page_entitypage01 }}'
+              sequence: *refresh_page_entitypage01
+
+            ## ENTITY PAGE 02 ##
+            - conditions: '{{ states(current_page) == page_entitypage02 }}'
+              sequence: *refresh_page_entitypage02
+
+            ## ENTITY PAGE 03 ##
+            - conditions: '{{ states(current_page) == page_entitypage03 }}'
+              sequence: *refresh_page_entitypage03
+
+            ## ENTITY PAGE 04 ##
+            - conditions: '{{ states(current_page) == page_entitypage04 }}'
+              sequence: *refresh_page_entitypage04
+
       ##### UPDATE BUTTONS AND PAGES -  button page / lightsettings page / coversettings page  #####
       - conditions:
           - condition: trigger
@@ -8129,9 +8174,25 @@ action:
                             {%- else -%} {{ state_attr(left_button_entity, "friendly_name")| default('no name') }}
                             {%- endif -%}
                           entity_back: '{{ page_home }}'
+                          entity_long_icon: >-
+                            {%- if left_button_entity is match "light." -%} {{ button_icon_light }}
+                            {%- elif left_button_entity is match "switch." -%} {{ button_icon_switch }}
+                            {%- elif left_button_entity is match "input_boolean." -%} {{ button_icon_input_boolan }}
+                            {%- elif left_button_entity is match "cover." -%} {{ button_icon_cover }}
+                            {%- elif left_button_entity is match "automation." -%} {{ button_icon_automation }}
+                            {%- elif left_button_entity is match "button." -%} {{ button_icon_button }}
+                            {%- elif left_button_entity is match "input_button." -%} {{ button_icon_input_button }}
+                            {%- elif left_button_entity is match "scene." -%} {{ button_icon_screne }}
+                            {%- elif left_button_entity is match "script." -%} {{ button_icon_script }}
+                            {%- elif left_button_entity is match "person." -%} {{ button_icon_person }}
+                            {%- elif left_button_entity is match "binary_sensor." -%} {{ button_icon_binary_sensor }}
+                            {%- elif left_button_entity is match "fan." -%} {{ button_icon_fan }}
+                            {%- elif left_button_entity is match "climate." -%} {{ button_icon_climate }}
+                            {%- endif -%}
+                          entity_long_icon_color: 1055
                       - service: '{{ command_set_settings_entity }}'
                         data:
-                          entity: '{{ entity_long }},{{ entity_back }},{{ entity_long_name }}'
+                          entity: '{{ entity_long }},{{ entity_back }},{{ entity_long_name }},{{ entity_long_icon }},{{ entity_long_icon_color }}'
 
                   - conditions: '{{ left_button_hold_select == "Custom Action" }}'
                     sequence: !input left_button_hold_custom_action
@@ -8207,9 +8268,25 @@ action:
                             {%- else -%} {{ state_attr(right_button_entity, "friendly_name")| default('no name') }}
                             {%- endif -%}
                           entity_back: '{{ page_home }}'
+                          entity_long_icon: >-
+                            {%- if left_button_entity is match "light." -%} {{ button_icon_light }}
+                            {%- elif left_button_entity is match "switch." -%} {{ button_icon_switch }}
+                            {%- elif left_button_entity is match "input_boolean." -%} {{ button_icon_input_boolan }}
+                            {%- elif left_button_entity is match "cover." -%} {{ button_icon_cover }}
+                            {%- elif left_button_entity is match "automation." -%} {{ button_icon_automation }}
+                            {%- elif left_button_entity is match "button." -%} {{ button_icon_button }}
+                            {%- elif left_button_entity is match "input_button." -%} {{ button_icon_input_button }}
+                            {%- elif left_button_entity is match "scene." -%} {{ button_icon_screne }}
+                            {%- elif left_button_entity is match "script." -%} {{ button_icon_script }}
+                            {%- elif left_button_entity is match "person." -%} {{ button_icon_person }}
+                            {%- elif left_button_entity is match "binary_sensor." -%} {{ button_icon_binary_sensor }}
+                            {%- elif left_button_entity is match "fan." -%} {{ button_icon_fan }}
+                            {%- elif left_button_entity is match "climate." -%} {{ button_icon_climate }}
+                            {%- endif -%}
+                          entity_long_icon_color: 1055
                       - service: '{{ command_set_settings_entity }}'
                         data:
-                          entity: '{{ entity_long }},{{ entity_back }},{{ entity_long_name }}'
+                          entity: '{{ entity_long }},{{ entity_back }},{{ entity_long_name }},{{ entity_long_icon }},{{ entity_long_icon_color }}'
 
                   - conditions: '{{ right_button_hold_select == "Custom Action" }}'
                     sequence: !input right_button_hold_custom_action
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 8b2edd0..cb939b5 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 012429f..00eac9e 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index d97cc47..6b2baf1 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 5d39dc7..5fb0697 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ