diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index 32f6b49..4199944 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -200,8 +200,9 @@ $raven_padding: 8px;
 
     entry.search {
       padding: 5px 10px;
+      margin: 0 1px;
       border: none;
-      border-bottom: 1px solid rgba(black, if($variant == 'light', 0.1, 0.75));
+      border-bottom: 1px solid $dark_sidebar_border;
       border-radius: 0;
       box-shadow: none;
       font-size: 110%;
@@ -290,8 +291,9 @@ $raven_padding: 8px;
     }
 
     .budgie-menu-footer {
-      border-top: 1px solid $borders_color;
+      border-top: 1px solid $dark_sidebar_border;
       padding: $container_padding;
+      margin: 0 1px;
 
       button {
         min-height: 16px;
@@ -356,11 +358,21 @@ $raven_padding: 8px;
   }
 
   &.sound-popover {
-    buttonbox.linked > button { border-radius: $bt_radius; }
+    buttonbox.linked {
+      padding-top: 6px;
+
+      > button { border-radius: $bt_radius; }
+    }
   }
 
   &.caffeine-popover {
-    // .container { padding: $container_padding; }
+    .container {
+      padding: $container_padding;
+
+      .container {
+        padding: $container_padding;
+      }
+    }
   }
 
   &.night-light-indicator {
@@ -369,9 +381,9 @@ $raven_padding: 8px;
     .view-header { padding: 0 $container_padding 0 ($container_padding - 2px); }
   }
 
-  &.icon-popover {
-    // .container { padding: $container_padding; }
-  }
+  // &.icon-popover {
+  //   .container { padding: $container_padding; }
+  // }
 
   &.places-menu {
     // .container { padding: $container_padding; }
@@ -1129,8 +1141,8 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px
       list { background-color: transparent; }
 
       > list > row.activatable {
-        margin-left: -8px;
-        margin-right: -2px;
+        margin-left: -6px;
+        margin-right: -6px;
         background-color: transparent;
 
         > grid > *, // legacy