diff --git a/src/assets/styles/common-color-picker.scss b/src/assets/styles/common-color-picker.scss
new file mode 100644
index 0000000..6562a74
--- /dev/null
+++ b/src/assets/styles/common-color-picker.scss
@@ -0,0 +1,7 @@
+.color-picker {
+    background-color: var(--iqser-background) !important;
+
+    input {
+        color: var(--iqser-text) !important;
+    }
+}
diff --git a/src/assets/styles/common-components.scss b/src/assets/styles/common-components.scss
index 2cd90d3..7ac4631 100644
--- a/src/assets/styles/common-components.scss
+++ b/src/assets/styles/common-components.scss
@@ -23,22 +23,22 @@
     }
 
     &.gray-dark {
-        background-color: var(--iqser-grey-6);
-        color: var(--iqser-accent);
+        background-color: var(--iqser-user-avatar-1);
+        color: var(--iqser-text);
     }
 
     &.gray-primary {
-        background-color: var(--iqser-grey-6);
+        background-color: var(--iqser-user-avatar-1);
         color: var(--iqser-primary);
     }
 
     &.lightgray-dark {
-        background-color: var(--iqser-grey-4);
-        color: var(--iqser-accent);
+        background-color: var(--iqser-user-avatar-2);
+        color: var(--iqser-text);
     }
 
     &.lightgray-primary {
-        background-color: var(--iqser-grey-4);
+        background-color: var(--iqser-user-avatar-2);
         color: var(--iqser-primary);
     }
 
@@ -58,12 +58,12 @@
     }
 
     &.white-dark {
-        border: 1px solid var(--iqser-grey-4);
+        background-color: var(--iqser-user-avatar-2);
         color: var(--iqser-accent);
     }
 
     &.inactive {
-        background-color: var(--iqser-grey-6);
+        background-color: var(--iqser-user-avatar-1);
         color: var(--iqser-grey-7);
     }
 }
diff --git a/src/assets/styles/common-styles.scss b/src/assets/styles/common-styles.scss
index 9e77796..eb7891e 100644
--- a/src/assets/styles/common-styles.scss
+++ b/src/assets/styles/common-styles.scss
@@ -29,3 +29,4 @@
 @use 'common-file-drop';
 @use 'common-side-nav';
 @use 'common-radio';
+@use 'common-color-picker';
diff --git a/src/assets/styles/common-toggle-button.scss b/src/assets/styles/common-toggle-button.scss
index b6be148..19e3752 100644
--- a/src/assets/styles/common-toggle-button.scss
+++ b/src/assets/styles/common-toggle-button.scss
@@ -6,7 +6,7 @@
 
     .mat-button-toggle:not(.mat-button-toggle-checked) {
         .mat-button-toggle-button {
-            background: var(--iqser-grey-6);
+            background: var(--iqser-btn-bg);
             color: var(--iqser-grey-7);
         }
     }
diff --git a/src/lib/listing/table-content/table-item/table-item.component.scss b/src/lib/listing/table-content/table-item/table-item.component.scss
index ec0cd43..eafb95b 100644
--- a/src/lib/listing/table-content/table-item/table-item.component.scss
+++ b/src/lib/listing/table-content/table-item/table-item.component.scss
@@ -69,7 +69,7 @@
         padding-left: 100px;
         padding-right: 21px;
         z-index: 1;
-        background: linear-gradient(to right, rgba(244, 245, 247, 0) 0%, var(--iqser-grey-2) 35%);
+        background: linear-gradient(to right, rgba(244, 245, 247, 0) 0%, var(--iqser-side-nav) 35%);
 
         mat-icon {
             width: 14px;