diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 921d725..f9e8df5 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -550,7 +550,7 @@ api:
             // set alarm icon on home page
             if (${verbose_log}) ESP_LOGD("service.alarm_settings", "Updating home page icon");
             id(home_alarm_state) = state;
-            id(update_alarm_icon)->execute("icon_state", state.c_str());
+            id(update_alarm_icon)->execute("home.button07_icon", state.c_str());
 
         ## Update alarm page
         - if:
@@ -562,6 +562,7 @@ api:
               - lambda: |-
                   if (${verbose_log}) ESP_LOGD("service.alarm_settings", "Updating alarm page");
                   // Alarm page - Header
+                  id(update_alarm_icon)->execute("icon_state", state.c_str());
                   id(disp1).set_component_text_printf("page_label", "%s", page_title.c_str());
                   id(disp1).set_component_text_printf("code_format", "%s", code_format.c_str());
                   if (code_arm_required) id(disp1).set_component_text_printf("code_arm_req", "1"); else id(disp1).set_component_text_printf("code_arm_req", "0");