diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 824ca56..7907c3e 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -598,6 +598,25 @@ binary_sensor:
   ##### API connection status
   - platform: status
     name: ${device_name} Status
+    on_state:
+      then:
+        - &update_wifi_icon
+          if:
+            condition:
+              wifi.connected:
+            then:
+              - if:
+                  condition:
+                    api.connected:
+                  then:
+                    - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000E5A8");
+                    - lambda: id(disp1).set_component_font_color("home.wifi_icon", 33808);
+                  else:
+                    - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000F256");
+                    - lambda: id(disp1).set_component_font_color("home.wifi_icon", 63488);
+            else:
+              - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000E5A9");
+              - lambda: id(disp1).set_component_font_color("home.wifi_icon", 63488);
 
 ##### START - SENSOR CONFIGURATION #####
 sensor:
@@ -612,13 +631,7 @@ sensor:
     platform: wifi_signal
     update_interval: 60s
     on_value:
-      - if:
-          condition:
-            wifi.connected:
-          then:
-            - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000E5A8");
-          else:
-            - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000FFFF");
+      - *update_wifi_icon
 
   ##### INTERNAL TEMPERATURE SENSOR, ADC VALUE #####
   - id: ntc_source