diff --git a/src/gnome-shell/gnome-shell-dark.css b/src/gnome-shell/gnome-shell-dark.css
index 76316d8..a16c720 100644
--- a/src/gnome-shell/gnome-shell-dark.css
+++ b/src/gnome-shell/gnome-shell-dark.css
@@ -1381,7 +1381,7 @@ StScrollBar {
 #dash {
   font-size: 1em;
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(255, 255, 255, 0.13);
   padding: 3px 0;
   border: none;
   border-left: 0px;
@@ -1509,7 +1509,7 @@ StScrollBar {
   text-align: center; }
 
 .app-well-app.app-folder > .overview-icon {
-  background-color: rgba(255, 255, 255, 0.1); }
+  background-color: rgba(255, 255, 255, 0.13); }
 
 .show-apps .show-apps-icon {
   color: transparent; }
@@ -1523,7 +1523,7 @@ StScrollBar {
 
 .app-folder-popup {
   -arrow-border-radius: 8px;
-  -arrow-background-color: rgba(255, 255, 255, 0.1);
+  -arrow-background-color: rgba(255, 255, 255, 0.13);
   -arrow-base: 0;
   -arrow-rise: 12px; }
 
@@ -1581,7 +1581,7 @@ StScrollBar {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(255, 255, 255, 0.13);
   border: none; }
 
 .search-statustext, .no-frequent-applications-label {
@@ -2237,7 +2237,7 @@ StScrollBar {
   background-color: rgba(0, 0, 0, 0.6); }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.1); }
+  background-color: rgba(255, 255, 255, 0.13); }
 
 #dashtodockContainer.extended:overview #dash {
   background-color: transparent; }
diff --git a/src/gnome-shell/gnome-shell-light.css b/src/gnome-shell/gnome-shell-light.css
index cb6f39e..ecc27e1 100644
--- a/src/gnome-shell/gnome-shell-light.css
+++ b/src/gnome-shell/gnome-shell-light.css
@@ -1381,7 +1381,7 @@ StScrollBar {
 #dash {
   font-size: 1em;
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(255, 255, 255, 0.13);
   padding: 3px 0;
   border: none;
   border-left: 0px;
@@ -1509,7 +1509,7 @@ StScrollBar {
   text-align: center; }
 
 .app-well-app.app-folder > .overview-icon {
-  background-color: rgba(255, 255, 255, 0.1); }
+  background-color: rgba(255, 255, 255, 0.13); }
 
 .show-apps .show-apps-icon {
   color: transparent; }
@@ -1523,7 +1523,7 @@ StScrollBar {
 
 .app-folder-popup {
   -arrow-border-radius: 8px;
-  -arrow-background-color: rgba(255, 255, 255, 0.1);
+  -arrow-background-color: rgba(255, 255, 255, 0.13);
   -arrow-base: 0;
   -arrow-rise: 12px; }
 
@@ -1581,7 +1581,7 @@ StScrollBar {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(255, 255, 255, 0.13);
   border: none; }
 
 .search-statustext, .no-frequent-applications-label {
@@ -2237,7 +2237,7 @@ StScrollBar {
   background-color: rgba(0, 0, 0, 0.6); }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.1); }
+  background-color: rgba(255, 255, 255, 0.13); }
 
 #dashtodockContainer.extended:overview #dash {
   background-color: transparent; }
