diff --git a/src/lib/layer/layer-item/layer-item.component.html b/src/lib/layer/layer-item/layer-item.component.html
index e90460f6b9..6d988bdef5 100644
--- a/src/lib/layer/layer-item/layer-item.component.html
+++ b/src/lib/layer/layer-item/layer-item.component.html
@@ -16,7 +16,7 @@ <h4 matLine [matTooltip]="layer.title +' ('+ id +') '" matTooltipShowDelay="500"
     tooltip-position="below"
     matTooltipShowDelay="500"
     [matTooltip]="'igo.filter.layerFiltered' | translate"
-    [color]="gray"
+    color="gray"
     disabled = true>
     <mat-icon> filter_list </mat-icon>
   </button>
@@ -29,7 +29,7 @@ <h4 matLine [matTooltip]="layer.title +' ('+ id +') '" matTooltipShowDelay="500"
     [matTooltip]="layer.visible ?
                   ('igo.layer.hideLayer' | translate) :
                   ('igo.layer.showLayer' | translate)"
-    [color]="color"
+    [color]="layer.visible ? color : 'default'"
     (click)="toggleVisibility()">
     <mat-icon
       [ngClass]='{disabled: !layer.isInResolutionsRange}'>
diff --git a/src/lib/layer/layer-item/layer-item.component.ts b/src/lib/layer/layer-item/layer-item.component.ts
index 0c0e39010b..1f68749082 100644
--- a/src/lib/layer/layer-item/layer-item.component.ts
+++ b/src/lib/layer/layer-item/layer-item.component.ts
@@ -35,11 +35,7 @@ export class LayerItemComponent implements OnDestroy {
   private _edition: boolean = false;
 
   @Input()
-  get color() {
-    this._color = this.layer.visible ? 'primary' : 'background';
-    return this._color;
-  }
-
+  get color() { return this._color; }
   set color(value: string) {
     this._color = value;
   }
diff --git a/src/themes/deeppurple-amber.styl b/src/themes/deeppurple-amber.styl
index 5b066a58a7..51dd7906d8 100644
--- a/src/themes/deeppurple-amber.styl
+++ b/src/themes/deeppurple-amber.styl
@@ -34,11 +34,11 @@ mat-progress-spinner path {
   stroke: $primary-color;
 }
 
-button.mat-icon-button.mat-primary:hover {
+button.mat-icon-button.mat-primary:enabled:hover {
   color: #4300b8;
 }
 
-button.mat-icon-button.mat-warn:hover {
+button.mat-icon-button.mat-warn:enabled:hover {
   color: #ff1100;
 }