diff --git a/src/AppWrapper.js b/src/AppWrapper.js
index 282a0fa8b..3c74bbff4 100644
--- a/src/AppWrapper.js
+++ b/src/AppWrapper.js
@@ -106,7 +106,12 @@ const AppWrapper = () => {
                             >
                                 <WindowDimensionsProvider>
                                     <OrgUnitsProvider>
-                                        <CssVariables colors spacers theme />
+                                        <CssVariables
+                                            colors
+                                            elevations
+                                            spacers
+                                            theme
+                                        />
                                         <App />
                                     </OrgUnitsProvider>
                                 </WindowDimensionsProvider>
diff --git a/src/components/core/styles/IconButton.module.css b/src/components/core/styles/IconButton.module.css
index 29313a7a7..e14ada233 100644
--- a/src/components/core/styles/IconButton.module.css
+++ b/src/components/core/styles/IconButton.module.css
@@ -1,10 +1,16 @@
 .iconButton {
-    width: var(--spacers-dp32);
-    height: var(--spacers-dp32);
+    width: 28px;
+    height: 28px;
     cursor: pointer;
     display: flex;
     justify-content: center;
     align-items: center;
+    background-color: transparent;
+    border-radius: 5px;
+}
+
+.iconButton:hover {
+    background-color: var(--colors-grey200);
 }
 
 .iconButton > span {
@@ -17,4 +23,9 @@
 
 .icon svg {
     display: block;
+    color: var(--colors-grey700);
+}
+
+.iconButton:hover .icon svg {
+    color: var(--colors-grey900);
 }
diff --git a/src/components/layers/overlays/styles/AddLayerButton.module.css b/src/components/layers/overlays/styles/AddLayerButton.module.css
index 529d04c8d..de920d003 100644
--- a/src/components/layers/overlays/styles/AddLayerButton.module.css
+++ b/src/components/layers/overlays/styles/AddLayerButton.module.css
@@ -17,8 +17,8 @@
     color: var(--colors-grey900);
     cursor: pointer;
     user-select: none;
-    padding: 0px 12px;
-    width: 100%
+    padding: 0px;
+    width: 100%;
 }
 
 .content {
@@ -27,12 +27,20 @@
     padding: var(--spacers-dp4) var(--spacers-dp8);
     gap: var(--spacers-dp8);
 }
+.content svg {
+    color: var(--colors-grey700);
+}
 
 .button:hover:enabled,
 .button:active {
     background-color: var(--colors-grey200);
 }
 
+.button:hover:enabled .content svg,
+.button:active .content svg {
+    color: var(--colors-grey900);
+}
+
 .button:focus {
     outline: 3px solid var(--theme-focus);
     outline-offset: -3px;
diff --git a/src/components/layers/overlays/styles/Layer.module.css b/src/components/layers/overlays/styles/Layer.module.css
index f8297abf3..8d5222bde 100644
--- a/src/components/layers/overlays/styles/Layer.module.css
+++ b/src/components/layers/overlays/styles/Layer.module.css
@@ -1,10 +1,17 @@
 .container {
     float: left;
-    width: 120px;
-    margin-right: var(--spacers-dp16);
+    width: 128px;
+    margin-right: var(--spacers-dp4);
+    margin-bottom: var(--spacers-dp4);
+    padding: var(--spacers-dp4);
     cursor: pointer;
     box-sizing: border-box;
-    height: 160px;
+    height: auto;
+    background-color: transparent;
+    border-radius: 3px;
+}
+.container:hover {
+    background-color: var(--colors-grey100);
 }
 
 .image {
@@ -12,6 +19,10 @@
     border: 1px solid var(--colors-grey400);
     width: 120px;
     height: 120px;
+    border-radius: 2px;
+}
+.container:hover .image {
+    border-color: var(--colors-grey500);
 }
 
 .noImage {
@@ -19,20 +30,27 @@
     border: 1px solid var(--colors-grey400);
     width: 120px;
     height: 120px;
+    border-radius: 2px;
     line-height: 120px;
     background: var(--colors-grey200);
-    color: var(--colors-grey500);
+    color: var(--colors-grey600);
     font-size: 12px;
     text-align: center;
     margin-bottom: var(--spacers-dp4);
 }
+.container:hover .noImage {
+    border-color: var(--colors-grey500);
+}
 
 .name {
     font-size: 14px;
     color: var(--colors-grey800);
-    padding-bottom: 20px;
+    padding-bottom: var(--spacers-dp4);
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     text-align: center;
 }
+.container:hover .name {
+    color: var(--colors-grey900);
+}
diff --git a/src/components/layers/overlays/styles/LayerList.module.css b/src/components/layers/overlays/styles/LayerList.module.css
index 79ac907ac..4ec3058bb 100644
--- a/src/components/layers/overlays/styles/LayerList.module.css
+++ b/src/components/layers/overlays/styles/LayerList.module.css
@@ -3,9 +3,9 @@
 }
 
 .list {
-    max-width: 696px;
+    max-width: 684px;
     max-height: calc(100vh - 150px);
-    padding: var(--spacers-dp16) 0 0 var(--spacers-dp16);
+    padding: var(--spacers-dp8) var(--spacers-dp12);
     overflow-y: auto;
 }
 
diff --git a/src/components/layers/styles/LayerCard.module.css b/src/components/layers/styles/LayerCard.module.css
index cb6aebe71..74905c0fd 100644
--- a/src/components/layers/styles/LayerCard.module.css
+++ b/src/components/layers/styles/LayerCard.module.css
@@ -1,6 +1,6 @@
 .card {
     position: relative;
-    margin: var(--spacers-dp8) var(--spacers-dp4) -4px var(--spacers-dp4);
+    margin: var(--spacers-dp4) var(--spacers-dp4) -2px var(--spacers-dp4);
     padding-bottom: 0;
     z-index: 1200;
 }
@@ -53,10 +53,10 @@
 
 .expand {
     position: absolute;
-    top: 4px;
-    right: -4px;
-    width: 48px;
-    height: 48px;
+    top: 11px;
+    right: 2px;
+    width: 32px;
+    height: 32px;
     padding: 12px;
     cursor: pointer;
 }
@@ -68,7 +68,7 @@
 .collapsibleContent {
     max-height: 0px;
     overflow: hidden;
-    transition: max-height 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    transition: max-height 0.2s ease;
 }
 
 .expanded .collapsibleContent {
diff --git a/src/components/layers/styles/LayersPanel.module.css b/src/components/layers/styles/LayersPanel.module.css
index 7edd3910a..1a46f6ade 100644
--- a/src/components/layers/styles/LayersPanel.module.css
+++ b/src/components/layers/styles/LayersPanel.module.css
@@ -7,9 +7,8 @@
 }
 
 .layersPanelInner {
-    background-color: #f4f6f8;
-    border-right: 1px solid #e0e0e0;
-    box-shadow: 1px 0 1px 0 rgba(0, 0, 0, 0.2);
+    background-color: var(--colors-grey200);
+    border-right: 1px solid var(--colors-grey400);
     height: 100%;
     overflow-y: auto;
     z-index: 1190;
diff --git a/src/components/layers/styles/LayersToggle.module.css b/src/components/layers/styles/LayersToggle.module.css
index e4dcfa7a4..f47cba551 100644
--- a/src/components/layers/styles/LayersToggle.module.css
+++ b/src/components/layers/styles/LayersToggle.module.css
@@ -7,9 +7,11 @@
     padding: var(--spacers-dp8) 0;
     color: var(--colors-grey600);
     background-color: var(--colors-white);
-    box-shadow: 3px 1px 5px -1px rgba(0, 0, 0, 0.2);
+    box-shadow: var(--elevations-e100);
     z-index: 1100;
     cursor: pointer;
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
 }
 
 .layersToggle.collapsed {
@@ -17,5 +19,7 @@
 }
 
 .layersToggle:hover {
-    background-color: var(--colors-grey100);
+    background-color: var(--colors-grey050);
+    color: var(--colors-grey900);
+    box-shadow: var(--elevations-e200);
 }
diff --git a/src/components/layers/styles/SortableHandle.module.css b/src/components/layers/styles/SortableHandle.module.css
index 9aa693612..68395ae56 100644
--- a/src/components/layers/styles/SortableHandle.module.css
+++ b/src/components/layers/styles/SortableHandle.module.css
@@ -1,7 +1,14 @@
 .handle {
     position: absolute;
     left: var(--spacers-dp4);
-    top: var(--spacers-dp16);
+    top: 15px;
+    width: 24px;
+    height: 24px;
+    border-radius: 3px;
     color: var(--colors-grey600);
     cursor: ns-resize;
 }
+.handle:hover {
+    background-color: var(--colors-grey200);
+    color: var(--colors-grey900);
+}
diff --git a/src/components/layers/toolbar/styles/LayerToolbar.module.css b/src/components/layers/toolbar/styles/LayerToolbar.module.css
index 1ca6c3a28..4c51cf99d 100644
--- a/src/components/layers/toolbar/styles/LayerToolbar.module.css
+++ b/src/components/layers/toolbar/styles/LayerToolbar.module.css
@@ -2,14 +2,14 @@
     position: relative;
     height: var(--spacers-dp32);
     min-height: var(--spacers-dp32);
-    padding: 0 var(--spacers-dp8);
+    padding: 2px var(--spacers-dp8);
     border-top: 1px solid var(--colors-grey300);
     color: var(--colors-grey600);
 }
 
 .spacer {
     float: left;
-    height: var(--spacers-dp32);
+    height: 28px;
     width: var(--spacers-dp8);
 }
 
