diff --git a/src/assets/styles/common-buttons.scss b/src/assets/styles/common-buttons.scss
index 70458f7..3a77efb 100644
--- a/src/assets/styles/common-buttons.scss
+++ b/src/assets/styles/common-buttons.scss
@@ -22,10 +22,9 @@
         }
     }
 
-    &.mat-button-disabled {
-        .mat-button-wrapper {
-            opacity: 0.3;
-        }
+    &.mat-button-disabled .mat-button-wrapper {
+        color: var(--iqser-accent);
+        opacity: 0.3;
     }
 }
 
@@ -65,7 +64,7 @@ iqser-circle-button {
             background: rgba(var(--iqser-primary-rgb), 0.1);
         }
 
-        &:not(.overlay):hover {
+        &:not(.overlay):not(.mat-button-disabled):hover {
             background-color: var(--iqser-btn-bg);
         }
 
diff --git a/src/lib/buttons/icon-button/icon-button.component.html b/src/lib/buttons/icon-button/icon-button.component.html
index 747bc00..d6afb9a 100644
--- a/src/lib/buttons/icon-button/icon-button.component.html
+++ b/src/lib/buttons/icon-button/icon-button.component.html
@@ -1,5 +1,5 @@
 <button
-    (click)="action.emit($event)"
+    (click)="!disabled && action.emit($event)"
     [class.has-icon]="!!icon"
     [class.overlay]="showDot"
     [class.primary]="type === iconButtonTypes.primary"
diff --git a/src/lib/buttons/icon-button/icon-button.component.scss b/src/lib/buttons/icon-button/icon-button.component.scss
index 723c46e..056d65d 100644
--- a/src/lib/buttons/icon-button/icon-button.component.scss
+++ b/src/lib/buttons/icon-button/icon-button.component.scss
@@ -14,13 +14,6 @@ button {
         }
     }
 
-    &.mat-button-disabled {
-        cursor: not-allowed;
-        ::ng-deep .mat-button-wrapper {
-            opacity: 1;
-        }
-    }
-
     mat-icon {
         width: 14px;
     }