diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 62ca6f2..3e5de18 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -563,7 +563,8 @@ api:
                       id(disp1).set_component_text_printf("bt_home_text", mui_alarm[0].c_str());
                       id(disp1).set_component_background_color("bt_home_text", (state=="armed_home") ? 19818 : 52857);
                       id(disp1).set_component_background_color("bt_home_icon", (state=="armed_home") ? 19818 : 52857);
-                      //id(disp1).set_component_font_color(btnicon.c_str(), btn_icon_font);
+                      id(disp1).set_component_font_color("bt_home_text", (state=="armed_home") ? 65535 : 0);
+                      id(disp1).set_component_font_color("bt_home_icon", (state=="armed_home") ? 65535 : 0);
                       id(disp1).show_component("bt_home");
                     }
                   if (supported_features & 2) // Alarm - Button - Away
@@ -572,6 +573,8 @@ api:
                       id(disp1).set_component_text_printf("bt_away_text", mui_alarm[1].c_str());
                       id(disp1).set_component_background_color("bt_away_text", (state=="armed_away") ? 19818 : 52857);
                       id(disp1).set_component_background_color("bt_away_icon", (state=="armed_away") ? 19818 : 52857);
+                      id(disp1).set_component_font_color("bt_away_text", (state=="armed_away") ? 65535 : 0);
+                      id(disp1).set_component_font_color("bt_away_icon", (state=="armed_away") ? 65535 : 0);
                       id(disp1).show_component("bt_away");
                     }
                   if (supported_features & 4) // Alarm - Button - Night
@@ -580,6 +583,8 @@ api:
                       id(disp1).set_component_text_printf("bt_night_text", mui_alarm[2].c_str());
                       id(disp1).set_component_background_color("bt_night_text", (state=="armed_night") ? 19818 : 52857);
                       id(disp1).set_component_background_color("bt_night_icon", (state=="armed_night") ? 19818 : 52857);
+                      id(disp1).set_component_font_color("bt_night_text", (state=="armed_night") ? 65535 : 0);
+                      id(disp1).set_component_font_color("bt_night_icon", (state=="armed_night") ? 65535 : 0);
                       id(disp1).show_component("bt_night");
                     }
                   if (supported_features & 32) // Alarm - Button - Vacation
@@ -588,6 +593,8 @@ api:
                       id(disp1).set_component_text_printf("bt_vacat_text", mui_alarm[3].c_str());
                       id(disp1).set_component_background_color("bt_vacat_text", (state=="armed_vacation") ? 19818 : 52857);
                       id(disp1).set_component_background_color("bt_vacat_icon", (state=="armed_vacation") ? 19818 : 52857);
+                      id(disp1).set_component_font_color("bt_vacat_text", (state=="armed_vacation") ? 65535 : 0);
+                      id(disp1).set_component_font_color("bt_vacat_icon", (state=="armed_vacation") ? 65535 : 0);
                       id(disp1).show_component("bt_vacat");
                     }
                   if (supported_features & 16) // Alarm - Button - Custom bypass
@@ -596,6 +603,8 @@ api:
                       id(disp1).set_component_text_printf("bt_bypass_text", mui_alarm[4].c_str());
                       id(disp1).set_component_background_color("bt_bypass_text", (state=="armed_bypass") ? 19818 : 52857);
                       id(disp1).set_component_background_color("bt_bypass_icon", (state=="armed_bypass") ? 19818 : 52857);
+                      id(disp1).set_component_font_color("bt_bypass_text", (state=="armed_bypass") ? 65535 : 0);
+                      id(disp1).set_component_font_color("bt_bypass_icon", (state=="armed_bypass") ? 65535 : 0);
                       id(disp1).show_component("bt_bypass");
                     }
                   if ( true ) // Alarm - Button - Disarm
@@ -604,6 +613,8 @@ api:
                       id(disp1).set_component_text_printf("bt_disarm_text", mui_alarm[5].c_str());
                       id(disp1).set_component_background_color("bt_disarm_text", (state=="disarmed") ? 19818 : 52857);
                       id(disp1).set_component_background_color("bt_disarm_icon", (state=="disarmed") ? 19818 : 52857);
+                      id(disp1).set_component_font_color("bt_disarm_text", (state=="disarmed") ? 65535 : 0);
+                      id(disp1).set_component_font_color("bt_disarm_icon", (state=="disarmed") ? 65535 : 0);
                     }
 
 ##### START - GLOBALS CONFIGURATION #####