diff --git a/src/gnome-shell/sass/_colors.scss b/src/gnome-shell/sass/_colors.scss
index ef7b99a..16acbf8 100644
--- a/src/gnome-shell/sass/_colors.scss
+++ b/src/gnome-shell/sass/_colors.scss
@@ -43,7 +43,7 @@ $alt_base_color: if($variant =='dark', lighten($base_color, 25%), darken($base_c
 
 $bg_color:         rgba($black, $middle_opacity);
 $alt_bg_color:     rgba($black, $lower_opacity);
-$inverse_bg_color: rgba($inverse_fg_color, 0.1);
+$inverse_bg_color: rgba($inverse_fg_color, 0.13);
 $panel_bg_color:   rgba($base_color, 0.65);
 $panel_fg_color:   if($panel == 'dark', #dedede, #242424);
 
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index bae9c2c..ff0c323 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -27,9 +27,9 @@
 .background {
   color: #dedede;
   background-color: rgba(51, 51, 51, 0.999); }
-  .background.csd, .background.ssd, .background.osd, .background.solid-csd {
+  .background.csd, .background.ssd, .background.osd {
     border-radius: 0 0 6px 6px; }
-  .background.maximized {
+  .background.maximized, .background.solid-csd {
     border-radius: 0; }
 
 .popup.background {
@@ -65,8 +65,7 @@ textview text {
   .view text:hover,
   iconview text:hover,
   textview text:hover {
-    transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    background-color: rgba(255, 255, 255, 0.02); }
+    background-color: rgba(255, 255, 255, 0.005); }
   .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
   .view text:selected,
   iconview text:selected,
@@ -3285,7 +3284,7 @@ decoration {
   messagedialog.csd decoration {
     border-radius: 6px; }
   .solid-csd decoration {
-    border: none;
+    border: 1px solid #4B4B4B;
     border-radius: 0;
     margin: 0;
     background-color: rgba(55, 55, 55, 0.95);
@@ -4418,10 +4417,14 @@ window.background:not(.csd) > widget > spinbutton {
   window.background:not(.csd) > widget > spinbutton .entry {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0; }
-window.background:not(.csd) > widget > button > button:active {
-  background-image: image(rgba(119, 119, 119, 0.95));
-  border: none;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.12); }
+window.background:not(.csd) > widget > button > button {
+  min-height: 24px; }
+  window.background:not(.csd) > widget > button > button:active {
+    background-image: image(rgba(119, 119, 119, 0.95));
+    border: none;
+    box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.12); }
+  window.background:not(.csd) > widget > button > button label {
+    padding: 4px 6px; }
 window.background:not(.csd) > menu,
 window.background:not(.csd) .menu {
   background-color: #242424;
@@ -4431,8 +4434,13 @@ window.background:not(.csd) .menu {
   window.background:not(.csd) .menu .separator:not(label), .csd
   window.background:not(.csd) .menu .separator:not(label) {
     color: rgba(255, 255, 255, 0.12); }
+window.background:not(.csd) > menu > menuitem {
+  padding: 4px 6px; }
 window.background:not(.csd) > menu > menuitem > label:disabled {
   color: rgba(222, 222, 222, 0.45); }
+window.background:not(.csd) > menu > menuitem > radio,
+window.background:not(.csd) > menu > menuitem > check {
+  padding: 0 2px 0 4px; }
 
 #MozillaGtkWidget.background {
   background-color: #333333; }
@@ -4462,8 +4470,10 @@ window.background:not(.csd) > menu > menuitem > label:disabled {
   #MozillaGtkWidget.background > window.background > menu {
     background-color: #242424;
     border-radius: 0;
-    border-color: transparent; }
+    border-color: rgba(255, 255, 255, 0.12); }
     #MozillaGtkWidget.background > window.background > menu > separator {
+      margin-top: 2px;
+      margin-bottom: 2px;
       background-color: rgba(255, 255, 255, 0.12); }
   #MozillaGtkWidget.background > widget border {
     border-color: rgba(255, 255, 255, 0.12); }
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 480d865..e74363c 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -27,9 +27,9 @@
 .background {
   color: #242424;
   background-color: rgba(245, 245, 245, 0.999); }
-  .background.csd, .background.ssd, .background.osd, .background.solid-csd {
+  .background.csd, .background.ssd, .background.osd {
     border-radius: 0 0 6px 6px; }
-  .background.maximized {
+  .background.maximized, .background.solid-csd {
     border-radius: 0; }
 
 .popup.background {
@@ -65,8 +65,7 @@ textview text {
   .view text:hover,
   iconview text:hover,
   textview text:hover {
-    transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    background-color: rgba(0, 0, 0, 0.02); }
+    background-color: rgba(0, 0, 0, 0.005); }
   .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
   .view text:selected,
   iconview text:selected,
@@ -3291,7 +3290,7 @@ decoration {
   messagedialog.csd decoration {
     border-radius: 6px; }
   .solid-csd decoration {
-    border: none;
+    border: 1px solid #E1E1E1;
     border-radius: 0;
     margin: 0;
     background-color: rgba(229, 229, 229, 0.95);
@@ -4420,10 +4419,14 @@ window.background:not(.csd) > widget > spinbutton {
   window.background:not(.csd) > widget > spinbutton .entry {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0; }
-window.background:not(.csd) > widget > button > button:active {
-  background-image: image(#afafaf);
-  border: none;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.11); }
+window.background:not(.csd) > widget > button > button {
+  min-height: 24px; }
+  window.background:not(.csd) > widget > button > button:active {
+    background-image: image(#afafaf);
+    border: none;
+    box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.11); }
+  window.background:not(.csd) > widget > button > button label {
+    padding: 4px 6px; }
 window.background:not(.csd) > menu,
 window.background:not(.csd) .menu {
   background-color: #ffffff;
@@ -4433,8 +4436,13 @@ window.background:not(.csd) .menu {
   window.background:not(.csd) .menu .separator:not(label), .csd
   window.background:not(.csd) .menu .separator:not(label) {
     color: rgba(0, 0, 0, 0.11); }
+window.background:not(.csd) > menu > menuitem {
+  padding: 4px 6px; }
 window.background:not(.csd) > menu > menuitem > label:disabled {
   color: rgba(36, 36, 36, 0.55); }
+window.background:not(.csd) > menu > menuitem > radio,
+window.background:not(.csd) > menu > menuitem > check {
+  padding: 0 2px 0 4px; }
 
 #MozillaGtkWidget.background {
   background-color: #f5f5f5; }
@@ -4464,8 +4472,10 @@ window.background:not(.csd) > menu > menuitem > label:disabled {
   #MozillaGtkWidget.background > window.background > menu {
     background-color: #ffffff;
     border-radius: 0;
-    border-color: transparent; }
+    border-color: rgba(0, 0, 0, 0.11); }
     #MozillaGtkWidget.background > window.background > menu > separator {
+      margin-top: 2px;
+      margin-bottom: 2px;
       background-color: rgba(0, 0, 0, 0.11); }
   #MozillaGtkWidget.background > widget border {
     border-color: rgba(0, 0, 0, 0.11); }
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index 3937ce7..b4e60ab 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -1471,12 +1471,15 @@ window.background:not(.csd) {
 //      padding: 2px 6px;
 //      background-size: auto;
 //      color: $fg_color;
+      min-height: 24px;
 
       &:active {
         background-image: image($header_button_active_bg);
         border: none;
         box-shadow: inset 0 0 0 1px $borders_color;
       }
+
+      label { padding: 4px 6px; }
     }
   }
 
@@ -1489,8 +1492,10 @@ window.background:not(.csd) {
     .separator:not(label),
     .csd & .separator:not(label) { color: $borders_color; }
   }
-
+  > menu > menuitem { padding: 4px 6px; }
   > menu > menuitem > label:disabled { color: $insensitive_fg_color; }
+  > menu > menuitem > radio,
+  > menu > menuitem > check { padding: 0 2px 0 4px; }
 }
 
 // /*******************
@@ -1531,10 +1536,10 @@ window.background:not(.csd) {
   > window.background > menu { // context-menus
     background-color: $base_color;
     border-radius: 0;
-    border-color: transparent;
+    border-color: $borders_color;
 
     // revert to standard separators
-    > separator { background-color: $borders_color; }
+    > separator { margin-top: 2px; margin-bottom: 2px; background-color: $borders_color; }
   }
 
   > widget {
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 56b9426..25335db 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -42,9 +42,8 @@ $wm_radius: 6px;
   background-color: if($transparency == 'true', transparentize($bg_color, 0.001), $bg_color);
 
   &.csd,
-  &.ssd, &.osd,
-  &.solid-csd { border-radius: 0 0 $wm_radius $wm_radius; } // Set csd windows botttom border radius
-  &.maximized { border-radius: 0; } // No radius when windows maximized
+  &.ssd, &.osd { border-radius: 0 0 $wm_radius $wm_radius; } // Set csd windows botttom border radius
+  &.maximized, &.solid-csd { border-radius: 0; } // No radius when windows maximized
 }
 
 .popup.background {
@@ -80,7 +79,7 @@ $wm_radius: 6px;
   background-color: $base_color;
   transition: all 200ms $ease-out-quad;
 
-  &:hover { transition: all 350ms $ease-out-quad; background-color: if($variant=='light', rgba(black, 0.02), rgba(white, 0.02)); }
+  &:hover { background-color: if($variant=='light', rgba(black, 0.005), rgba(white, 0.005)); }
 
   &:selected {
     &, &:focus {
@@ -3574,7 +3573,7 @@ decoration {
     border-radius: $wm_radius;
   }
   .solid-csd & {
-    border: none;
+    border: 1px solid $bar_border;
     border-radius: 0;
     margin: 0;
     background-color: $header_bg;