diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index aab92f9..b5a98cd 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -9312,9 +9312,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 +9406,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