diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index bcc224e..bc29826 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -11,17 +11,17 @@
 
 // overall menu
 #calendarArea {
-  padding: $base_padding * 2 0;
+  padding: $base_padding * 1.5 0;
 }
 
 // Calendar menu side column
 .datemenu-calendar-column {
   spacing: $base_spacing;
   border: 0 solid $borders_color;
-  padding: 0 $base_padding * 2;
+  padding: 0 0 0 $base_padding * 2;
 
-  &:ltr {margin-right: $base_margin * 2; border-left-width: 0; }
-  &:rtl {margin-left: $base_margin * 2; border-right-width: 0; }
+  &:ltr { margin-right: $base_margin * 2; border-left-width: 0; }
+  &:rtl { margin-left: $base_margin * 2; border-right-width: 0; }
 
   .datemenu-displays-section { padding-bottom: 0; }
 
diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss
index 0922e95..bbba108 100644
--- a/src/sass/gnome-shell/common/_message-list.scss
+++ b/src/sass/gnome-shell/common/_message-list.scss
@@ -3,7 +3,7 @@
 
 .message-list {
   width: 31.5em;
-  padding: $base_padding;
+  padding: $base_padding * 1.5 0;
   text-shadow: none;
   border: none;
 
diff --git a/src/sass/gnome-shell/common/_quick-settings.scss b/src/sass/gnome-shell/common/_quick-settings.scss
index 92c9454..841012c 100644
--- a/src/sass/gnome-shell/common/_quick-settings.scss
+++ b/src/sass/gnome-shell/common/_quick-settings.scss
@@ -1,17 +1,9 @@
 .quick-settings {
-  padding: $base_padding * 3 !important;
-  border-radius: 10px + $base_padding * 4 !important;
+  padding: $base_padding * 3;
+  border-radius: $modal_radius * 2;
 
   .icon-button, .button {
-    min-height: 20px + $base_padding * 2 !important;
-    min-width: 20px + $base_padding * 2 !important;
-    padding: 0 !important;
-    border-radius: $circular_radius;
-  }
-
-  .popup-menu-content {
-    padding: $base_padding * 2 !important;
-    margin-top: $base_padding * 2 !important;
+    padding: $base_padding * 1.75;
   }
 }
 
@@ -22,9 +14,9 @@
 
 .quick-toggle {
   border-radius: $circular_radius;
-  min-width: 12em !important;
-  max-width: 12em !important;
-  min-height: 40px !important;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
   border: none;
   background-color: $fill_color !important;
 
@@ -55,22 +47,22 @@
 
   /* Move padding into the box; this is to allow menu arrows
      to extend to the border */
-  &.button { padding: 0 !important; }
-  & > StBoxLayout { padding: 0 $base_padding * 2 !important; }
-  &:ltr > StBoxLayout { padding-left: $base_padding * 2.5 !important; }
-  &:rtl > StBoxLayout { padding-right: $base_padding * 2.5 !important; }
+  &.button { padding: 0; }
+  & > StBoxLayout { padding: 0 $base_padding * 2; }
+  &:ltr > StBoxLayout { padding-left: $base_padding * 2.5; }
+  &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; }
 
   .quick-toggle-label { font-weight: bold; }
   .quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size; }
 }
 
 .quick-menu-toggle {
-  &:ltr > StBoxLayout { padding-right: 0 !important; }
-  &:rtl > StBoxLayout { padding-left: 0 !important; }
+  &:ltr > StBoxLayout { padding-right: 0; }
+  &:rtl > StBoxLayout { padding-left: 0; }
 
   .quick-toggle-arrow {
     background-color: $fill_color !important;
-    padding: $base_padding $base_padding * 1.75 !important;
+    padding: $base_padding $base_padding * 1.75;
 
     &:active {
       background-color: $divider_color !important;
@@ -114,12 +106,13 @@
 .quick-toggle-menu {
   background-color: $menu_bg !important;
   color: $text_color !important;
-  border-radius: 10px + $base_padding * 2.5 !important;
-  padding: $base_padding * 2 !important;
-  margin: $base_padding * 2 $base_padding * 6 0 !important;
+  border-radius: $base_border_radius * 3;
+  padding: $base_padding * 2;
+  margin: $base_padding * 2 $base_padding * 6 0;
 
   .popup-menu-item {
     border-radius: $circular_radius !important;
+    min-height: 20px;
 
     &:focus, &:hover, &.selected {
       color: $text_color !important;
@@ -155,6 +148,8 @@
     background-color: $fill_color;
     color: $text_color;
     border-radius: $circular_radius;
+    min-height: 24px;
+    min-width: 24px;
 
     &:hover { @include button(flat-hover); }
     &:active { @include button(flat-active); }
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 9bcaade..6a790ef 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1606,7 +1606,7 @@ headerbar {
     &:disabled { background: none; }
   }
 
-  stackswitcher.linked.stack-switcher:not(.vertical) > button {
+  .linked.stack-switcher:not(.vertical) > button {
     min-width: $menuitem_size - 4px;
     border-radius: $bt_radius;
   }
@@ -1633,7 +1633,7 @@ headerbar {
     &:backdrop { opacity: 0.65; background-image: none; }
   }
 
-  stackswitcher {
+  .stack-switcher {
     box-shadow: inset 0 0 0 1px $light_borders_color;
     border-radius: $bt_radius;
     padding: 0;
diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index 70f8c08..1c2a457 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -197,7 +197,7 @@ $raven_padding: 8px;
     entry.search {
       padding: 5px 10px;
       border: none;
-      border-bottom: 1px solid $header_border;
+      border-bottom: 1px solid rgba(black, if($variant == 'light', 0.1, 0.75));
       border-radius: 0;
       box-shadow: none;
       font-size: 110%;
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 961936c..a7e28b6 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -1390,7 +1390,11 @@ window.background.csd {
       &,
       > stack,
       > stack > box.vertical {
-        > list > row.activatable { @extend %sidebar_row; }
+        > list {
+          padding: 2px 0;
+
+          > row.activatable { @extend %sidebar_row; }
+        }
       }
     }
   }