diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
index fb5df1d2..9fc43268 100644
--- a/src/_sass/gtk/apps/_budgie.scss
+++ b/src/_sass/gtk/apps/_budgie.scss
@@ -111,7 +111,7 @@
     &.content-box {
       row.activatable {
         padding: 0;
-        background: 0;
+        background: none;
         border: none;
         box-shadow: none;
       }
@@ -177,8 +177,6 @@
     }
   }
 
-  switch { margin-left: 56px; }
-
   &:not(.budgie-menu) button.flat:not(.image-button) {
     @extend %budgie_button_transition;
     min-height: 28px;
@@ -206,7 +204,7 @@
   }
 
   &.user-menu {
-    .container { padding: 8px; }
+    frame.container { padding: 6px; }
 
     separator { margin: 4px 0; background-color: $borders_color; }
   }
@@ -220,19 +218,19 @@
   }
 
   &.caffeine-popover {
-    .container { padding: 6px; }
+    frame.container { padding: 6px; }
   }
 
   &.night-light-indicator {
-    .container { padding: 6px; }
+    frame.container { padding: 6px; }
   }
 
   &.icon-popover {
-    .container { padding: 6px; }
+    frame.container { padding: 6px; }
   }
 
   &.places-menu {
-    .container { padding: 8px; }
+    frame.container { padding: 6px; }
 
     .places-list:not(.always-expand) {
       margin-top: 4px;
@@ -245,6 +243,14 @@
       padding: 3px;
       font-size: 15px;
     }
+
+    list > row.activatable {
+      padding: 0;
+
+      &, &:hover, &:active, &:selected {
+        background: none;
+      }
+    }
   }
 
   &.workspace-popover {
diff --git a/src/gtk/theme-3.0/gtk-Dark.css b/src/gtk/theme-3.0/gtk-Dark.css
index 523f6e1a..4e228b6f 100644
--- a/src/gtk/theme-3.0/gtk-Dark.css
+++ b/src/gtk/theme-3.0/gtk-Dark.css
@@ -7912,7 +7912,7 @@ MsdOsdWindow.background.osd .progressbar {
 
 .budgie-popover list.content-box row.activatable {
   padding: 0;
-  background: 0;
+  background: none;
   border: none;
   box-shadow: none;
 }
@@ -7984,10 +7984,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-.budgie-popover switch {
-  margin-left: 56px;
-}
-
 .budgie-popover:not(.budgie-menu) button.flat:not(.image-button) {
   min-height: 28px;
   padding: 0 8px;
@@ -8014,8 +8010,8 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 0;
 }
 
-.budgie-popover.user-menu .container {
-  padding: 8px;
+.budgie-popover.user-menu frame.container {
+  padding: 6px;
 }
 
 .budgie-popover.user-menu separator {
@@ -8032,20 +8028,20 @@ MsdOsdWindow.background.osd .progressbar {
   border-color: rgba(255, 255, 255, 0.12);
 }
 
-.budgie-popover.caffeine-popover .container {
+.budgie-popover.caffeine-popover frame.container {
   padding: 6px;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.night-light-indicator frame.container {
   padding: 6px;
 }
 
-.budgie-popover.icon-popover .container {
+.budgie-popover.icon-popover frame.container {
   padding: 6px;
 }
 
-.budgie-popover.places-menu .container {
-  padding: 8px;
+.budgie-popover.places-menu frame.container {
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -8059,6 +8055,14 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 15px;
 }
 
+.budgie-popover.places-menu list > row.activatable {
+  padding: 0;
+}
+
+.budgie-popover.places-menu list > row.activatable, .budgie-popover.places-menu list > row.activatable:hover, .budgie-popover.places-menu list > row.activatable:active, .budgie-popover.places-menu list > row.activatable:selected {
+  background: none;
+}
+
 .budgie-popover.workspace-popover .container {
   padding: 2px 8px 8px;
 }
diff --git a/src/gtk/theme-3.0/gtk-Light.css b/src/gtk/theme-3.0/gtk-Light.css
index c3689af7..3ef4d5ac 100644
--- a/src/gtk/theme-3.0/gtk-Light.css
+++ b/src/gtk/theme-3.0/gtk-Light.css
@@ -7884,7 +7884,7 @@ MsdOsdWindow.background.osd .progressbar {
 
 .budgie-popover list.content-box row.activatable {
   padding: 0;
-  background: 0;
+  background: none;
   border: none;
   box-shadow: none;
 }
@@ -7956,10 +7956,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover switch {
-  margin-left: 56px;
-}
-
 .budgie-popover:not(.budgie-menu) button.flat:not(.image-button) {
   min-height: 28px;
   padding: 0 8px;
@@ -7986,8 +7982,8 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 0;
 }
 
-.budgie-popover.user-menu .container {
-  padding: 8px;
+.budgie-popover.user-menu frame.container {
+  padding: 6px;
 }
 
 .budgie-popover.user-menu separator {
@@ -8004,20 +8000,20 @@ MsdOsdWindow.background.osd .progressbar {
   border-color: rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover.caffeine-popover .container {
+.budgie-popover.caffeine-popover frame.container {
   padding: 6px;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.night-light-indicator frame.container {
   padding: 6px;
 }
 
-.budgie-popover.icon-popover .container {
+.budgie-popover.icon-popover frame.container {
   padding: 6px;
 }
 
-.budgie-popover.places-menu .container {
-  padding: 8px;
+.budgie-popover.places-menu frame.container {
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -8031,6 +8027,14 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 15px;
 }
 
+.budgie-popover.places-menu list > row.activatable {
+  padding: 0;
+}
+
+.budgie-popover.places-menu list > row.activatable, .budgie-popover.places-menu list > row.activatable:hover, .budgie-popover.places-menu list > row.activatable:active, .budgie-popover.places-menu list > row.activatable:selected {
+  background: none;
+}
+
 .budgie-popover.workspace-popover .container {
   padding: 2px 8px 8px;
 }
diff --git a/src/gtk/theme-3.0/gtk.css b/src/gtk/theme-3.0/gtk.css
index d332c604..90c391ba 100644
--- a/src/gtk/theme-3.0/gtk.css
+++ b/src/gtk/theme-3.0/gtk.css
@@ -7900,7 +7900,7 @@ MsdOsdWindow.background.osd .progressbar {
 
 .budgie-popover list.content-box row.activatable {
   padding: 0;
-  background: 0;
+  background: none;
   border: none;
   box-shadow: none;
 }
@@ -7972,10 +7972,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover switch {
-  margin-left: 56px;
-}
-
 .budgie-popover:not(.budgie-menu) button.flat:not(.image-button) {
   min-height: 28px;
   padding: 0 8px;
@@ -8002,8 +7998,8 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 0;
 }
 
-.budgie-popover.user-menu .container {
-  padding: 8px;
+.budgie-popover.user-menu frame.container {
+  padding: 6px;
 }
 
 .budgie-popover.user-menu separator {
@@ -8020,20 +8016,20 @@ MsdOsdWindow.background.osd .progressbar {
   border-color: rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover.caffeine-popover .container {
+.budgie-popover.caffeine-popover frame.container {
   padding: 6px;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.night-light-indicator frame.container {
   padding: 6px;
 }
 
-.budgie-popover.icon-popover .container {
+.budgie-popover.icon-popover frame.container {
   padding: 6px;
 }
 
-.budgie-popover.places-menu .container {
-  padding: 8px;
+.budgie-popover.places-menu frame.container {
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -8047,6 +8043,14 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 15px;
 }
 
+.budgie-popover.places-menu list > row.activatable {
+  padding: 0;
+}
+
+.budgie-popover.places-menu list > row.activatable, .budgie-popover.places-menu list > row.activatable:hover, .budgie-popover.places-menu list > row.activatable:active, .budgie-popover.places-menu list > row.activatable:selected {
+  background: none;
+}
+
 .budgie-popover.workspace-popover .container {
   padding: 2px 8px 8px;
 }