diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 8b7a2e2..32cd480 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -3649,6 +3649,44 @@ action:
                 data:
                   entity_id: 'switch.{{ nspanel_name }}_relay_2_local_fallback'
           
+          ##### Update home-buttons on automation-reload only #####
+          - if:
+              - condition: template
+                value_template: '{{ states(current_page) == page_home }}'
+            then:
+              ###### QR Code - Icon ######
+              - if:
+                  - condition: template
+                    value_template: '{{ qrcode_state == true }}'
+                then:
+                  - delay:
+                      milliseconds: "{{ delay_value }}"
+                  - service: "{{ command_printf }}"
+                    data:
+                      cmd: "homebt05_pic.pic={{ home_button_qrcode }}"
+                else:
+                  - delay:
+                      milliseconds: "{{ delay_value }}"
+                  - service: "{{ command_printf }}"
+                    data:
+                      cmd: "homebt05_pic.pic={{ home_button_blank }}"
+
+              ###### ENTITIES - Icon ######
+              - if:
+                  - condition: template
+                    value_template: '{{ entitypages_enabled }}'
+                then:
+                  - delay:
+                      milliseconds: "{{ delay_value }}"
+                  - service: "{{ command_printf }}"
+                    data:
+                      cmd: "homebt06_pic.pic={{ home_button_entities }}"
+                else:
+                  - delay:
+                      milliseconds: "{{ delay_value }}"
+                  - service: "{{ command_printf }}"
+                    data:
+                      cmd: "homebt05_pic.pic={{ home_button_blank }}"
 
           ##### NSPanel boot init only #####
           - if: