diff --git a/src/components/entity/ha-state-label-badge.html b/src/components/entity/ha-state-label-badge.html
index 5cf116994a..81b6681c27 100644
--- a/src/components/entity/ha-state-label-badge.html
+++ b/src/components/entity/ha-state-label-badge.html
@@ -112,6 +112,10 @@ class HaStateLabelBadge extends
           return 'mdi:nature';
         } else if (state.state === 'armed_home') {
           return 'mdi:home-variant';
+        } else if (state.state === 'armed_night') {
+          return 'mdi:weather-night';
+        } else if (state.state === 'armed_custom_bypass') {
+          return 'mdi:security-home';
         } else if (state.state === 'triggered') {
           return 'mdi:alert-circle';
         }
diff --git a/src/more-infos/more-info-alarm_control_panel.html b/src/more-infos/more-info-alarm_control_panel.html
index 287d75d1a9..0fe0d69b04 100644
--- a/src/more-infos/more-info-alarm_control_panel.html
+++ b/src/more-infos/more-info-alarm_control_panel.html
@@ -103,12 +103,16 @@ class MoreInfoAlarmControlPanel extends window.hassMixins.EventsMixin(Polymer.El
       this.codeInputEnabled = (
         newVal.state === 'armed_home' ||
         newVal.state === 'armed_away' ||
+        newVal.state === 'armed_night' ||
+        newVal.state === 'armed_custom_bypass' ||
         newVal.state === 'disarmed' ||
         newVal.state === 'pending' ||
         newVal.state === 'triggered');
       this.disarmButtonVisible = (
         newVal.state === 'armed_home' ||
         newVal.state === 'armed_away' ||
+        newVal.state === 'armed_night' ||
+        newVal.state === 'armed_custom_bypass' ||
         newVal.state === 'pending' ||
         newVal.state === 'triggered');
       this.armHomeButtonVisible = newVal.state === 'disarmed';
diff --git a/src/translations/en.json b/src/translations/en.json
index db321249a6..9ecd0c2b79 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -22,6 +22,7 @@
       "armed_home": "Armed home",
       "armed_away": "Armed away",
       "armed_night": "Armed night",
+      "armed_custom_bypass": "Armed custom bypass",
       "pending": "Pending",
       "arming": "Arming",
       "disarming": "Disarming",
@@ -207,6 +208,7 @@
       "armed_home": "[%key:state_badge::alarm_control_panel::armed%]",
       "armed_away": "[%key:state_badge::alarm_control_panel::armed%]",
       "armed_night": "[%key:state_badge::alarm_control_panel::armed%]",
+      "armed_custom_bypass": "[%key:state_badge::alarm_control_panel::armed%]",
       "pending": "Pend",
       "arming": "Arming",
       "disarming": "Disarm",