diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index fccee9993c..4b1d91c70f 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -104,9 +104,12 @@
 }
 
 .mx-button-otherstates-icon2(@icon-size) {
-    &.active   .icon,
-    &:active   .icon {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);}
-    &.disabled .icon {background-position-x: -2*@icon-size; --bgX: -(2*@icon-size);}
+    &.active, &:active{
+        &:not(:disabled):not(.disabled) {
+            .icon {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);}
+        }
+    }
+    &.disabled {.icon {opacity: .4;}}
 }
 
 .button-otherstates-icon2(@icon-class, @icon-size) {
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 5996c3a34c..74680b8291 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -315,7 +315,7 @@
     &[disabled],
     &.disabled {
         color: #000;
-        opacity: 0.4;
+        opacity: 1;
     }
 }