diff --git a/src/components/layers/toolbar/styles/OpacitySlider.module.css b/src/components/layers/toolbar/styles/OpacitySlider.module.css
index c7c42a871..347b619c2 100644
--- a/src/components/layers/toolbar/styles/OpacitySlider.module.css
+++ b/src/components/layers/toolbar/styles/OpacitySlider.module.css
@@ -1,6 +1,6 @@
 .container {
     width: 100px;
-    height: var(--spacers-dp32);
+    height: 28px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -17,23 +17,35 @@
     cursor: pointer;
 }
 
+.slider:disabled {
+    cursor: not-allowed;
+}
+
 .slider::-webkit-slider-thumb {
     -webkit-appearance: none;
     appearance: none;
     width: 12px;
     height: 12px;
-    background: var(--colors-grey600);
+    background: var(--colors-grey700);
     border-radius: 50%;
 }
 
 .slider::-moz-range-thumb {
     width: 12px;
     height: 12px;
-    background: var(--colors-grey600);
+    background: var(--colors-grey700);
     border: 0;
     border-radius: 50%;
 }
 
+.slider::-webkit-slider-thumb:hover {
+    background: var(--colors-grey900);
+}
+
+.slider::-moz-range-thumb:hover {
+    background: var(--colors-grey900);
+}
+
 .slider::-moz-focus-outer {
     border: 0;
 }