diff --git a/src/components/entity/state-badge.js b/src/components/entity/state-badge.js
index ab3e0906ab80..99e63390e1a9 100644
--- a/src/components/entity/state-badge.js
+++ b/src/components/entity/state-badge.js
@@ -26,11 +26,15 @@ class StateBadge extends PolymerElement {
         }
 
         /* Color the icon if light or sun is on */
-        ha-icon[data-domain="light"][data-state="on"],
-        ha-icon[data-domain="switch"][data-state="on"],
         ha-icon[data-domain="binary_sensor"][data-state="on"],
+        ha-icon[data-domain="cover"][data-state="open"],
+        ha-icon[data-domain="device_tracker"][data-state="home"],
         ha-icon[data-domain="fan"][data-state="on"],
-        ha-icon[data-domain="sun"][data-state="above_horizon"] {
+        ha-icon[data-domain="group"][data-state="on"],
+        ha-icon[data-domain="input_boolean"][data-state="on"],
+        ha-icon[data-domain="light"][data-state="on"],
+        ha-icon[data-domain="sun"][data-state="above_horizon"],
+        ha-icon[data-domain="switch"][data-state="on"] {
           color: var(--paper-item-icon-active-color, #fdd835);
         }
 
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index 31c826c77c66..d0026cd36b3e 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -148,11 +148,15 @@ class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
           height: 40%;
           color: var(--paper-item-icon-color, #44739e);
         }
-        ha-icon[data-domain="light"][data-state="on"],
-        ha-icon[data-domain="switch"][data-state="on"],
         ha-icon[data-domain="binary_sensor"][data-state="on"],
+        ha-icon[data-domain="cover"][data-state="open"],
+        ha-icon[data-domain="device_tracker"][data-state="home"],
         ha-icon[data-domain="fan"][data-state="on"],
-        ha-icon[data-domain="sun"][data-state="above_horizon"] {
+        ha-icon[data-domain="group"][data-state="on"],
+        ha-icon[data-domain="input_boolean"][data-state="on"],
+        ha-icon[data-domain="light"][data-state="on"],
+        ha-icon[data-domain="sun"][data-state="above_horizon"],
+        ha-icon[data-domain="switch"][data-state="on"] {
           color: var(--paper-item-icon-active-color, #fdd835);
         }
         ha-icon[data-state="unavailable"] {