diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index aab92f9..a83caae 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)
 
 
@@ -4676,6 +4673,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:
@@ -4697,6 +4701,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:
@@ -9312,9 +9323,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
@@ -9390,9 +9417,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..12c31f3 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..f7ce999 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..7f4671f 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..8dee12b 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