diff --git a/dist/css/status_panel.css b/dist/css/status_panel.css
index 493db07a..d3e38889 100644
--- a/dist/css/status_panel.css
+++ b/dist/css/status_panel.css
@@ -67,15 +67,15 @@
   -webkit-transform: rotateY(-180deg);
   transform: rotateY(-180deg); }
 
-.st-card.effect-hover:hover:not(.no-data-state) .st-card-front, .st-card.effect-hover.flipped:not(.no-data-state) .st-card-front {
+.st-card.effect-hover:hover .st-card-front, .st-card.effect-hover.flipped .st-card-front {
   -webkit-transform: rotateY(-180deg);
   transform: rotateY(-180deg); }
 
-.st-card.effect-hover:hover:not(.no-data-state) .st-card-back, .st-card.effect-hover.flipped:not(.no-data-state) .st-card-back {
+.st-card.effect-hover:hover .st-card-back, .st-card.effect-hover.flipped .st-card-back {
   -webkit-transform: rotateY(0);
   transform: rotateY(0); }
 
-.st-card:not(.effect-hover):not(.no-data-state) .st-card-front {
+.st-card:not(.effect-hover) .st-card-front {
   display: none; }
 
 /*# sourceMappingURL=status_panel.css.map */
diff --git a/dist/css/status_panel.css.map b/dist/css/status_panel.css.map
index eda53cc5..e925e400 100644
--- a/dist/css/status_panel.css.map
+++ b/dist/css/status_panel.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA,aAAc;EACb,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAElB,gBAAG;IACF,SAAS,EAAE,MAAM;EAGlB,4BAAe;IACd,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IAEZ,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM;IACvB,aAAa,EAAE,MAAM;EAKpB,qEAA6B;IAC5B,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,IAAI;IAEpB,mFAAc;MACb,SAAS,EAAE,KAAK;MAChB,QAAQ,EAAE,MAAM;MAChB,aAAa,EAAE,QAAQ;MACvB,WAAW,EAAE,MAAM;EAKtB,2CAAgB;IACf,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM;IACvB,aAAa,EAAE,MAAM;IAKrB,8DAAmB;MAClB,UAAU,EAAE,GAAG;EAKlB;6BACc;IACZ,mBAAmB,EAAE,MAAM;IAC3B,UAAU,EAAE,cAAc;;AAK5B,6IAAmE;EAClE,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM;;AAInB,SAAU;EACT,gBAAgB,EAAE,KAAK;EAEvB,kBAAS;IACR,OAAO,EAAE,KAAK;;AAIhB,WAAY;EACX,gBAAgB,EAAE,MAAM;EACxB,yBAAc;IACb,OAAO,EAAE,KAAK;;AAIhB,YAAa;EACZ,gBAAgB,EAAE,GAAG;EACrB,uBAAW;IACV,OAAO,EAAE,KAAK;;AAIhB,cAAe;EACd,gBAAgB,EAAE,IAAI;EAEtB,4BAAc;IACb,OAAO,EAAE,KAAK;;AAIhB,eAAgB;EACf,gBAAgB,EAAE,IAAI;EACtB,8BAAe;IACd,OAAO,EAAE,KAAK;;AAIhB,mCAAoC;EACnC,iBAAiB,EAAE,gBAAgB;EACnC,SAAS,EAAE,gBAAgB;;AAG5B,gIAAiI;EAChI,iBAAiB,EAAE,gBAAgB;EACnC,SAAS,EAAE,gBAAgB;;AAG5B,8HAA+H;EAC9H,iBAAiB,EAAE,UAAU;EAC7B,SAAS,EAAE,UAAU;;AAGtB,8DAA+D;EAC9D,OAAO,EAAE,IAAI",
+"mappings": "AAAA,aAAc;EACb,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAElB,gBAAG;IACF,SAAS,EAAE,MAAM;EAGlB,4BAAe;IACd,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IAEZ,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM;IACvB,aAAa,EAAE,MAAM;EAKpB,qEAA6B;IAC5B,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,IAAI;IAEpB,mFAAc;MACb,SAAS,EAAE,KAAK;MAChB,QAAQ,EAAE,MAAM;MAChB,aAAa,EAAE,QAAQ;MACvB,WAAW,EAAE,MAAM;EAKtB,2CAAgB;IACf,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM;IACvB,aAAa,EAAE,MAAM;IAKrB,8DAAmB;MAClB,UAAU,EAAE,GAAG;EAKlB;6BACc;IACZ,mBAAmB,EAAE,MAAM;IAC3B,UAAU,EAAE,cAAc;;AAK5B,6IAAmE;EAClE,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM;;AAInB,SAAU;EACT,gBAAgB,EAAE,KAAK;EAEvB,kBAAS;IACR,OAAO,EAAE,KAAK;;AAIhB,WAAY;EACX,gBAAgB,EAAE,MAAM;EACxB,yBAAc;IACb,OAAO,EAAE,KAAK;;AAIhB,YAAa;EACZ,gBAAgB,EAAE,GAAG;EACrB,uBAAW;IACV,OAAO,EAAE,KAAK;;AAIhB,cAAe;EACd,gBAAgB,EAAE,IAAI;EAEtB,4BAAc;IACb,OAAO,EAAE,KAAK;;AAIhB,eAAgB;EACf,gBAAgB,EAAE,IAAI;EACtB,8BAAe;IACd,OAAO,EAAE,KAAK;;AAIhB,mCAAoC;EACnC,iBAAiB,EAAE,gBAAgB;EACnC,SAAS,EAAE,gBAAgB;;AAG5B,wFAAyF;EACxF,iBAAiB,EAAE,gBAAgB;EACnC,SAAS,EAAE,gBAAgB;;AAG5B,sFAAuF;EACtF,iBAAiB,EAAE,UAAU;EAC7B,SAAS,EAAE,UAAU;;AAGtB,0CAA2C;EAC1C,OAAO,EAAE,IAAI",
 "sources": ["../../src/css/status_panel.scss"],
 "names": [],
 "file": "status_panel.css"
diff --git a/dist/editor.html b/dist/editor.html
index ee2de978..dfb54a47 100644
--- a/dist/editor.html
+++ b/dist/editor.html
@@ -32,8 +32,6 @@ <h5 class="section-heading">{{ measurement.alias }}</h5>
 		</div>
 		<gf-form-switch class="gf-form"
 						label-class="width-12"
-
-						label="Make panel gray when no data" checked="ctrl.panel.isGrayColor"
 						label="Make panel gray when no data" checked="ctrl.panel.isGrayOnNoData"
 						on-change="ctrl.onRender()"></gf-form-switch>
 	</div>
diff --git a/src/css/status_panel.scss b/src/css/status_panel.scss
index 9e1abb25..b561d3e2 100644
--- a/src/css/status_panel.scss
+++ b/src/css/status_panel.scss
@@ -106,16 +106,16 @@
 	transform: rotateY(-180deg);
 }
 
-.st-card.effect-hover:hover:not(.no-data-state) .st-card-front, .st-card.effect-hover.flipped:not(.no-data-state) .st-card-front {
+.st-card.effect-hover:hover .st-card-front, .st-card.effect-hover.flipped .st-card-front {
 	-webkit-transform: rotateY(-180deg);
 	transform: rotateY(-180deg);
 }
 
-.st-card.effect-hover:hover:not(.no-data-state) .st-card-back, .st-card.effect-hover.flipped:not(.no-data-state) .st-card-back {
+.st-card.effect-hover:hover .st-card-back, .st-card.effect-hover.flipped .st-card-back {
 	-webkit-transform: rotateY(0);
 	transform: rotateY(0);
 }
 
-.st-card:not(.effect-hover):not(.no-data-state) .st-card-front {
+.st-card:not(.effect-hover) .st-card-front {
 	display: none;
 }
diff --git a/src/editor.html b/src/editor.html
index ee2de978..dfb54a47 100644
--- a/src/editor.html
+++ b/src/editor.html
@@ -32,8 +32,6 @@ <h5 class="section-heading">{{ measurement.alias }}</h5>
 		</div>
 		<gf-form-switch class="gf-form"
 						label-class="width-12"
-
-						label="Make panel gray when no data" checked="ctrl.panel.isGrayColor"
 						label="Make panel gray when no data" checked="ctrl.panel.isGrayOnNoData"
 						on-change="ctrl.onRender()"></gf-form-switch>
 	</div>