diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss
index 3a11c3717..f20199090 100644
--- a/frontend/resources/styles/common/framework.scss
+++ b/frontend/resources/styles/common/framework.scss
@@ -88,6 +88,7 @@
   }
   &:hover {
     background: $color-primary;
+    color: $color-gray-60;
     svg {
       fill: $color-gray-60;
     }
diff --git a/frontend/resources/styles/main/partials/forms.scss b/frontend/resources/styles/main/partials/forms.scss
index 05830474a..dedf5ef6b 100644
--- a/frontend/resources/styles/main/partials/forms.scss
+++ b/frontend/resources/styles/main/partials/forms.scss
@@ -195,6 +195,7 @@ textarea {
   display: flex;
   flex-direction: column;
   position: relative;
+  justify-content: center;
 
   label {
     font-size: $fs10;
diff --git a/frontend/resources/styles/main/partials/sidebar-element-options.scss b/frontend/resources/styles/main/partials/sidebar-element-options.scss
index d3151f6d2..832324e2d 100644
--- a/frontend/resources/styles/main/partials/sidebar-element-options.scss
+++ b/frontend/resources/styles/main/partials/sidebar-element-options.scss
@@ -283,6 +283,9 @@
       font-size: $fs12;
     }
 
+    &:hover {
+      border: 1px solid $color-gray-20;
+    }
 
   }
   .custom-select-dropdown {
@@ -361,9 +364,11 @@
   }
 
   .editable-select {
+    border: 1px solid transparent;
     position: relative;
     height: 38px;
     margin-right: $small;
+    max-height: 30px;
     position: relative;
     width: 60%;
 
@@ -399,7 +404,7 @@
 
     .dropdown-button {
       position: absolute;
-      top: 7px;
+      top: 4px;
       right: 0;
     }
 
@@ -418,6 +423,10 @@
         color: #b1b2b5;
       }
     }
+
+    &:hover {
+      border: 1px solid $color-gray-40;
+    }
   }
 }
 
@@ -436,6 +445,7 @@
     padding-left: 0;
     color: #b1b2b5;
     background-color: transparent;
+    height: 30px;
   }
 }
 
@@ -669,20 +679,33 @@
 }
 
 .element-set-content .grid-option-main {
+  align-items: center;
   display: flex;
-  padding: 0.5rem 0;
+  padding: 0.3rem 0;
   border: 1px solid $color-black;
   border-radius: 4px;
+  height: 48px;
 
   &:hover {
-    background: #1F1F1F;
+    background: $color-gray-60;
+
+    .custom-select,
+    .editable-select,
+    input {
+      background-color: $color-gray-50;
+    }
   }
 
   & .custom-select {
     min-width: 4.75rem;
     height: 2rem;
-    border: none;
+    border-color: transparent;
     border-bottom: 1px solid #65666A;
+    max-height: 30px;
+
+    &:hover {
+      border: 1px solid $color-gray-40;
+    }
   }
 
   & .input-element {
@@ -784,8 +807,8 @@
       align-items: center;
       cursor: pointer;
       svg {
-        width: 20px;
-        height: 20px;
+        width: 12px;
+        height: 12px;
         fill: $color-gray-20;
       }
     }
diff --git a/frontend/resources/styles/main/partials/tab-container.scss b/frontend/resources/styles/main/partials/tab-container.scss
index 601f394ea..1fd32a557 100644
--- a/frontend/resources/styles/main/partials/tab-container.scss
+++ b/frontend/resources/styles/main/partials/tab-container.scss
@@ -35,7 +35,8 @@
     flex: 1;
     height: 100%;
     max-height: 100%;
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: auto;
 }
 
 .tab-element, .tab-element-content {
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs
index f20b68deb..30fa969e1 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs
@@ -144,7 +144,7 @@
            [:div.delete-icon {:on-click (partial delete-export index)}
             i/minus]])
 
-        [:div.btn-large.btn-icon-dark.download-button
+        [:div.btn-icon-dark.download-button
          {:on-click (when-not @loading? on-download)
           :class (dom/classnames
                   :btn-disabled @loading?)