From 262537c287f4b4b7299f34aa0a69fd864a1a22e3 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 11 Mar 2019 14:10:24 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20properly=20override=20entity=20p?=
 =?UTF-8?q?icture=20with=20icon=20(#2902)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/entity/state-badge.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts
index 4554c382fb..49df5ef061 100644
--- a/src/components/entity/state-badge.ts
+++ b/src/components/entity/state-badge.ts
@@ -53,7 +53,7 @@ class StateBadge extends LitElement {
     };
     if (stateObj) {
       // hide icon if we have entity picture
-      if (stateObj.attributes.entity_picture) {
+      if (stateObj.attributes.entity_picture && !this.overrideIcon) {
         hostStyle.backgroundImage =
           "url(" + stateObj.attributes.entity_picture + ")";
         iconStyle.display = "none";