diff --git a/src/assets/icons/sort-asc.svg b/src/assets/icons/sort-asc.svg
index 8121847..2c00b5a 100644
--- a/src/assets/icons/sort-asc.svg
+++ b/src/assets/icons/sort-asc.svg
@@ -2,9 +2,9 @@
 <svg height="14px" version="1.1" viewBox="0 0 6 14" width="6px" xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd" id="Icons" stroke="none" stroke-width="1">
         <g id="Artboard" transform="translate(-1212.000000, -325.000000)">
-            <polygon fill="currentColor" id="Fill-1" points="1215 338 1218 334 1212 334"></polygon>
-            <polygon fill="#28324180" id="Fill-1"
-                     points="1215 330 1218 326 1212 326"
+            <polygon id="Fill-1"
+                     points="1215 338 1218 334 1212 334" style="fill: var(--iqser-primary)"></polygon>
+            <polygon fill="currentColor" id="Fill-1" points="1215 330 1218 326 1212 326"
                      transform="translate(1215.000000, 328.000000) rotate(-180.000000) translate(-1215.000000, -328.000000) "></polygon>
         </g>
     </g>
diff --git a/src/assets/icons/sort-desc.svg b/src/assets/icons/sort-desc.svg
index f9211f8..de28f2b 100644
--- a/src/assets/icons/sort-desc.svg
+++ b/src/assets/icons/sort-desc.svg
@@ -2,9 +2,9 @@
 <svg height="14px" version="1.1" viewBox="0 0 6 14" width="6px" xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd" id="Icons" stroke="none" stroke-width="1">
         <g id="Artboard" transform="translate(-1212.000000, -325.000000)">
-            <polygon fill="#28324180" id="Fill-1" points="1215 338 1218 334 1212 334"></polygon>
-            <polygon fill="currentColor" id="Fill-1"
-                     points="1215 330 1218 326 1212 326"
+            <polygon fill="currentColor" id="Fill-1" points="1215 338 1218 334 1212 334"></polygon>
+            <polygon id="Fill-1" points="1215 330 1218 326 1212 326"
+                     style="fill: var(--iqser-primary)"
                      transform="translate(1215.000000, 328.000000) rotate(-180.000000) translate(-1215.000000, -328.000000) "></polygon>
         </g>
     </g>
diff --git a/src/assets/styles/_common-mixins.scss b/src/assets/styles/_common-mixins.scss
index f31e562..9d90ac6 100644
--- a/src/assets/styles/_common-mixins.scss
+++ b/src/assets/styles/_common-mixins.scss
@@ -21,21 +21,25 @@
 }
 
 @mixin scroll-bar {
-    scrollbar-color: var(--iqser-grey-5) var(--iqser-grey-2);
+    scrollbar-color: var(--iqser-inputs-outline) var(--iqser-alt-background);
     scrollbar-width: thin;
 
+    ::-webkit-scrollbar-corner {
+        background: var(--iqser-alt-background);
+    }
+
     &::-webkit-scrollbar {
         width: 11px;
     }
 
     /* Track */
     &::-webkit-scrollbar-track {
-        background: var(--iqser-grey-2);
+        background: var(--iqser-alt-background);
     }
 
     /* Handle */
     &::-webkit-scrollbar-thumb {
-        background: var(--iqser-grey-5);
+        background: var(--iqser-inputs-outline);
     }
 }
 
diff --git a/src/assets/styles/common-file-drop.scss b/src/assets/styles/common-file-drop.scss
index 40fae90..320ff3d 100644
--- a/src/assets/styles/common-file-drop.scss
+++ b/src/assets/styles/common-file-drop.scss
@@ -9,7 +9,7 @@
     z-index: 1000;
     padding: 12px;
     opacity: 0.7;
-    background: var(--iqser-white);
+    background: var(--iqser-background);
     justify-content: center;
     align-items: center;
     display: flex;
diff --git a/src/lib/listing/scroll-button/scroll-button.component.scss b/src/lib/listing/scroll-button/scroll-button.component.scss
index 8eaace7..afc466a 100644
--- a/src/lib/listing/scroll-button/scroll-button.component.scss
+++ b/src/lib/listing/scroll-button/scroll-button.component.scss
@@ -1,12 +1,14 @@
+@use '../../../assets/styles/common-mixins' as mixins;
+
 .scroll-button {
-    background-color: var(--iqser-white);
+    background-color: var(--iqser-popup-background);
     position: absolute;
     right: 0;
     height: 40px;
     width: 44px;
     border: none;
     border-radius: 8px 0 0 8px;
-    box-shadow: -1px 1px 5px 0 rgba(var(--iqser-accent-rgb), 0.25);
+    @include mixins.drop-shadow;
 
     &.bottom {
         bottom: 30px;
diff --git a/src/lib/listing/table-column-name/table-column-name.component.scss b/src/lib/listing/table-column-name/table-column-name.component.scss
index 7fb6e0d..46aa2fc 100644
--- a/src/lib/listing/table-column-name/table-column-name.component.scss
+++ b/src/lib/listing/table-column-name/table-column-name.component.scss
@@ -36,7 +36,7 @@
 
     .sort-arrows-container {
         display: none;
-        color: var(--iqser-primary);
+        color: rgba(var(--iqser-text-rgb), 0.5);
         margin-left: 8px;
 
         mat-icon {
diff --git a/src/lib/misc/progress-bar/progress-bar.component.scss b/src/lib/misc/progress-bar/progress-bar.component.scss
index dc7256e..c03010e 100644
--- a/src/lib/misc/progress-bar/progress-bar.component.scss
+++ b/src/lib/misc/progress-bar/progress-bar.component.scss
@@ -3,11 +3,11 @@
 }
 
 .wrapper {
-    background-color: var(--iqser-grey-6);
+    background-color: var(--iqser-btn-bg);
 
     .indicator {
         width: calc(100% / var(--total) * var(--count));
-        background-color: var(--iqser-grey-7);
+        background-color: var(--iqser-loading-progress);
     }
 }
 
@@ -28,5 +28,5 @@
 }
 
 .active .indicator {
-    background-color: rgba(var(--iqser-primary-rgb), 0.4);
+    background-color: rgba(var(--iqser-primary-rgb), 0.7);
 }