From a0da43a593a13bbe3771a613946ca6ea64b21b4c Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Thu, 23 Mar 2023 19:35:33 +0800
Subject: [PATCH] Fixed budgie issues

---
 src/_sass/gtk/_budgie.scss | 379 ++++++++++++++++---------------
 src/gtk/3.0/gtk-dark.css   | 441 +++++++++++++++++++++----------------
 src/gtk/3.0/gtk-light.css  | 441 +++++++++++++++++++++----------------
 src/gtk/3.0/gtk.css        | 441 +++++++++++++++++++++----------------
 4 files changed, 967 insertions(+), 735 deletions(-)

diff --git a/src/_sass/gtk/_budgie.scss b/src/_sass/gtk/_budgie.scss
index ce3a552a..0480a7bf 100644
--- a/src/_sass/gtk/_budgie.scss
+++ b/src/_sass/gtk/_budgie.scss
@@ -11,25 +11,30 @@
   color: on($panel, secondary);
   background-color: transparent;
   box-shadow: none;
+
   &:hover {
     color: on($panel, secondary);
     background-color: rgba(on($panel, secondary), 0.1);
     box-shadow: none;
   }
+
   &:disabled {
     color: rgba(on($panel, secondary), 0.5);
     background-color: transparent;
   }
+
   &:checked {
     background-color: rgba(on($panel, secondary), 0.12);
     color: on($panel, secondary);
     box-shadow: none;
   }
+
   &:active {
     background-color: rgba(on($panel, secondary), 0.15);
     color: on($panel, secondary);
     box-shadow: none;
   }
+
   &:checked:disabled {
     background-color: rgba(on($panel, secondary), 0.06);
     color: rgba(on($panel, secondary), 0.65);
@@ -39,23 +44,28 @@
 
 %budgie_button_flat {
   color: rgba(white, 0.85);
+
   &:hover {
     color: white;
     background-color: rgba(white, 0.15);
     border-color: rgba(white, 0.15);
   }
+
   &:checked {
     color: white;
     background-color: rgba(white, 0.25);
   }
+
   &:active {
     color: white;
     background-color: rgba(white, 0.20);
   }
+
   &:disabled {
     label, & { color: rgba(white, 0.5); }
     background-color: transparent;
   }
+
   &:checked:disabled {
     background-color: rgba(white, 0.1);
     color: rgba(white, 0.65);
@@ -99,11 +109,18 @@
   background-color: $suface;
 
   .container {
-    padding: 0;
+    padding: $space_size;
     border: none;
+
+    .container {
+      padding: 0;
+    }
   }
 
-  separator { margin: $space_size / 2 0; }
+  widget > separator {
+    margin: $space_size / 2 0;
+
+  }
 
   border { border: none; }
 
@@ -214,9 +231,51 @@
   &.budgie-menu {
     .container { padding: 0; }
 
+    &.background {
+      padding: 0;
+      background-color: $base;
+    }
+
+    .categories {
+      &:dir(ltr) { border-bottom-left-radius: $button_radius; }
+
+      &:dir(rtl) { border-bottom-right-radius: $button_radius; }
+    }
+
+    button.category-button {
+      border-radius: 0;
+    }
+
+    row.activatable > button.flat {
+      @extend %row_activatable;
+
+      min-height: 32px;
+      padding: 0 8px;
+      border-radius: 0;
+      color: $text;
+      font-weight: normal;
+
+      &:disabled { color: $text-disabled; }
+
+      &:checked { @extend %selected_items; }
+
+      &:checked:disabled { background-color: $primary; } // overriding
+    }
+
+    row {
+      padding: 0;
+
+      &:hover { box-shadow: none; }
+    }
+
+    scrollbar,
+    entry.search { background-color: transparent; }
+
     entry.search {
-      border-bottom: 0 none transparent;
-      box-shadow: inset 0 -1px $border;
+      border-bottom: 1px solid $border;
+      border-radius: 0;
+      box-shadow: none;
+      font-size: 120%;
 
       &:focus { box-shadow: none; }
     }
@@ -235,10 +294,57 @@
         background-color: $primary;
       }
     }
+
+    list.left-overlay-menu {
+      box-shadow: $shadow_4, inset 0 1px $highlight;
+      background-color: $base;
+      padding: $space_size;
+      margin: $space_size;
+      border-radius: $menu_radius;
+
+      > row.activatable {
+        border-radius: $button_radius;
+
+        &:not(:last-child) {
+          margin-bottom: $space_size / 2;
+        }
+
+        button.menuitem {
+          border-radius: $button_radius;
+        }
+      }
+    }
+
+    .budgie-menu-footer {
+      border-top: 1px solid $border;
+      padding: $space_size;
+
+      button.flat {
+        min-height: 16px;
+        min-width: 16px;
+        padding: $space_size;
+        border-radius: $button_radius;
+
+        &.image-button {
+          border-radius: $circular_radius;
+
+          &:not(.last-child) {
+            margin-right: $space_size;
+          }
+        }
+      }
+    }
   }
 
+  // User Menu
   &.user-menu {
-    .container { padding: $space_size; }
+    // .container { padding: $space_size; }
+
+    // padding: $space_size;
+
+    .content-box { background-color: transparent; }
+
+    separator { margin: $space_size / 2 0; }
 
     list, row { // reset styling
       border: none;
@@ -252,18 +358,18 @@
   }
 
   &.caffeine-popover {
-    .container { padding: $space_size; }
+    // .container { padding: $space_size; }
     .view-header { margin: 0 $space_size; }
   }
 
   &.night-light-indicator {
-    .container { padding: $space_size; }
+    // .container { padding: $space_size; }
 
     .view-header { margin: 0 $space_size; }
   }
 
   &.places-menu {
-    .container { padding: $space_size; }
+    // .container { padding: $space_size; }
 
     row { background: none; }
 
@@ -295,6 +401,16 @@
       margin-right: $space_size;
     }
   }
+
+  // Menu Button
+  button.budgie-menu-launcher {
+    padding: 0 $space_size / 2;
+  }
+
+  // Raven Trigger
+  button.raven-trigger {
+    padding: 0 $space_size;
+  }
 }
 
 // budgie specific popover widgets
@@ -368,130 +484,6 @@ window.budgie-popover:not(.csd) {
   }
 }
 
-// Budgie Menu
-.budgie-menu {
-  &.background {
-    padding: 0;
-    background-color: $base;
-  }
-
-  scrollbar,
-  entry.search { background-color: transparent; }
-
-  entry.search {
-    border-bottom: 1px solid $border;
-    border-radius: 0;
-    box-shadow: none;
-    font-size: 120%;
-  }
-
-  .categories {
-    &:dir(ltr) { border-bottom-left-radius: $button_radius; }
-
-    &:dir(rtl) { border-bottom-right-radius: $button_radius; }
-  }
-
-  button {
-    @extend %row_activatable;
-
-    min-height: 32px;
-    padding: 0 8px;
-    border-radius: 0;
-    color: $text;
-    font-weight: normal;
-
-    &:disabled { color: $text-disabled; }
-
-    &:checked { @extend %selected_items; }
-
-    &:checked:disabled { background-color: $primary; } // overriding
-  }
-
-  row {
-    padding: 0;
-
-    &:hover { box-shadow: none; }
-  }
-}
-
-// Menu Button
-button.budgie-menu-launcher {
-  // padding: 0 2px;
-}
-
-// User Menu
-popover.background.user-menu {
-  padding: 8px;
-
-  .content-box { background-color: transparent; }
-
-  separator { margin: 4px 0; }
-
-  row {
-    padding: 0;
-    box-shadow: none;
-    background-image: none;
-  }
-}
-
-// Raven Trigger
-button.raven-trigger {
-  // padding: 0 4px;
-}
-
-// Places Menu
-popover.background.places-menu {
-  padding: 8px;
-
-  // FIXME: untested
-  .message-bar {
-    // margin-bottom: 4px;
-  }
-
-  .name-button.text-button {
-    // padding: 4px 8px;
-    padding-left: 8px;
-    padding-right: 8px;
-
-    image {
-      &:dir(ltr) { margin-right: 8px - 5px; }
-      &:dir(rtl) { margin-left: 8px - 5px; }
-    }
-  }
-
-  // FIXME: untested
-  .unmount-button {
-    // padding: ($medium_size - 24px) / 2;
-  }
-
-  .places-section-header > image {
-    &:dir(ltr) { margin: 0 8px - 10px 0 8px - 3px; }
-    &:dir(rtl) { margin: 0 8px - 3px 0 8px - 10px; }
-  }
-
-  .places-list {
-    margin-top: 4px;
-    padding-top: 4px;
-    border-top: 1px solid $border;
-    background-color: transparent;
-  }
-
-  row {
-    padding: 0;
-    box-shadow: none;
-    background-image: none;
-  }
-
-  // FIXME: untested
-  .unlock-area {
-    entry {
-    }
-
-    button {
-    }
-  }
-}
-
 // Panel
 .budgie-panel {
   transition: background-color $shorter_duration $deceleration_curve;
@@ -562,13 +554,13 @@ popover.background.places-menu {
   .alert { color: $destructive; }
 
   // End Section needs to be fancy
-  .end-region {
-    // background-color: rgba(0,0,0,0.2);
-  }
+  // .end-region {
+  //   background-color: rgba(0,0,0,0.2);
+  // }
 
   // Tasklist
   #tasklist-button {
-    padding: 0 4px;
+    padding: 0 $space_size;
     @extend %underscores;
     @extend %budgie_button;
   }
@@ -590,6 +582,39 @@ popover.background.places-menu {
       &:disabled { color: rgba(on($header, secondary), 0.3); }
     }
   }
+
+  // Add padding for panel indicators icons
+  > box > widget > widget {
+    > image, // normal
+    > stack > image, // Screenshot
+    > box > image { // Places
+      margin-left: $space_size;
+      margin-right: $space_size;
+    }
+
+    > box > image + label { // Reset for mailneg
+      margin-left: -$space_size + 2px;
+    }
+
+    > box { // keyboard Layout
+      > widget > image { margin-left: $space_size; }
+      > stack > widget > label { margin-right: $space_size; }
+    }
+
+    > box > widget > widget > image { // Status
+      margin-left: $space_size / 2;
+      margin-right: $space_size / 2;
+    }
+  }
+
+  // Time label
+  .budgie-clock-applet,
+  .budgie-calendar-applet {
+    > widget > box {
+      padding-left: $space_size / 2;
+      padding-right: $space_size / 2;
+    }
+  }
 }
 
 %underscores {
@@ -630,9 +655,11 @@ popover.background.places-menu {
       -gtk-icon-effect: highlight;
       > image { opacity: 1.0; }
     }
+
     &:active {
       > image { opacity: 1.0; }
     }
+
     &:checked {
       background-color: transparent;
       &:hover { -gtk-icon-effect: highlight; }
@@ -741,31 +768,10 @@ $stackswitcher_color: if($theme == 'black' or $theme == 'white', rgba(white, 0.6
 
   // > stack > box:last-child > stack { margin-top: -6px; }
 
-  button.image-button { @extend %circular_button; }
-
   stackswitcher {
-    box-shadow: inset 0 -1px $border;
-
-    &.stack-switcher {
-      background-image: none;
-      background-color: transparent;
-      border-radius: 0;
-    }
-
-    &.linked > button {
-      @extend %flat_button;
-      border-image: radial-gradient(circle closest-corner at center calc(100% - 1px),
-                                    $primary 0%,
-                                    transparent 0%)
-                                    0 0 0 / 0 0 0px;
-      &:checked {
-        border-image: radial-gradient(circle closest-corner at center calc(100% - 1px),
-                                      $primary 100%,
-                                      transparent 0%)
-                                      0 0 2 / 0 0 2px;
-        background-color: transparent;
-      }
-    }
+    background-image: none;
+    background-color: transparent;
+    border-radius: 0;
   }
 
   .raven-header {
@@ -775,10 +781,9 @@ $stackswitcher_color: if($theme == 'black' or $theme == 'white', rgba(white, 0.6
     &:not(.top) {
       margin-top: -6px; // remove extra spaces, but not perfect :(
 
-      button {
+      button.image-button {
         @extend %simple_flat_button;
-
-        &.image-button { @extend %circular_button; }
+        @extend %circular_button;
       }
     }
 
@@ -789,10 +794,7 @@ $stackswitcher_color: if($theme == 'black' or $theme == 'white', rgba(white, 0.6
       box-shadow: inset 0 -1px $border;
 
       stackswitcher {
-        box-shadow: none;
-
         button {
-          @extend %simple_flat_button;
           border-radius: 0;
           margin: -4px 0;
           min-height: $medium_size;
@@ -921,6 +923,12 @@ calendar.raven-calendar {
   }
 }
 
+image.raven-mpris {
+  background-color: $divider;
+  color: $text-secondary;
+  border-radius: $button_radius;
+}
+
 // notification list
 box.vertical > stack > box.vertical {
   > .raven-background > viewport.frame {
@@ -1005,10 +1013,14 @@ box.vertical > stack > box.vertical {
 .budgie-notification-window {
   background-color: transparent;
 
-  button.image-button { // 'close'
+  button.image-button.close { // 'close'
     @extend %flat_button;
     @extend %circular_button;
   }
+
+  .linked > button {
+    @extend %flat_button;
+  }
 }
 
 .budgie-notification {
@@ -1039,21 +1051,22 @@ box.vertical > stack > box.vertical {
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
-  border-radius: 2px;
+  padding: $space_size;
+  border-radius: $modal_radius;
   box-shadow: $shadow_2, inset 0 1px $highlight;
   background-color: $suface;
 
   button { @extend %simple_flat_button; }
 
-  .linked > button { border-radius: 2px; }
+  // .linked > button { border-radius: $button_radius; }
 }
 
 %budgie_dialog {
-  border-radius: 2px;
+  border-radius: $modal_radius;
   background-color: $suface;
+  box-shadow: $shadow_2, inset 0 1px $highlight;
 
-  decoration { border-radius: 2px; }
+  decoration { border-radius: $modal_radius; }
 
   entry { @extend %flat_entry; }
   button { @extend %flat_button; }
@@ -1065,8 +1078,8 @@ box.vertical > stack > box.vertical {
 
     @extend %simple_flat_button;
 
-    &:first-child { border-bottom-left-radius: 2px; }
-    &:last-child { border-bottom-right-radius: 2px; }
+    &:first-child { border-bottom-left-radius: $modal_radius; }
+    &:last-child { border-bottom-right-radius: $modal_radius; }
   }
 
   @each $b_type, $b_color in (suggested-action, $suggested),
@@ -1085,10 +1098,16 @@ box.vertical > stack > box.vertical {
       &:disabled { opacity: 0.65; }
     }
   }
+
+  > box > grid {
+    padding: $space_size * 4;
+  }
 }
 
-// Session Dialog
-.budgie-session-dialog {
+// Dialogs
+.budgie-session-dialog,
+.budgie-polkit-dialog,
+.budgie-run-dialog {
   @extend %budgie_dialog;
 
   label:not(:last-child),
@@ -1097,16 +1116,16 @@ box.vertical > stack > box.vertical {
 
 // PolKit Dialog
 .budgie-polkit-dialog {
-  @extend %budgie_dialog;
-
   .message { color: $text-disabled; }
   .failure { color: $destructive; }
+
+  > box > grid {
+    padding-bottom: 0;
+  }
 }
 
 // Run Dialog
 .budgie-run-dialog {
-  @extend %budgie_dialog;
-
   background-color: $base;
 
   entry.search {
diff --git a/src/gtk/3.0/gtk-dark.css b/src/gtk/3.0/gtk-dark.css
index 0a423392..6bcbfb7e 100644
--- a/src/gtk/3.0/gtk-dark.css
+++ b/src/gtk/3.0/gtk-dark.css
@@ -220,7 +220,9 @@ spinner:checked:disabled {
   opacity: 0.3;
 }
 
-#login_window entry, .budgie-run-dialog entry, .budgie-polkit-dialog entry, .budgie-session-dialog entry, .background .raven .raven-background spinbutton:not(.vertical), .background.budgie-popover entry,
+#login_window entry, .budgie-session-dialog entry,
+.budgie-polkit-dialog entry,
+.budgie-run-dialog entry, .background .raven .raven-background spinbutton:not(.vertical), .background.budgie-popover entry,
 .background.budgie-popover spinbutton:not(.vertical), .budgie-settings-window .settings-page .settings-frame .linked > entry, window.background stack scrolledwindow entry,
 window.background stack scrolledwindow spinbutton:not(.vertical), dialog.background .dialog-vbox stack entry,
 dialog.background .dialog-vbox stack spinbutton:not(.vertical), window#whiskermenu-window entry, .tilix-search-frame entry,
@@ -238,7 +240,9 @@ notebook > stack:not(:only-child) spinbutton:not(.vertical), popover.background
   border-radius: 0;
 }
 
-#login_window entry:focus, .budgie-run-dialog entry:focus, .budgie-polkit-dialog entry:focus, .budgie-session-dialog entry:focus, .background .raven .raven-background spinbutton:focus:not(.vertical), .background.budgie-popover entry:focus, .budgie-settings-window .settings-page .settings-frame .linked > entry:focus, window.background stack scrolledwindow entry:focus, dialog.background .dialog-vbox stack entry:focus,
+#login_window entry:focus, .budgie-session-dialog entry:focus,
+.budgie-polkit-dialog entry:focus,
+.budgie-run-dialog entry:focus, .background .raven .raven-background spinbutton:focus:not(.vertical), .background.budgie-popover entry:focus, .budgie-settings-window .settings-page .settings-frame .linked > entry:focus, window.background stack scrolledwindow entry:focus, dialog.background .dialog-vbox stack entry:focus,
 dialog.background .dialog-vbox stack spinbutton:focus:not(.vertical), window#whiskermenu-window entry:focus, .tilix-search-frame entry:focus, .geary-composer-box entry:focus,
 .geary-composer-box spinbutton:focus:not(.vertical), editortweak entry.search:focus, layoutpane entry.search:focus, messagedialog.background entry:focus, notebook > stack:not(:only-child) entry:focus,
 notebook > stack:not(:only-child) spinbutton:focus:not(.vertical), popover.background entry:focus, .background spinbutton:focus:not(.vertical), .background .linked > entry:focus, .background entry.flat:focus {
@@ -250,7 +254,9 @@ notebook > stack:not(:only-child) spinbutton:focus:not(.vertical), popover.backg
   border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 100%, rgba(255, 255, 255, 0.45) 10%) 0 0 2/0 0 2px;
 }
 
-#login_window entry:drop(active), .budgie-run-dialog entry:drop(active), .budgie-polkit-dialog entry:drop(active), .budgie-session-dialog entry:drop(active), .background .raven .raven-background spinbutton:drop(active):not(.vertical), .background.budgie-popover entry:drop(active), .budgie-settings-window .settings-page .settings-frame .linked > entry:drop(active), window.background stack scrolledwindow entry:drop(active), dialog.background .dialog-vbox stack entry:drop(active),
+#login_window entry:drop(active), .budgie-session-dialog entry:drop(active),
+.budgie-polkit-dialog entry:drop(active),
+.budgie-run-dialog entry:drop(active), .background .raven .raven-background spinbutton:drop(active):not(.vertical), .background.budgie-popover entry:drop(active), .budgie-settings-window .settings-page .settings-frame .linked > entry:drop(active), window.background stack scrolledwindow entry:drop(active), dialog.background .dialog-vbox stack entry:drop(active),
 dialog.background .dialog-vbox stack spinbutton:drop(active):not(.vertical), window#whiskermenu-window entry:drop(active), .tilix-search-frame entry:drop(active), .geary-composer-box entry:drop(active),
 .geary-composer-box spinbutton:drop(active):not(.vertical), editortweak entry.search:drop(active), layoutpane entry.search:drop(active), messagedialog.background entry:drop(active), notebook > stack:not(:only-child) entry:drop(active),
 notebook > stack:not(:only-child) spinbutton:drop(active):not(.vertical), popover.background entry:drop(active), .background spinbutton:drop(active):not(.vertical), .background .linked > entry:drop(active), .background entry.flat:drop(active) {
@@ -261,7 +267,9 @@ notebook > stack:not(:only-child) spinbutton:drop(active):not(.vertical), popove
   box-shadow: inset 0 -2px rgba(255, 255, 255, 0.45);
 }
 
-#login_window entry:disabled, .budgie-run-dialog entry:disabled, .budgie-polkit-dialog entry:disabled, .budgie-session-dialog entry:disabled, .background .raven .raven-background spinbutton:disabled:not(.vertical), .background.budgie-popover entry:disabled, .budgie-settings-window .settings-page .settings-frame .linked > entry:disabled, window.background stack scrolledwindow entry:disabled, dialog.background .dialog-vbox stack entry:disabled,
+#login_window entry:disabled, .budgie-session-dialog entry:disabled,
+.budgie-polkit-dialog entry:disabled,
+.budgie-run-dialog entry:disabled, .background .raven .raven-background spinbutton:disabled:not(.vertical), .background.budgie-popover entry:disabled, .budgie-settings-window .settings-page .settings-frame .linked > entry:disabled, window.background stack scrolledwindow entry:disabled, dialog.background .dialog-vbox stack entry:disabled,
 dialog.background .dialog-vbox stack spinbutton:disabled:not(.vertical), window#whiskermenu-window entry:disabled, .tilix-search-frame entry:disabled, .geary-composer-box entry:disabled,
 .geary-composer-box spinbutton:disabled:not(.vertical), editortweak entry.search:disabled, layoutpane entry.search:disabled, messagedialog.background entry:disabled, notebook > stack:not(:only-child) entry:disabled,
 notebook > stack:not(:only-child) spinbutton:disabled:not(.vertical), popover.background entry:disabled, .background spinbutton:disabled:not(.vertical), .background .linked > entry:disabled, .background entry.flat:disabled {
@@ -609,10 +617,14 @@ button:checked:disabled {
   color: alpha(#4285F4, 0.5);
 }
 
-.lightdm-gtk-greeter button, .budgie-run-dialog .linked.horizontal > button, .budgie-polkit-dialog .linked.horizontal > button, .budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .background .raven .raven-header.top stackswitcher button, .background .raven .raven-header:not(.top) button, .background.budgie-popover button, .background.budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, PanelToplevel > widget > button, .nemo-window .toolbar button, .background tabbox > tab button, .background .gedit-search-slider > .linked:not(.vertical) > button:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button, .nemo-window .floating-bar button,
+.lightdm-gtk-greeter button, .budgie-session-dialog .linked.horizontal > button,
+.budgie-polkit-dialog .linked.horizontal > button,
+.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .background .raven .raven-header:not(.top) button.image-button, .background.budgie-popover button, .background.budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, PanelToplevel > widget > button, .nemo-window .toolbar button, .background tabbox > tab button, .background .gedit-search-slider > .linked:not(.vertical) > button:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button, .nemo-window .floating-bar button,
 .nautilus-window .floating-bar button, placessidebar row button.sidebar-button, calendar.button, check,
 radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) > button, modelbutton.flat,
-.menuitem.button.flat, .inline-toolbar button:not(.text-button), .background .osd button.flat, .budgie-run-dialog button, .budgie-polkit-dialog button, .budgie-session-dialog button, .budgie-notification-window button.image-button, .budgie-switcher-window button.image-button, .budgie-osd-window button.image-button, .background .raven stackswitcher.linked > button, .caja-navigation-window button.toggle.image-button, .mate-panel-menu-bar #PanelApplet button:not(.flat), toolbar.primary-toolbar toolitem.raised button, .tilix-search-frame button, .geary-composer-box button:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle,
+.menuitem.button.flat, .inline-toolbar button:not(.text-button), .background .osd button.flat, .budgie-session-dialog button,
+.budgie-polkit-dialog button,
+.budgie-run-dialog button, .budgie-notification-window .linked > button, .budgie-switcher-window .linked > button, .budgie-osd-window .linked > button, .budgie-notification-window button.image-button.close, .budgie-switcher-window button.image-button.close, .budgie-osd-window button.image-button.close, .caja-navigation-window button.toggle.image-button, .mate-panel-menu-bar #PanelApplet button:not(.flat), toolbar.primary-toolbar toolitem.raised button, .tilix-search-frame button, .geary-composer-box button:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button, layouttabbar button, messagedialog.background.csd .linked.dialog-action-area:not(.vertical) > button, messagedialog.background .linked.dialog-action-area:not(.vertical) > button, .background .app-notification button, toolbar button:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:not(:only-child), .linked > spinbutton:not(.vertical) > button.up, .linked > spinbutton:not(.vertical) > button.down, .background .osd button, .background .linked.stack-switcher > button, button.flat {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 600ms cubic-bezier(0, 0, 0.2, 1);
@@ -625,10 +637,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button, .sid
   color: rgba(255, 255, 255, 0.7);
 }
 
-.lightdm-gtk-greeter button:hover, .budgie-run-dialog .linked.horizontal > button:hover, .budgie-polkit-dialog .linked.horizontal > button:hover, .budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .background .raven .raven-header.top stackswitcher button:hover, .background .raven .raven-header:not(.top) button:hover, .background.budgie-popover button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, PanelToplevel > widget > button:hover, .nemo-window .toolbar button:hover, .background tabbox > tab button:hover, .background .gedit-search-slider > .linked:not(.vertical) > button:hover:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:hover, .nemo-window .floating-bar button:hover,
+.lightdm-gtk-greeter button:hover, .budgie-session-dialog .linked.horizontal > button:hover,
+.budgie-polkit-dialog .linked.horizontal > button:hover,
+.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .background .raven .raven-header:not(.top) button.image-button:hover, .background.budgie-popover button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, PanelToplevel > widget > button:hover, .nemo-window .toolbar button:hover, .background tabbox > tab button:hover, .background .gedit-search-slider > .linked:not(.vertical) > button:hover:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:hover, .nemo-window .floating-bar button:hover,
 .nautilus-window .floating-bar button:hover, placessidebar row button.sidebar-button:hover, calendar.button:hover, check:hover,
 radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover,
-.menuitem.button.flat:hover, .inline-toolbar button:hover:not(.text-button), .budgie-run-dialog button:hover, .budgie-polkit-dialog button:hover, .budgie-session-dialog button:hover, .budgie-notification-window button.image-button:hover, .budgie-switcher-window button.image-button:hover, .budgie-osd-window button.image-button:hover, .background .raven stackswitcher.linked > button:hover, .caja-navigation-window button.toggle.image-button:hover, .mate-panel-menu-bar #PanelApplet button:hover:not(.flat), toolbar.primary-toolbar toolitem.raised button:hover, .tilix-search-frame button:hover, .geary-composer-box button:hover:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:hover,
+.menuitem.button.flat:hover, .inline-toolbar button:hover:not(.text-button), .budgie-session-dialog button:hover,
+.budgie-polkit-dialog button:hover,
+.budgie-run-dialog button:hover, .budgie-notification-window .linked > button:hover, .budgie-switcher-window .linked > button:hover, .budgie-osd-window .linked > button:hover, .budgie-notification-window button.image-button.close:hover, .budgie-switcher-window button.image-button.close:hover, .budgie-osd-window button.image-button.close:hover, .caja-navigation-window button.toggle.image-button:hover, .mate-panel-menu-bar #PanelApplet button:hover:not(.flat), toolbar.primary-toolbar toolitem.raised button:hover, .tilix-search-frame button:hover, .geary-composer-box button:hover:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:hover,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:hover:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:hover, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:hover, window.csd > box.vertical > box.vertical > toolbar.horizontal button:hover,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:hover, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:hover, layouttabbar button:hover, messagedialog.background .linked:not(.vertical).dialog-action-area > button:hover, .background .app-notification button:hover, toolbar button:hover:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:hover:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:hover, .linked > spinbutton:not(.vertical) > button.down:hover, .background .osd button:hover, .background .linked.stack-switcher > button:hover, button.flat:hover, .background button.flat:hover {
   background-color: transparent;
@@ -636,10 +652,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:hover
   color: white;
 }
 
-.lightdm-gtk-greeter button:active, .budgie-run-dialog .linked.horizontal > button:active, .budgie-polkit-dialog .linked.horizontal > button:active, .budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .background .raven .raven-header.top stackswitcher button:active, .background .raven .raven-header:not(.top) button:active, .background.budgie-popover button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, PanelToplevel > widget > button:active, .nemo-window .toolbar button:active, .background tabbox > tab button:active, .background .gedit-search-slider > .linked:not(.vertical) > button:active:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:active, .nemo-window .floating-bar button:active,
+.lightdm-gtk-greeter button:active, .budgie-session-dialog .linked.horizontal > button:active,
+.budgie-polkit-dialog .linked.horizontal > button:active,
+.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .background .raven .raven-header:not(.top) button.image-button:active, .background.budgie-popover button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, PanelToplevel > widget > button:active, .nemo-window .toolbar button:active, .background tabbox > tab button:active, .background .gedit-search-slider > .linked:not(.vertical) > button:active:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:active, .nemo-window .floating-bar button:active,
 .nautilus-window .floating-bar button:active, placessidebar row button.sidebar-button:active, calendar.button:active, check:active,
 radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active,
-.menuitem.button.flat:active, .inline-toolbar button:active:not(.text-button), .budgie-run-dialog button:active, .budgie-polkit-dialog button:active, .budgie-session-dialog button:active, .budgie-notification-window button.image-button:active, .budgie-switcher-window button.image-button:active, .budgie-osd-window button.image-button:active, .background .raven stackswitcher.linked > button:active, .caja-navigation-window button.toggle.image-button:active, .mate-panel-menu-bar #PanelApplet button:active:not(.flat), toolbar.primary-toolbar toolitem.raised button:active, .tilix-search-frame button:active, .geary-composer-box button:active:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:active,
+.menuitem.button.flat:active, .inline-toolbar button:active:not(.text-button), .budgie-session-dialog button:active,
+.budgie-polkit-dialog button:active,
+.budgie-run-dialog button:active, .budgie-notification-window .linked > button:active, .budgie-switcher-window .linked > button:active, .budgie-osd-window .linked > button:active, .budgie-notification-window button.image-button.close:active, .budgie-switcher-window button.image-button.close:active, .budgie-osd-window button.image-button.close:active, .caja-navigation-window button.toggle.image-button:active, .mate-panel-menu-bar #PanelApplet button:active:not(.flat), toolbar.primary-toolbar toolitem.raised button:active, .tilix-search-frame button:active, .geary-composer-box button:active:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, layouttabbar button:active, messagedialog.background .linked:not(.vertical).dialog-action-area > button:active, .background .app-notification button:active, toolbar button:active:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:active:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:active, .linked > spinbutton:not(.vertical) > button.down:active, .background .osd button:active, .background .linked.stack-switcher > button:active, button.flat:active, .background button.flat:active {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0;
@@ -651,10 +671,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
   background-color: transparent;
 }
 
-.lightdm-gtk-greeter button:disabled, .budgie-run-dialog .linked.horizontal > button:disabled, .budgie-polkit-dialog .linked.horizontal > button:disabled, .budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .background .raven .raven-header.top stackswitcher button:disabled, .background .raven .raven-header:not(.top) button:disabled, .background.budgie-popover button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, PanelToplevel > widget > button:disabled, .nemo-window .toolbar button:disabled, .background tabbox > tab button:disabled, .background .gedit-search-slider > .linked:not(.vertical) > button:disabled:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:disabled, .nemo-window .floating-bar button:disabled,
+.lightdm-gtk-greeter button:disabled, .budgie-session-dialog .linked.horizontal > button:disabled,
+.budgie-polkit-dialog .linked.horizontal > button:disabled,
+.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .background .raven .raven-header:not(.top) button.image-button:disabled, .background.budgie-popover button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, PanelToplevel > widget > button:disabled, .nemo-window .toolbar button:disabled, .background tabbox > tab button:disabled, .background .gedit-search-slider > .linked:not(.vertical) > button:disabled:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:disabled, .nemo-window .floating-bar button:disabled,
 .nautilus-window .floating-bar button:disabled, placessidebar row button.sidebar-button:disabled, calendar.button:disabled, check:disabled,
 radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled,
-.menuitem.button.flat:disabled, .inline-toolbar button:disabled:not(.text-button), .budgie-run-dialog button:disabled, .budgie-polkit-dialog button:disabled, .budgie-session-dialog button:disabled, .budgie-notification-window button.image-button:disabled, .budgie-switcher-window button.image-button:disabled, .budgie-osd-window button.image-button:disabled, .background .raven stackswitcher.linked > button:disabled, .caja-navigation-window button.toggle.image-button:disabled, .mate-panel-menu-bar #PanelApplet button:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:disabled, .tilix-search-frame button:disabled, .geary-composer-box button:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:disabled,
+.menuitem.button.flat:disabled, .inline-toolbar button:disabled:not(.text-button), .budgie-session-dialog button:disabled,
+.budgie-polkit-dialog button:disabled,
+.budgie-run-dialog button:disabled, .budgie-notification-window .linked > button:disabled, .budgie-switcher-window .linked > button:disabled, .budgie-osd-window .linked > button:disabled, .budgie-notification-window button.image-button.close:disabled, .budgie-switcher-window button.image-button.close:disabled, .budgie-osd-window button.image-button.close:disabled, .caja-navigation-window button.toggle.image-button:disabled, .mate-panel-menu-bar #PanelApplet button:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:disabled, .tilix-search-frame button:disabled, .geary-composer-box button:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:disabled,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:disabled:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:disabled, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:disabled, window.csd > box.vertical > box.vertical > toolbar.horizontal button:disabled,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:disabled, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:disabled, layouttabbar button:disabled, messagedialog.background .linked:not(.vertical).dialog-action-area > button:disabled, .background .app-notification button:disabled, toolbar button:disabled:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:disabled:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:disabled, .linked > spinbutton:not(.vertical) > button.down:disabled, .background .osd button:disabled, .background .linked.stack-switcher > button:disabled, button.flat:disabled, .background button.flat:disabled {
   box-shadow: none;
@@ -662,7 +686,9 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:disab
   color: rgba(255, 255, 255, 0.3);
 }
 
-.budgie-run-dialog button:checked, .budgie-polkit-dialog button:checked, .budgie-session-dialog button:checked, .budgie-notification-window button.image-button:checked, .budgie-switcher-window button.image-button:checked, .budgie-osd-window button.image-button:checked, .background .raven stackswitcher.linked > button:checked, .caja-navigation-window button.toggle.image-button:checked, .mate-panel-menu-bar #PanelApplet button:checked:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked, .tilix-search-frame button:checked, .geary-composer-box button:checked:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+.budgie-session-dialog button:checked,
+.budgie-polkit-dialog button:checked,
+.budgie-run-dialog button:checked, .budgie-notification-window .linked > button:checked, .budgie-switcher-window .linked > button:checked, .budgie-osd-window .linked > button:checked, .budgie-notification-window button.image-button.close:checked, .budgie-switcher-window button.image-button.close:checked, .budgie-osd-window button.image-button.close:checked, .caja-navigation-window button.toggle.image-button:checked, .mate-panel-menu-bar #PanelApplet button:checked:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked, .tilix-search-frame button:checked, .geary-composer-box button:checked:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:checked, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked, layouttabbar button:checked, messagedialog.background .linked:not(.vertical).dialog-action-area > button:checked, .background .app-notification button:checked, toolbar button:checked:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:checked:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:checked, .linked > spinbutton:not(.vertical) > button.down:checked, .background .osd button:checked, .background .linked.stack-switcher > button:checked, button.flat:checked, .background button.flat:checked {
   color: white;
@@ -670,7 +696,9 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:check
   box-shadow: none;
 }
 
-.budgie-run-dialog button:checked:disabled, .budgie-polkit-dialog button:checked:disabled, .budgie-session-dialog button:checked:disabled, .budgie-notification-window button.image-button:checked:disabled, .budgie-switcher-window button.image-button:checked:disabled, .budgie-osd-window button.image-button:checked:disabled, .background .raven stackswitcher.linked > button:checked:disabled, .caja-navigation-window button.toggle.image-button:checked:disabled, .mate-panel-menu-bar #PanelApplet button:checked:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked:disabled, .tilix-search-frame button:checked:disabled, .geary-composer-box button:checked:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked:disabled,
+.budgie-session-dialog button:checked:disabled,
+.budgie-polkit-dialog button:checked:disabled,
+.budgie-run-dialog button:checked:disabled, .budgie-notification-window .linked > button:checked:disabled, .budgie-switcher-window .linked > button:checked:disabled, .budgie-osd-window .linked > button:checked:disabled, .budgie-notification-window button.image-button.close:checked:disabled, .budgie-switcher-window button.image-button.close:checked:disabled, .budgie-osd-window button.image-button.close:checked:disabled, .caja-navigation-window button.toggle.image-button:checked:disabled, .mate-panel-menu-bar #PanelApplet button:checked:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked:disabled, .tilix-search-frame button:checked:disabled, .geary-composer-box button:checked:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked:disabled,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:checked:disabled:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:checked:disabled, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked:disabled, window.csd > box.vertical > box.vertical > toolbar.horizontal button:checked:disabled,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked:disabled, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked:disabled, layouttabbar button:checked:disabled, messagedialog.background .linked:not(.vertical).dialog-action-area > button:checked:disabled, .background .app-notification button:checked:disabled, toolbar button:checked:disabled:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:checked:disabled:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:checked:disabled, .linked > spinbutton:not(.vertical) > button.down:checked:disabled, .background .osd button:checked:disabled, .background .linked.stack-switcher > button:checked:disabled, button.flat:checked:disabled, .background button.flat:checked:disabled {
   background-color: alpha(currentColor, 0.06);
@@ -3594,7 +3622,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-menu button, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.background.budgie-popover.budgie-menu row.activatable > button.flat, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 600ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px transparent;
   background-color: transparent;
@@ -3605,13 +3633,13 @@ list row {
   color: rgba(255, 255, 255, 0.7);
 }
 
-.budgie-menu button:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   background-color: transparent;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.1);
   color: white;
 }
 
-.budgie-menu button.has-open-popup, .background.budgie-popover scrolledwindow > viewport.frame > list > row.has-open-popup.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-menu button:active, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:active, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.background.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .background.budgie-popover scrolledwindow > viewport.frame > list > row.has-open-popup.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .background.budgie-popover.budgie-menu row.activatable > button.flat:active, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:active, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0;
   animation: ripple_effect 100ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.1);
@@ -3621,7 +3649,7 @@ list row {
   background-color: transparent;
 }
 
-.budgie-menu button:selected:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected:hover, treeview.view header button:selected:hover, row.activatable:selected:hover {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:selected:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected:hover, treeview.view header button:selected:hover, row.activatable:selected:hover {
   background-color: #5a95f5;
 }
 
@@ -4301,14 +4329,14 @@ messagedialog.csd decoration {
   background-color: #4b4d51;
 }
 
-.budgie-menu button:checked, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected, textview text selection, iconview:selected, flowbox flowboxchild:selected, entry selection, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .budgie-menu button:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected, treeview.view header button:selected, row.activatable:selected, calendar:selected {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:checked, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected, textview text selection, iconview:selected, flowbox flowboxchild:selected, entry selection, modelbutton.flat:selected,
+.menuitem.button.flat:selected, .background.budgie-popover.budgie-menu row.activatable > button.flat:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected, treeview.view header button:selected, row.activatable:selected, calendar:selected {
   background-color: #4285F4;
   color: white;
 }
 
-.budgie-menu button:disabled:checked, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .view:disabled:selected, textview text selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected,
-.menuitem.button.flat:disabled:selected, .budgie-menu button:disabled:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:disabled:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:disabled:selected, treeview.view header button:disabled:selected, row.activatable:disabled:selected, calendar:disabled:selected {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:disabled:checked, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .view:disabled:selected, textview text selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected,
+.menuitem.button.flat:disabled:selected, .background.budgie-popover.budgie-menu row.activatable > button.flat:disabled:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:disabled:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:disabled:selected, treeview.view header button:disabled:selected, row.activatable:disabled:selected, calendar:disabled:selected {
   color: rgba(255, 255, 255, 0.45);
 }
 
@@ -4562,7 +4590,7 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
   font: initial;
 }
 
-.budgie-notification-window button.image-button, .budgie-switcher-window button.image-button, .budgie-osd-window button.image-button, .background .raven .expander-button, .background .raven .raven-header:not(.top) button.image-button, .background .raven button.image-button, widget > box.terminal-titlebar > button.image-button, widget > box.terminal-titlebar > button.image-button.toggle, .terminix-session-sidebar row.activatable button.tilix-sidebar-close-button, .terminix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button,
+.budgie-notification-window button.image-button.close, .budgie-switcher-window button.image-button.close, .budgie-osd-window button.image-button.close, .background .raven .expander-button, .background .raven .raven-header:not(.top) button.image-button, widget > box.terminal-titlebar > button.image-button, widget > box.terminal-titlebar > button.image-button.toggle, .terminix-session-sidebar row.activatable button.tilix-sidebar-close-button, .terminix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button,
 list.tilix-session-sidebar row.activatable button.tilix-sidebar-close-button,
 list.tilix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button, .nautilus-window headerbar > revealer > button, button.close, button.round-button, button.circular, combobox > .linked:not(.vertical) > button.combo:not(:only-child), check,
 radio {
@@ -7440,11 +7468,15 @@ na-tray-applet {
 }
 
 .background.budgie-popover .container {
-  padding: 0;
+  padding: 6px;
   border: none;
 }
 
-.background.budgie-popover separator {
+.background.budgie-popover .container .container {
+  padding: 0;
+}
+
+.background.budgie-popover widget > separator {
   margin: 3px 0;
 }
 
@@ -7556,9 +7588,57 @@ na-tray-applet {
   padding: 0;
 }
 
+.background.budgie-popover.budgie-menu.background {
+  padding: 0;
+  background-color: #333539;
+}
+
+.background.budgie-popover.budgie-menu .categories:dir(ltr) {
+  border-bottom-left-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu .categories:dir(rtl) {
+  border-bottom-right-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu button.category-button {
+  border-radius: 0;
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat {
+  min-height: 32px;
+  padding: 0 8px;
+  border-radius: 0;
+  color: white;
+  font-weight: normal;
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat:disabled {
+  color: rgba(255, 255, 255, 0.45);
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
+  background-color: #4285F4;
+}
+
+.background.budgie-popover.budgie-menu row {
+  padding: 0;
+}
+
+.background.budgie-popover.budgie-menu row:hover {
+  box-shadow: none;
+}
+
+.background.budgie-popover.budgie-menu scrollbar,
 .background.budgie-popover.budgie-menu entry.search {
-  border-bottom: 0 none transparent;
-  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+  background-color: transparent;
+}
+
+.background.budgie-popover.budgie-menu entry.search {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  box-shadow: none;
+  font-size: 120%;
 }
 
 .background.budgie-popover.budgie-menu entry.search:focus {
@@ -7584,38 +7664,70 @@ na-tray-applet {
   background-color: #4285F4;
 }
 
-.background.budgie-popover.user-menu .container {
+.background.budgie-popover.budgie-menu list.left-overlay-menu {
+  box-shadow: 0 2px 3px -1px rgba(0, 0, 0, 0.2), 0 4px 3px -1px rgba(0, 0, 0, 0.14), 0 1px 6px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  background-color: #333539;
   padding: 6px;
+  margin: 6px;
+  border-radius: 3px;
 }
 
-.background.budgie-popover.user-menu list, .background.budgie-popover.user-menu row {
-  border: none;
-  background: none;
-  box-shadow: none;
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
+  border-radius: 3px;
 }
 
-.background.budgie-popover.sound-popover .container {
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
+  margin-bottom: 3px;
+}
+
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
+  border-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu .budgie-menu-footer {
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
   padding: 6px;
 }
 
-.background.budgie-popover.caffeine-popover .container {
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
+  min-height: 16px;
+  min-width: 16px;
   padding: 6px;
+  border-radius: 3px;
 }
 
-.background.budgie-popover.caffeine-popover .view-header {
-  margin: 0 6px;
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
+  border-radius: 9999px;
 }
 
-.background.budgie-popover.night-light-indicator .container {
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
+  margin-right: 6px;
+}
+
+.background.budgie-popover.user-menu .content-box {
+  background-color: transparent;
+}
+
+.background.budgie-popover.user-menu separator {
+  margin: 3px 0;
+}
+
+.background.budgie-popover.user-menu list, .background.budgie-popover.user-menu row {
+  border: none;
+  background: none;
+  box-shadow: none;
+}
+
+.background.budgie-popover.sound-popover .container {
   padding: 6px;
 }
 
-.background.budgie-popover.night-light-indicator .view-header {
+.background.budgie-popover.caffeine-popover .view-header {
   margin: 0 6px;
 }
 
-.background.budgie-popover.places-menu .container {
-  padding: 6px;
+.background.budgie-popover.night-light-indicator .view-header {
+  margin: 0 6px;
 }
 
 .background.budgie-popover.places-menu row {
@@ -7649,6 +7761,14 @@ na-tray-applet {
   margin-right: 6px;
 }
 
+.background.budgie-popover button.budgie-menu-launcher {
+  padding: 0 3px;
+}
+
+.background.budgie-popover button.raven-trigger {
+  padding: 0 6px;
+}
+
 window.budgie-popover:not(.csd) > frame.container {
   margin: 0 -1px -1px;
 }
@@ -7726,111 +7846,6 @@ window.budgie-popover:not(.csd) > frame.container > border {
   border-radius: 2px;
 }
 
-.budgie-menu.background {
-  padding: 0;
-  background-color: #333539;
-}
-
-.budgie-menu scrollbar,
-.budgie-menu entry.search {
-  background-color: transparent;
-}
-
-.budgie-menu entry.search {
-  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
-  border-radius: 0;
-  box-shadow: none;
-  font-size: 120%;
-}
-
-.budgie-menu .categories:dir(ltr) {
-  border-bottom-left-radius: 3px;
-}
-
-.budgie-menu .categories:dir(rtl) {
-  border-bottom-right-radius: 3px;
-}
-
-.budgie-menu button {
-  min-height: 32px;
-  padding: 0 8px;
-  border-radius: 0;
-  color: white;
-  font-weight: normal;
-}
-
-.budgie-menu button:disabled {
-  color: rgba(255, 255, 255, 0.45);
-}
-
-.budgie-menu button:checked:disabled {
-  background-color: #4285F4;
-}
-
-.budgie-menu row {
-  padding: 0;
-}
-
-.budgie-menu row:hover {
-  box-shadow: none;
-}
-
-popover.background.user-menu {
-  padding: 8px;
-}
-
-popover.background.user-menu .content-box {
-  background-color: transparent;
-}
-
-popover.background.user-menu separator {
-  margin: 4px 0;
-}
-
-popover.background.user-menu row {
-  padding: 0;
-  box-shadow: none;
-  background-image: none;
-}
-
-popover.background.places-menu {
-  padding: 8px;
-}
-
-popover.background.places-menu .name-button.text-button {
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-popover.background.places-menu .name-button.text-button image:dir(ltr) {
-  margin-right: 3px;
-}
-
-popover.background.places-menu .name-button.text-button image:dir(rtl) {
-  margin-left: 3px;
-}
-
-popover.background.places-menu .places-section-header > image:dir(ltr) {
-  margin: 0 -2px 0 5px;
-}
-
-popover.background.places-menu .places-section-header > image:dir(rtl) {
-  margin: 0 5px 0 -2px;
-}
-
-popover.background.places-menu .places-list {
-  margin-top: 4px;
-  padding-top: 4px;
-  border-top: 1px solid rgba(255, 255, 255, 0.12);
-  background-color: transparent;
-}
-
-popover.background.places-menu row {
-  padding: 0;
-  box-shadow: none;
-  background-image: none;
-}
-
 .budgie-panel {
   transition: background-color 100ms cubic-bezier(0, 0, 0.2, 1);
   background-color: #212326;
@@ -7900,7 +7915,7 @@ popover.background.places-menu row {
 }
 
 .budgie-panel #tasklist-button {
-  padding: 0 4px;
+  padding: 0 6px;
 }
 
 .budgie-panel.vertical #tasklist-button {
@@ -7923,6 +7938,36 @@ popover.background.places-menu row {
   color: rgba(255, 255, 255, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #4285F4 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -8128,24 +8173,11 @@ frame.raven-frame > border {
 }
 
 .background .raven stackswitcher {
-  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
-}
-
-.background .raven stackswitcher.stack-switcher {
   background-image: none;
   background-color: transparent;
   border-radius: 0;
 }
 
-.background .raven stackswitcher.linked > button {
-  border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 0%, transparent 0%) 0 0 0/0 0 0px;
-}
-
-.background .raven stackswitcher.linked > button:checked {
-  border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 100%, transparent 0%) 0 0 2/0 0 2px;
-  background-color: transparent;
-}
-
 .background .raven .raven-header {
   min-height: 36px;
   padding: 3px;
@@ -8160,10 +8192,6 @@ frame.raven-frame > border {
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
 }
 
-.background .raven .raven-header.top stackswitcher {
-  box-shadow: none;
-}
-
 .background .raven .raven-header.top stackswitcher button {
   border-radius: 0;
   margin: -4px 0;
@@ -8289,6 +8317,12 @@ calendar.raven-calendar:selected {
   padding: 9px;
 }
 
+image.raven-mpris {
+  background-color: rgba(255, 255, 255, 0.12);
+  color: rgba(255, 255, 255, 0.7);
+  border-radius: 3px;
+}
+
 box.vertical > stack > box.vertical > .raven-background > viewport.frame {
   padding: 0;
 }
@@ -8404,71 +8438,104 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
-  border-radius: 2px;
+  padding: 6px;
+  border-radius: 6px;
   box-shadow: 0 2px 3px -2px rgba(0, 0, 0, 0.2), 0 2px 3px -1px rgba(0, 0, 0, 0.14), 0 3px 4px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #383a3e;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 2px;
-}
-
-.budgie-run-dialog, .budgie-polkit-dialog, .budgie-session-dialog {
-  border-radius: 2px;
+.budgie-session-dialog,
+.budgie-polkit-dialog,
+.budgie-run-dialog {
+  border-radius: 6px;
   background-color: #383a3e;
+  box-shadow: 0 2px 3px -2px rgba(0, 0, 0, 0.2), 0 2px 3px -1px rgba(0, 0, 0, 0.14), 0 3px 4px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-.budgie-run-dialog decoration, .budgie-polkit-dialog decoration, .budgie-session-dialog decoration {
-  border-radius: 2px;
+.budgie-session-dialog decoration,
+.budgie-polkit-dialog decoration,
+.budgie-run-dialog decoration {
+  border-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button, .budgie-polkit-dialog .linked.horizontal > button, .budgie-session-dialog .linked.horizontal > button {
+.budgie-session-dialog .linked.horizontal > button,
+.budgie-polkit-dialog .linked.horizontal > button,
+.budgie-run-dialog .linked.horizontal > button {
   padding: 8px 16px;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
   border-radius: 0;
 }
 
-.budgie-run-dialog .linked.horizontal > button:first-child, .budgie-polkit-dialog .linked.horizontal > button:first-child, .budgie-session-dialog .linked.horizontal > button:first-child {
-  border-bottom-left-radius: 2px;
+.budgie-session-dialog .linked.horizontal > button:first-child,
+.budgie-polkit-dialog .linked.horizontal > button:first-child,
+.budgie-run-dialog .linked.horizontal > button:first-child {
+  border-bottom-left-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button:last-child, .budgie-polkit-dialog .linked.horizontal > button:last-child, .budgie-session-dialog .linked.horizontal > button:last-child {
-  border-bottom-right-radius: 2px;
+.budgie-session-dialog .linked.horizontal > button:last-child,
+.budgie-polkit-dialog .linked.horizontal > button:last-child,
+.budgie-run-dialog .linked.horizontal > button:last-child {
+  border-bottom-right-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action, .budgie-polkit-dialog .linked.horizontal > button.suggested-action, .budgie-session-dialog .linked.horizontal > button.suggested-action {
+.budgie-session-dialog .linked.horizontal > button.suggested-action,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action,
+.budgie-run-dialog .linked.horizontal > button.suggested-action {
   color: #4285F4;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action:active, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:active, .budgie-session-dialog .linked.horizontal > button.suggested-action:active, .budgie-run-dialog .linked.horizontal > button.suggested-action:checked, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:checked, .budgie-session-dialog .linked.horizontal > button.suggested-action:checked {
+.budgie-session-dialog .linked.horizontal > button.suggested-action:active,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:active,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:active, .budgie-session-dialog .linked.horizontal > button.suggested-action:checked,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:checked,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:checked {
   background-color: #4285F4;
   color: white;
   border-color: #4285F4;
   box-shadow: none;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action:disabled, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:disabled, .budgie-session-dialog .linked.horizontal > button.suggested-action:disabled {
+.budgie-session-dialog .linked.horizontal > button.suggested-action:disabled,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:disabled,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:disabled {
   opacity: 0.65;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action, .budgie-polkit-dialog .linked.horizontal > button.destructive-action, .budgie-session-dialog .linked.horizontal > button.destructive-action {
+.budgie-session-dialog .linked.horizontal > button.destructive-action,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action,
+.budgie-run-dialog .linked.horizontal > button.destructive-action {
   color: #FF5252;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action:active, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:active, .budgie-session-dialog .linked.horizontal > button.destructive-action:active, .budgie-run-dialog .linked.horizontal > button.destructive-action:checked, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:checked, .budgie-session-dialog .linked.horizontal > button.destructive-action:checked {
+.budgie-session-dialog .linked.horizontal > button.destructive-action:active,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:active,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:active, .budgie-session-dialog .linked.horizontal > button.destructive-action:checked,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:checked,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:checked {
   background-color: #FF5252;
   color: white;
   border-color: #FF5252;
   box-shadow: none;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action:disabled, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:disabled, .budgie-session-dialog .linked.horizontal > button.destructive-action:disabled {
+.budgie-session-dialog .linked.horizontal > button.destructive-action:disabled,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:disabled,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:disabled {
   opacity: 0.65;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog label:not(:last-child),
-.budgie-session-dialog .dialog-title {
+.budgie-session-dialog .dialog-title,
+.budgie-polkit-dialog label:not(:last-child),
+.budgie-polkit-dialog .dialog-title,
+.budgie-run-dialog label:not(:last-child),
+.budgie-run-dialog .dialog-title {
   font-size: 120%;
 }
 
@@ -8480,6 +8547,10 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
   color: #FF5252;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding-bottom: 0;
+}
+
 .budgie-run-dialog {
   background-color: #333539;
 }
diff --git a/src/gtk/3.0/gtk-light.css b/src/gtk/3.0/gtk-light.css
index 4799b5f1..23e0f5d9 100644
--- a/src/gtk/3.0/gtk-light.css
+++ b/src/gtk/3.0/gtk-light.css
@@ -220,7 +220,9 @@ spinner:checked:disabled {
   opacity: 0.3;
 }
 
-#login_window entry, .budgie-run-dialog entry, .budgie-polkit-dialog entry, .budgie-session-dialog entry, .background .raven .raven-background spinbutton:not(.vertical), .background.budgie-popover entry,
+#login_window entry, .budgie-session-dialog entry,
+.budgie-polkit-dialog entry,
+.budgie-run-dialog entry, .background .raven .raven-background spinbutton:not(.vertical), .background.budgie-popover entry,
 .background.budgie-popover spinbutton:not(.vertical), .budgie-settings-window .settings-page .settings-frame .linked > entry, window.background stack scrolledwindow entry,
 window.background stack scrolledwindow spinbutton:not(.vertical), dialog.background .dialog-vbox stack entry,
 dialog.background .dialog-vbox stack spinbutton:not(.vertical), window#whiskermenu-window entry, .tilix-search-frame entry,
@@ -238,7 +240,9 @@ notebook > stack:not(:only-child) spinbutton:not(.vertical), popover.background
   border-radius: 0;
 }
 
-#login_window entry:focus, .budgie-run-dialog entry:focus, .budgie-polkit-dialog entry:focus, .budgie-session-dialog entry:focus, .background .raven .raven-background spinbutton:focus:not(.vertical), .background.budgie-popover entry:focus, .budgie-settings-window .settings-page .settings-frame .linked > entry:focus, window.background stack scrolledwindow entry:focus, dialog.background .dialog-vbox stack entry:focus,
+#login_window entry:focus, .budgie-session-dialog entry:focus,
+.budgie-polkit-dialog entry:focus,
+.budgie-run-dialog entry:focus, .background .raven .raven-background spinbutton:focus:not(.vertical), .background.budgie-popover entry:focus, .budgie-settings-window .settings-page .settings-frame .linked > entry:focus, window.background stack scrolledwindow entry:focus, dialog.background .dialog-vbox stack entry:focus,
 dialog.background .dialog-vbox stack spinbutton:focus:not(.vertical), window#whiskermenu-window entry:focus, .tilix-search-frame entry:focus, .geary-composer-box entry:focus,
 .geary-composer-box spinbutton:focus:not(.vertical), editortweak entry.search:focus, layoutpane entry.search:focus, messagedialog.background entry:focus, notebook > stack:not(:only-child) entry:focus,
 notebook > stack:not(:only-child) spinbutton:focus:not(.vertical), popover.background entry:focus, .background spinbutton:focus:not(.vertical), .background .linked > entry:focus, .background entry.flat:focus {
@@ -250,7 +254,9 @@ notebook > stack:not(:only-child) spinbutton:focus:not(.vertical), popover.backg
   border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 100%, rgba(0, 0, 0, 0.38) 10%) 0 0 2/0 0 2px;
 }
 
-#login_window entry:drop(active), .budgie-run-dialog entry:drop(active), .budgie-polkit-dialog entry:drop(active), .budgie-session-dialog entry:drop(active), .background .raven .raven-background spinbutton:drop(active):not(.vertical), .background.budgie-popover entry:drop(active), .budgie-settings-window .settings-page .settings-frame .linked > entry:drop(active), window.background stack scrolledwindow entry:drop(active), dialog.background .dialog-vbox stack entry:drop(active),
+#login_window entry:drop(active), .budgie-session-dialog entry:drop(active),
+.budgie-polkit-dialog entry:drop(active),
+.budgie-run-dialog entry:drop(active), .background .raven .raven-background spinbutton:drop(active):not(.vertical), .background.budgie-popover entry:drop(active), .budgie-settings-window .settings-page .settings-frame .linked > entry:drop(active), window.background stack scrolledwindow entry:drop(active), dialog.background .dialog-vbox stack entry:drop(active),
 dialog.background .dialog-vbox stack spinbutton:drop(active):not(.vertical), window#whiskermenu-window entry:drop(active), .tilix-search-frame entry:drop(active), .geary-composer-box entry:drop(active),
 .geary-composer-box spinbutton:drop(active):not(.vertical), editortweak entry.search:drop(active), layoutpane entry.search:drop(active), messagedialog.background entry:drop(active), notebook > stack:not(:only-child) entry:drop(active),
 notebook > stack:not(:only-child) spinbutton:drop(active):not(.vertical), popover.background entry:drop(active), .background spinbutton:drop(active):not(.vertical), .background .linked > entry:drop(active), .background entry.flat:drop(active) {
@@ -261,7 +267,9 @@ notebook > stack:not(:only-child) spinbutton:drop(active):not(.vertical), popove
   box-shadow: inset 0 -2px rgba(0, 0, 0, 0.38);
 }
 
-#login_window entry:disabled, .budgie-run-dialog entry:disabled, .budgie-polkit-dialog entry:disabled, .budgie-session-dialog entry:disabled, .background .raven .raven-background spinbutton:disabled:not(.vertical), .background.budgie-popover entry:disabled, .budgie-settings-window .settings-page .settings-frame .linked > entry:disabled, window.background stack scrolledwindow entry:disabled, dialog.background .dialog-vbox stack entry:disabled,
+#login_window entry:disabled, .budgie-session-dialog entry:disabled,
+.budgie-polkit-dialog entry:disabled,
+.budgie-run-dialog entry:disabled, .background .raven .raven-background spinbutton:disabled:not(.vertical), .background.budgie-popover entry:disabled, .budgie-settings-window .settings-page .settings-frame .linked > entry:disabled, window.background stack scrolledwindow entry:disabled, dialog.background .dialog-vbox stack entry:disabled,
 dialog.background .dialog-vbox stack spinbutton:disabled:not(.vertical), window#whiskermenu-window entry:disabled, .tilix-search-frame entry:disabled, .geary-composer-box entry:disabled,
 .geary-composer-box spinbutton:disabled:not(.vertical), editortweak entry.search:disabled, layoutpane entry.search:disabled, messagedialog.background entry:disabled, notebook > stack:not(:only-child) entry:disabled,
 notebook > stack:not(:only-child) spinbutton:disabled:not(.vertical), popover.background entry:disabled, .background spinbutton:disabled:not(.vertical), .background .linked > entry:disabled, .background entry.flat:disabled {
@@ -609,10 +617,14 @@ button:checked:disabled {
   color: alpha(#4285F4, 0.5);
 }
 
-.lightdm-gtk-greeter button, .budgie-run-dialog .linked.horizontal > button, .budgie-polkit-dialog .linked.horizontal > button, .budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .background .raven .raven-header.top stackswitcher button, .background .raven .raven-header:not(.top) button, .background.budgie-popover button, .background.budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, PanelToplevel > widget > button, .nemo-window .toolbar button, .background tabbox > tab button, .background .gedit-search-slider > .linked:not(.vertical) > button:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button, .nemo-window .floating-bar button,
+.lightdm-gtk-greeter button, .budgie-session-dialog .linked.horizontal > button,
+.budgie-polkit-dialog .linked.horizontal > button,
+.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .background .raven .raven-header:not(.top) button.image-button, .background.budgie-popover button, .background.budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, PanelToplevel > widget > button, .nemo-window .toolbar button, .background tabbox > tab button, .background .gedit-search-slider > .linked:not(.vertical) > button:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button, .nemo-window .floating-bar button,
 .nautilus-window .floating-bar button, placessidebar row button.sidebar-button, calendar.button, check,
 radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) > button, modelbutton.flat,
-.menuitem.button.flat, .inline-toolbar button:not(.text-button), .background .osd button.flat, .budgie-run-dialog button, .budgie-polkit-dialog button, .budgie-session-dialog button, .budgie-notification-window button.image-button, .budgie-switcher-window button.image-button, .budgie-osd-window button.image-button, .background .raven stackswitcher.linked > button, .caja-navigation-window button.toggle.image-button, .mate-panel-menu-bar #PanelApplet button:not(.flat), toolbar.primary-toolbar toolitem.raised button, .tilix-search-frame button, .geary-composer-box button:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle,
+.menuitem.button.flat, .inline-toolbar button:not(.text-button), .background .osd button.flat, .budgie-session-dialog button,
+.budgie-polkit-dialog button,
+.budgie-run-dialog button, .budgie-notification-window .linked > button, .budgie-switcher-window .linked > button, .budgie-osd-window .linked > button, .budgie-notification-window button.image-button.close, .budgie-switcher-window button.image-button.close, .budgie-osd-window button.image-button.close, .caja-navigation-window button.toggle.image-button, .mate-panel-menu-bar #PanelApplet button:not(.flat), toolbar.primary-toolbar toolitem.raised button, .tilix-search-frame button, .geary-composer-box button:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button, layouttabbar button, messagedialog.background.csd .linked.dialog-action-area:not(.vertical) > button, messagedialog.background .linked.dialog-action-area:not(.vertical) > button, .background .app-notification button, toolbar button:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:not(:only-child), .linked > spinbutton:not(.vertical) > button.up, .linked > spinbutton:not(.vertical) > button.down, .background .osd button, .background .linked.stack-switcher > button, button.flat {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 600ms cubic-bezier(0, 0, 0.2, 1);
@@ -625,10 +637,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button, .sid
   color: rgba(0, 0, 0, 0.6);
 }
 
-.lightdm-gtk-greeter button:hover, .budgie-run-dialog .linked.horizontal > button:hover, .budgie-polkit-dialog .linked.horizontal > button:hover, .budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .background .raven .raven-header.top stackswitcher button:hover, .background .raven .raven-header:not(.top) button:hover, .background.budgie-popover button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, PanelToplevel > widget > button:hover, .nemo-window .toolbar button:hover, .background tabbox > tab button:hover, .background .gedit-search-slider > .linked:not(.vertical) > button:hover:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:hover, .nemo-window .floating-bar button:hover,
+.lightdm-gtk-greeter button:hover, .budgie-session-dialog .linked.horizontal > button:hover,
+.budgie-polkit-dialog .linked.horizontal > button:hover,
+.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .background .raven .raven-header:not(.top) button.image-button:hover, .background.budgie-popover button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, PanelToplevel > widget > button:hover, .nemo-window .toolbar button:hover, .background tabbox > tab button:hover, .background .gedit-search-slider > .linked:not(.vertical) > button:hover:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:hover, .nemo-window .floating-bar button:hover,
 .nautilus-window .floating-bar button:hover, placessidebar row button.sidebar-button:hover, calendar.button:hover, check:hover,
 radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover,
-.menuitem.button.flat:hover, .inline-toolbar button:hover:not(.text-button), .budgie-run-dialog button:hover, .budgie-polkit-dialog button:hover, .budgie-session-dialog button:hover, .budgie-notification-window button.image-button:hover, .budgie-switcher-window button.image-button:hover, .budgie-osd-window button.image-button:hover, .background .raven stackswitcher.linked > button:hover, .caja-navigation-window button.toggle.image-button:hover, .mate-panel-menu-bar #PanelApplet button:hover:not(.flat), toolbar.primary-toolbar toolitem.raised button:hover, .tilix-search-frame button:hover, .geary-composer-box button:hover:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:hover,
+.menuitem.button.flat:hover, .inline-toolbar button:hover:not(.text-button), .budgie-session-dialog button:hover,
+.budgie-polkit-dialog button:hover,
+.budgie-run-dialog button:hover, .budgie-notification-window .linked > button:hover, .budgie-switcher-window .linked > button:hover, .budgie-osd-window .linked > button:hover, .budgie-notification-window button.image-button.close:hover, .budgie-switcher-window button.image-button.close:hover, .budgie-osd-window button.image-button.close:hover, .caja-navigation-window button.toggle.image-button:hover, .mate-panel-menu-bar #PanelApplet button:hover:not(.flat), toolbar.primary-toolbar toolitem.raised button:hover, .tilix-search-frame button:hover, .geary-composer-box button:hover:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:hover,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:hover:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:hover, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:hover, window.csd > box.vertical > box.vertical > toolbar.horizontal button:hover,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:hover, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:hover, layouttabbar button:hover, messagedialog.background .linked:not(.vertical).dialog-action-area > button:hover, .background .app-notification button:hover, toolbar button:hover:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:hover:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:hover, .linked > spinbutton:not(.vertical) > button.down:hover, .background .osd button:hover, .background .linked.stack-switcher > button:hover, button.flat:hover, .background button.flat:hover {
   background-color: transparent;
@@ -636,10 +652,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:hover
   color: rgba(0, 0, 0, 0.87);
 }
 
-.lightdm-gtk-greeter button:active, .budgie-run-dialog .linked.horizontal > button:active, .budgie-polkit-dialog .linked.horizontal > button:active, .budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .background .raven .raven-header.top stackswitcher button:active, .background .raven .raven-header:not(.top) button:active, .background.budgie-popover button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, PanelToplevel > widget > button:active, .nemo-window .toolbar button:active, .background tabbox > tab button:active, .background .gedit-search-slider > .linked:not(.vertical) > button:active:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:active, .nemo-window .floating-bar button:active,
+.lightdm-gtk-greeter button:active, .budgie-session-dialog .linked.horizontal > button:active,
+.budgie-polkit-dialog .linked.horizontal > button:active,
+.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .background .raven .raven-header:not(.top) button.image-button:active, .background.budgie-popover button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, PanelToplevel > widget > button:active, .nemo-window .toolbar button:active, .background tabbox > tab button:active, .background .gedit-search-slider > .linked:not(.vertical) > button:active:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:active, .nemo-window .floating-bar button:active,
 .nautilus-window .floating-bar button:active, placessidebar row button.sidebar-button:active, calendar.button:active, check:active,
 radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active,
-.menuitem.button.flat:active, .inline-toolbar button:active:not(.text-button), .budgie-run-dialog button:active, .budgie-polkit-dialog button:active, .budgie-session-dialog button:active, .budgie-notification-window button.image-button:active, .budgie-switcher-window button.image-button:active, .budgie-osd-window button.image-button:active, .background .raven stackswitcher.linked > button:active, .caja-navigation-window button.toggle.image-button:active, .mate-panel-menu-bar #PanelApplet button:active:not(.flat), toolbar.primary-toolbar toolitem.raised button:active, .tilix-search-frame button:active, .geary-composer-box button:active:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:active,
+.menuitem.button.flat:active, .inline-toolbar button:active:not(.text-button), .budgie-session-dialog button:active,
+.budgie-polkit-dialog button:active,
+.budgie-run-dialog button:active, .budgie-notification-window .linked > button:active, .budgie-switcher-window .linked > button:active, .budgie-osd-window .linked > button:active, .budgie-notification-window button.image-button.close:active, .budgie-switcher-window button.image-button.close:active, .budgie-osd-window button.image-button.close:active, .caja-navigation-window button.toggle.image-button:active, .mate-panel-menu-bar #PanelApplet button:active:not(.flat), toolbar.primary-toolbar toolitem.raised button:active, .tilix-search-frame button:active, .geary-composer-box button:active:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, layouttabbar button:active, messagedialog.background .linked:not(.vertical).dialog-action-area > button:active, .background .app-notification button:active, toolbar button:active:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:active:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:active, .linked > spinbutton:not(.vertical) > button.down:active, .background .osd button:active, .background .linked.stack-switcher > button:active, button.flat:active, .background button.flat:active {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0;
@@ -651,10 +671,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
   background-color: transparent;
 }
 
-.lightdm-gtk-greeter button:disabled, .budgie-run-dialog .linked.horizontal > button:disabled, .budgie-polkit-dialog .linked.horizontal > button:disabled, .budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .background .raven .raven-header.top stackswitcher button:disabled, .background .raven .raven-header:not(.top) button:disabled, .background.budgie-popover button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, PanelToplevel > widget > button:disabled, .nemo-window .toolbar button:disabled, .background tabbox > tab button:disabled, .background .gedit-search-slider > .linked:not(.vertical) > button:disabled:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:disabled, .nemo-window .floating-bar button:disabled,
+.lightdm-gtk-greeter button:disabled, .budgie-session-dialog .linked.horizontal > button:disabled,
+.budgie-polkit-dialog .linked.horizontal > button:disabled,
+.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .background .raven .raven-header:not(.top) button.image-button:disabled, .background.budgie-popover button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, PanelToplevel > widget > button:disabled, .nemo-window .toolbar button:disabled, .background tabbox > tab button:disabled, .background .gedit-search-slider > .linked:not(.vertical) > button:disabled:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:disabled, .nemo-window .floating-bar button:disabled,
 .nautilus-window .floating-bar button:disabled, placessidebar row button.sidebar-button:disabled, calendar.button:disabled, check:disabled,
 radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled,
-.menuitem.button.flat:disabled, .inline-toolbar button:disabled:not(.text-button), .budgie-run-dialog button:disabled, .budgie-polkit-dialog button:disabled, .budgie-session-dialog button:disabled, .budgie-notification-window button.image-button:disabled, .budgie-switcher-window button.image-button:disabled, .budgie-osd-window button.image-button:disabled, .background .raven stackswitcher.linked > button:disabled, .caja-navigation-window button.toggle.image-button:disabled, .mate-panel-menu-bar #PanelApplet button:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:disabled, .tilix-search-frame button:disabled, .geary-composer-box button:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:disabled,
+.menuitem.button.flat:disabled, .inline-toolbar button:disabled:not(.text-button), .budgie-session-dialog button:disabled,
+.budgie-polkit-dialog button:disabled,
+.budgie-run-dialog button:disabled, .budgie-notification-window .linked > button:disabled, .budgie-switcher-window .linked > button:disabled, .budgie-osd-window .linked > button:disabled, .budgie-notification-window button.image-button.close:disabled, .budgie-switcher-window button.image-button.close:disabled, .budgie-osd-window button.image-button.close:disabled, .caja-navigation-window button.toggle.image-button:disabled, .mate-panel-menu-bar #PanelApplet button:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:disabled, .tilix-search-frame button:disabled, .geary-composer-box button:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:disabled,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:disabled:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:disabled, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:disabled, window.csd > box.vertical > box.vertical > toolbar.horizontal button:disabled,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:disabled, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:disabled, layouttabbar button:disabled, messagedialog.background .linked:not(.vertical).dialog-action-area > button:disabled, .background .app-notification button:disabled, toolbar button:disabled:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:disabled:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:disabled, .linked > spinbutton:not(.vertical) > button.down:disabled, .background .osd button:disabled, .background .linked.stack-switcher > button:disabled, button.flat:disabled, .background button.flat:disabled {
   box-shadow: none;
@@ -662,7 +686,9 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:disab
   color: rgba(0, 0, 0, 0.26);
 }
 
-.budgie-run-dialog button:checked, .budgie-polkit-dialog button:checked, .budgie-session-dialog button:checked, .budgie-notification-window button.image-button:checked, .budgie-switcher-window button.image-button:checked, .budgie-osd-window button.image-button:checked, .background .raven stackswitcher.linked > button:checked, .caja-navigation-window button.toggle.image-button:checked, .mate-panel-menu-bar #PanelApplet button:checked:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked, .tilix-search-frame button:checked, .geary-composer-box button:checked:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+.budgie-session-dialog button:checked,
+.budgie-polkit-dialog button:checked,
+.budgie-run-dialog button:checked, .budgie-notification-window .linked > button:checked, .budgie-switcher-window .linked > button:checked, .budgie-osd-window .linked > button:checked, .budgie-notification-window button.image-button.close:checked, .budgie-switcher-window button.image-button.close:checked, .budgie-osd-window button.image-button.close:checked, .caja-navigation-window button.toggle.image-button:checked, .mate-panel-menu-bar #PanelApplet button:checked:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked, .tilix-search-frame button:checked, .geary-composer-box button:checked:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:checked, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked, layouttabbar button:checked, messagedialog.background .linked:not(.vertical).dialog-action-area > button:checked, .background .app-notification button:checked, toolbar button:checked:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:checked:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:checked, .linked > spinbutton:not(.vertical) > button.down:checked, .background .osd button:checked, .background .linked.stack-switcher > button:checked, button.flat:checked, .background button.flat:checked {
   color: rgba(0, 0, 0, 0.87);
@@ -670,7 +696,9 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:check
   box-shadow: none;
 }
 
-.budgie-run-dialog button:checked:disabled, .budgie-polkit-dialog button:checked:disabled, .budgie-session-dialog button:checked:disabled, .budgie-notification-window button.image-button:checked:disabled, .budgie-switcher-window button.image-button:checked:disabled, .budgie-osd-window button.image-button:checked:disabled, .background .raven stackswitcher.linked > button:checked:disabled, .caja-navigation-window button.toggle.image-button:checked:disabled, .mate-panel-menu-bar #PanelApplet button:checked:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked:disabled, .tilix-search-frame button:checked:disabled, .geary-composer-box button:checked:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked:disabled,
+.budgie-session-dialog button:checked:disabled,
+.budgie-polkit-dialog button:checked:disabled,
+.budgie-run-dialog button:checked:disabled, .budgie-notification-window .linked > button:checked:disabled, .budgie-switcher-window .linked > button:checked:disabled, .budgie-osd-window .linked > button:checked:disabled, .budgie-notification-window button.image-button.close:checked:disabled, .budgie-switcher-window button.image-button.close:checked:disabled, .budgie-osd-window button.image-button.close:checked:disabled, .caja-navigation-window button.toggle.image-button:checked:disabled, .mate-panel-menu-bar #PanelApplet button:checked:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked:disabled, .tilix-search-frame button:checked:disabled, .geary-composer-box button:checked:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked:disabled,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:checked:disabled:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:checked:disabled, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked:disabled, window.csd > box.vertical > box.vertical > toolbar.horizontal button:checked:disabled,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked:disabled, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked:disabled, layouttabbar button:checked:disabled, messagedialog.background .linked:not(.vertical).dialog-action-area > button:checked:disabled, .background .app-notification button:checked:disabled, toolbar button:checked:disabled:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:checked:disabled:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:checked:disabled, .linked > spinbutton:not(.vertical) > button.down:checked:disabled, .background .osd button:checked:disabled, .background .linked.stack-switcher > button:checked:disabled, button.flat:checked:disabled, .background button.flat:checked:disabled {
   background-color: alpha(currentColor, 0.06);
@@ -3594,7 +3622,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-menu button, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.background.budgie-popover.budgie-menu row.activatable > button.flat, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 600ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px transparent;
   background-color: transparent;
@@ -3605,13 +3633,13 @@ list row {
   color: rgba(0, 0, 0, 0.6);
 }
 
-.budgie-menu button:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   background-color: transparent;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.1);
   color: rgba(0, 0, 0, 0.87);
 }
 
-.budgie-menu button.has-open-popup, .background.budgie-popover scrolledwindow > viewport.frame > list > row.has-open-popup.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-menu button:active, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:active, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.background.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .background.budgie-popover scrolledwindow > viewport.frame > list > row.has-open-popup.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .background.budgie-popover.budgie-menu row.activatable > button.flat:active, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:active, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0;
   animation: ripple_effect 100ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.1);
@@ -3621,7 +3649,7 @@ list row {
   background-color: transparent;
 }
 
-.budgie-menu button:selected:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected:hover, treeview.view header button:selected:hover, row.activatable:selected:hover {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:selected:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected:hover, treeview.view header button:selected:hover, row.activatable:selected:hover {
   background-color: #5a95f5;
 }
 
@@ -4301,14 +4329,14 @@ messagedialog.csd decoration {
   background-color: #e0e0e0;
 }
 
-.budgie-menu button:checked, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected, textview text selection, iconview:selected, flowbox flowboxchild:selected, entry selection, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .budgie-menu button:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected, treeview.view header button:selected, row.activatable:selected, calendar:selected {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:checked, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected, textview text selection, iconview:selected, flowbox flowboxchild:selected, entry selection, modelbutton.flat:selected,
+.menuitem.button.flat:selected, .background.budgie-popover.budgie-menu row.activatable > button.flat:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected, treeview.view header button:selected, row.activatable:selected, calendar:selected {
   background-color: #4285F4;
   color: white;
 }
 
-.budgie-menu button:disabled:checked, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .view:disabled:selected, textview text selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected,
-.menuitem.button.flat:disabled:selected, .budgie-menu button:disabled:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:disabled:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:disabled:selected, treeview.view header button:disabled:selected, row.activatable:disabled:selected, calendar:disabled:selected {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:disabled:checked, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .view:disabled:selected, textview text selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected,
+.menuitem.button.flat:disabled:selected, .background.budgie-popover.budgie-menu row.activatable > button.flat:disabled:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:disabled:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:disabled:selected, treeview.view header button:disabled:selected, row.activatable:disabled:selected, calendar:disabled:selected {
   color: rgba(255, 255, 255, 0.45);
 }
 
@@ -4562,7 +4590,7 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
   font: initial;
 }
 
-.budgie-notification-window button.image-button, .budgie-switcher-window button.image-button, .budgie-osd-window button.image-button, .background .raven .expander-button, .background .raven .raven-header:not(.top) button.image-button, .background .raven button.image-button, widget > box.terminal-titlebar > button.image-button, widget > box.terminal-titlebar > button.image-button.toggle, .terminix-session-sidebar row.activatable button.tilix-sidebar-close-button, .terminix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button,
+.budgie-notification-window button.image-button.close, .budgie-switcher-window button.image-button.close, .budgie-osd-window button.image-button.close, .background .raven .expander-button, .background .raven .raven-header:not(.top) button.image-button, widget > box.terminal-titlebar > button.image-button, widget > box.terminal-titlebar > button.image-button.toggle, .terminix-session-sidebar row.activatable button.tilix-sidebar-close-button, .terminix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button,
 list.tilix-session-sidebar row.activatable button.tilix-sidebar-close-button,
 list.tilix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button, .nautilus-window headerbar > revealer > button, button.close, button.round-button, button.circular, combobox > .linked:not(.vertical) > button.combo:not(:only-child), check,
 radio {
@@ -7440,11 +7468,15 @@ na-tray-applet {
 }
 
 .background.budgie-popover .container {
-  padding: 0;
+  padding: 6px;
   border: none;
 }
 
-.background.budgie-popover separator {
+.background.budgie-popover .container .container {
+  padding: 0;
+}
+
+.background.budgie-popover widget > separator {
   margin: 3px 0;
 }
 
@@ -7556,9 +7588,57 @@ na-tray-applet {
   padding: 0;
 }
 
+.background.budgie-popover.budgie-menu.background {
+  padding: 0;
+  background-color: #FFFFFF;
+}
+
+.background.budgie-popover.budgie-menu .categories:dir(ltr) {
+  border-bottom-left-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu .categories:dir(rtl) {
+  border-bottom-right-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu button.category-button {
+  border-radius: 0;
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat {
+  min-height: 32px;
+  padding: 0 8px;
+  border-radius: 0;
+  color: rgba(0, 0, 0, 0.87);
+  font-weight: normal;
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat:disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
+  background-color: #4285F4;
+}
+
+.background.budgie-popover.budgie-menu row {
+  padding: 0;
+}
+
+.background.budgie-popover.budgie-menu row:hover {
+  box-shadow: none;
+}
+
+.background.budgie-popover.budgie-menu scrollbar,
 .background.budgie-popover.budgie-menu entry.search {
-  border-bottom: 0 none transparent;
-  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+  background-color: transparent;
+}
+
+.background.budgie-popover.budgie-menu entry.search {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 0;
+  box-shadow: none;
+  font-size: 120%;
 }
 
 .background.budgie-popover.budgie-menu entry.search:focus {
@@ -7584,38 +7664,70 @@ na-tray-applet {
   background-color: #4285F4;
 }
 
-.background.budgie-popover.user-menu .container {
+.background.budgie-popover.budgie-menu list.left-overlay-menu {
+  box-shadow: 0 2px 3px -1px rgba(0, 0, 0, 0.2), 0 4px 3px -1px rgba(0, 0, 0, 0.14), 0 1px 6px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.35);
+  background-color: #FFFFFF;
   padding: 6px;
+  margin: 6px;
+  border-radius: 3px;
 }
 
-.background.budgie-popover.user-menu list, .background.budgie-popover.user-menu row {
-  border: none;
-  background: none;
-  box-shadow: none;
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
+  border-radius: 3px;
 }
 
-.background.budgie-popover.sound-popover .container {
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
+  margin-bottom: 3px;
+}
+
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
+  border-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu .budgie-menu-footer {
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
   padding: 6px;
 }
 
-.background.budgie-popover.caffeine-popover .container {
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
+  min-height: 16px;
+  min-width: 16px;
   padding: 6px;
+  border-radius: 3px;
 }
 
-.background.budgie-popover.caffeine-popover .view-header {
-  margin: 0 6px;
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
+  border-radius: 9999px;
 }
 
-.background.budgie-popover.night-light-indicator .container {
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
+  margin-right: 6px;
+}
+
+.background.budgie-popover.user-menu .content-box {
+  background-color: transparent;
+}
+
+.background.budgie-popover.user-menu separator {
+  margin: 3px 0;
+}
+
+.background.budgie-popover.user-menu list, .background.budgie-popover.user-menu row {
+  border: none;
+  background: none;
+  box-shadow: none;
+}
+
+.background.budgie-popover.sound-popover .container {
   padding: 6px;
 }
 
-.background.budgie-popover.night-light-indicator .view-header {
+.background.budgie-popover.caffeine-popover .view-header {
   margin: 0 6px;
 }
 
-.background.budgie-popover.places-menu .container {
-  padding: 6px;
+.background.budgie-popover.night-light-indicator .view-header {
+  margin: 0 6px;
 }
 
 .background.budgie-popover.places-menu row {
@@ -7649,6 +7761,14 @@ na-tray-applet {
   margin-right: 6px;
 }
 
+.background.budgie-popover button.budgie-menu-launcher {
+  padding: 0 3px;
+}
+
+.background.budgie-popover button.raven-trigger {
+  padding: 0 6px;
+}
+
 window.budgie-popover:not(.csd) > frame.container {
   margin: 0 -1px -1px;
 }
@@ -7726,111 +7846,6 @@ window.budgie-popover:not(.csd) > frame.container > border {
   border-radius: 2px;
 }
 
-.budgie-menu.background {
-  padding: 0;
-  background-color: #FFFFFF;
-}
-
-.budgie-menu scrollbar,
-.budgie-menu entry.search {
-  background-color: transparent;
-}
-
-.budgie-menu entry.search {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-  border-radius: 0;
-  box-shadow: none;
-  font-size: 120%;
-}
-
-.budgie-menu .categories:dir(ltr) {
-  border-bottom-left-radius: 3px;
-}
-
-.budgie-menu .categories:dir(rtl) {
-  border-bottom-right-radius: 3px;
-}
-
-.budgie-menu button {
-  min-height: 32px;
-  padding: 0 8px;
-  border-radius: 0;
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: normal;
-}
-
-.budgie-menu button:disabled {
-  color: rgba(0, 0, 0, 0.38);
-}
-
-.budgie-menu button:checked:disabled {
-  background-color: #4285F4;
-}
-
-.budgie-menu row {
-  padding: 0;
-}
-
-.budgie-menu row:hover {
-  box-shadow: none;
-}
-
-popover.background.user-menu {
-  padding: 8px;
-}
-
-popover.background.user-menu .content-box {
-  background-color: transparent;
-}
-
-popover.background.user-menu separator {
-  margin: 4px 0;
-}
-
-popover.background.user-menu row {
-  padding: 0;
-  box-shadow: none;
-  background-image: none;
-}
-
-popover.background.places-menu {
-  padding: 8px;
-}
-
-popover.background.places-menu .name-button.text-button {
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-popover.background.places-menu .name-button.text-button image:dir(ltr) {
-  margin-right: 3px;
-}
-
-popover.background.places-menu .name-button.text-button image:dir(rtl) {
-  margin-left: 3px;
-}
-
-popover.background.places-menu .places-section-header > image:dir(ltr) {
-  margin: 0 -2px 0 5px;
-}
-
-popover.background.places-menu .places-section-header > image:dir(rtl) {
-  margin: 0 5px 0 -2px;
-}
-
-popover.background.places-menu .places-list {
-  margin-top: 4px;
-  padding-top: 4px;
-  border-top: 1px solid rgba(0, 0, 0, 0.12);
-  background-color: transparent;
-}
-
-popover.background.places-menu row {
-  padding: 0;
-  box-shadow: none;
-  background-image: none;
-}
-
 .budgie-panel {
   transition: background-color 100ms cubic-bezier(0, 0, 0.2, 1);
   background-color: #f2f2f2;
@@ -7900,7 +7915,7 @@ popover.background.places-menu row {
 }
 
 .budgie-panel #tasklist-button {
-  padding: 0 4px;
+  padding: 0 6px;
 }
 
 .budgie-panel.vertical #tasklist-button {
@@ -7923,6 +7938,36 @@ popover.background.places-menu row {
   color: rgba(0, 0, 0, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #4285F4 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -8128,24 +8173,11 @@ frame.raven-frame > border {
 }
 
 .background .raven stackswitcher {
-  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
-}
-
-.background .raven stackswitcher.stack-switcher {
   background-image: none;
   background-color: transparent;
   border-radius: 0;
 }
 
-.background .raven stackswitcher.linked > button {
-  border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 0%, transparent 0%) 0 0 0/0 0 0px;
-}
-
-.background .raven stackswitcher.linked > button:checked {
-  border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 100%, transparent 0%) 0 0 2/0 0 2px;
-  background-color: transparent;
-}
-
 .background .raven .raven-header {
   min-height: 36px;
   padding: 3px;
@@ -8160,10 +8192,6 @@ frame.raven-frame > border {
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-.background .raven .raven-header.top stackswitcher {
-  box-shadow: none;
-}
-
 .background .raven .raven-header.top stackswitcher button {
   border-radius: 0;
   margin: -4px 0;
@@ -8289,6 +8317,12 @@ calendar.raven-calendar:selected {
   padding: 9px;
 }
 
+image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
+  border-radius: 3px;
+}
+
 box.vertical > stack > box.vertical > .raven-background > viewport.frame {
   padding: 0;
 }
@@ -8404,71 +8438,104 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
-  border-radius: 2px;
+  padding: 6px;
+  border-radius: 6px;
   box-shadow: 0 2px 3px -2px rgba(0, 0, 0, 0.2), 0 2px 3px -1px rgba(0, 0, 0, 0.14), 0 3px 4px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.35);
   background-color: #fafafa;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 2px;
-}
-
-.budgie-run-dialog, .budgie-polkit-dialog, .budgie-session-dialog {
-  border-radius: 2px;
+.budgie-session-dialog,
+.budgie-polkit-dialog,
+.budgie-run-dialog {
+  border-radius: 6px;
   background-color: #fafafa;
+  box-shadow: 0 2px 3px -2px rgba(0, 0, 0, 0.2), 0 2px 3px -1px rgba(0, 0, 0, 0.14), 0 3px 4px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.35);
 }
 
-.budgie-run-dialog decoration, .budgie-polkit-dialog decoration, .budgie-session-dialog decoration {
-  border-radius: 2px;
+.budgie-session-dialog decoration,
+.budgie-polkit-dialog decoration,
+.budgie-run-dialog decoration {
+  border-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button, .budgie-polkit-dialog .linked.horizontal > button, .budgie-session-dialog .linked.horizontal > button {
+.budgie-session-dialog .linked.horizontal > button,
+.budgie-polkit-dialog .linked.horizontal > button,
+.budgie-run-dialog .linked.horizontal > button {
   padding: 8px 16px;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 0;
 }
 
-.budgie-run-dialog .linked.horizontal > button:first-child, .budgie-polkit-dialog .linked.horizontal > button:first-child, .budgie-session-dialog .linked.horizontal > button:first-child {
-  border-bottom-left-radius: 2px;
+.budgie-session-dialog .linked.horizontal > button:first-child,
+.budgie-polkit-dialog .linked.horizontal > button:first-child,
+.budgie-run-dialog .linked.horizontal > button:first-child {
+  border-bottom-left-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button:last-child, .budgie-polkit-dialog .linked.horizontal > button:last-child, .budgie-session-dialog .linked.horizontal > button:last-child {
-  border-bottom-right-radius: 2px;
+.budgie-session-dialog .linked.horizontal > button:last-child,
+.budgie-polkit-dialog .linked.horizontal > button:last-child,
+.budgie-run-dialog .linked.horizontal > button:last-child {
+  border-bottom-right-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action, .budgie-polkit-dialog .linked.horizontal > button.suggested-action, .budgie-session-dialog .linked.horizontal > button.suggested-action {
+.budgie-session-dialog .linked.horizontal > button.suggested-action,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action,
+.budgie-run-dialog .linked.horizontal > button.suggested-action {
   color: #4285F4;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action:active, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:active, .budgie-session-dialog .linked.horizontal > button.suggested-action:active, .budgie-run-dialog .linked.horizontal > button.suggested-action:checked, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:checked, .budgie-session-dialog .linked.horizontal > button.suggested-action:checked {
+.budgie-session-dialog .linked.horizontal > button.suggested-action:active,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:active,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:active, .budgie-session-dialog .linked.horizontal > button.suggested-action:checked,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:checked,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:checked {
   background-color: #4285F4;
   color: white;
   border-color: #4285F4;
   box-shadow: none;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action:disabled, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:disabled, .budgie-session-dialog .linked.horizontal > button.suggested-action:disabled {
+.budgie-session-dialog .linked.horizontal > button.suggested-action:disabled,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:disabled,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:disabled {
   opacity: 0.65;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action, .budgie-polkit-dialog .linked.horizontal > button.destructive-action, .budgie-session-dialog .linked.horizontal > button.destructive-action {
+.budgie-session-dialog .linked.horizontal > button.destructive-action,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action,
+.budgie-run-dialog .linked.horizontal > button.destructive-action {
   color: #FF5252;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action:active, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:active, .budgie-session-dialog .linked.horizontal > button.destructive-action:active, .budgie-run-dialog .linked.horizontal > button.destructive-action:checked, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:checked, .budgie-session-dialog .linked.horizontal > button.destructive-action:checked {
+.budgie-session-dialog .linked.horizontal > button.destructive-action:active,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:active,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:active, .budgie-session-dialog .linked.horizontal > button.destructive-action:checked,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:checked,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:checked {
   background-color: #FF5252;
   color: white;
   border-color: #FF5252;
   box-shadow: none;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action:disabled, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:disabled, .budgie-session-dialog .linked.horizontal > button.destructive-action:disabled {
+.budgie-session-dialog .linked.horizontal > button.destructive-action:disabled,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:disabled,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:disabled {
   opacity: 0.65;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog label:not(:last-child),
-.budgie-session-dialog .dialog-title {
+.budgie-session-dialog .dialog-title,
+.budgie-polkit-dialog label:not(:last-child),
+.budgie-polkit-dialog .dialog-title,
+.budgie-run-dialog label:not(:last-child),
+.budgie-run-dialog .dialog-title {
   font-size: 120%;
 }
 
@@ -8480,6 +8547,10 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
   color: #FF5252;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding-bottom: 0;
+}
+
 .budgie-run-dialog {
   background-color: #FFFFFF;
 }
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index 2c4f76f6..db49472a 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -220,7 +220,9 @@ spinner:checked:disabled {
   opacity: 0.3;
 }
 
-#login_window entry, .budgie-run-dialog entry, .budgie-polkit-dialog entry, .budgie-session-dialog entry, .background .raven .raven-background spinbutton:not(.vertical), .background.budgie-popover entry,
+#login_window entry, .budgie-session-dialog entry,
+.budgie-polkit-dialog entry,
+.budgie-run-dialog entry, .background .raven .raven-background spinbutton:not(.vertical), .background.budgie-popover entry,
 .background.budgie-popover spinbutton:not(.vertical), .budgie-settings-window .settings-page .settings-frame .linked > entry, window.background stack scrolledwindow entry,
 window.background stack scrolledwindow spinbutton:not(.vertical), dialog.background .dialog-vbox stack entry,
 dialog.background .dialog-vbox stack spinbutton:not(.vertical), window#whiskermenu-window entry, .tilix-search-frame entry,
@@ -238,7 +240,9 @@ notebook > stack:not(:only-child) spinbutton:not(.vertical), popover.background
   border-radius: 0;
 }
 
-#login_window entry:focus, .budgie-run-dialog entry:focus, .budgie-polkit-dialog entry:focus, .budgie-session-dialog entry:focus, .background .raven .raven-background spinbutton:focus:not(.vertical), .background.budgie-popover entry:focus, .budgie-settings-window .settings-page .settings-frame .linked > entry:focus, window.background stack scrolledwindow entry:focus, dialog.background .dialog-vbox stack entry:focus,
+#login_window entry:focus, .budgie-session-dialog entry:focus,
+.budgie-polkit-dialog entry:focus,
+.budgie-run-dialog entry:focus, .background .raven .raven-background spinbutton:focus:not(.vertical), .background.budgie-popover entry:focus, .budgie-settings-window .settings-page .settings-frame .linked > entry:focus, window.background stack scrolledwindow entry:focus, dialog.background .dialog-vbox stack entry:focus,
 dialog.background .dialog-vbox stack spinbutton:focus:not(.vertical), window#whiskermenu-window entry:focus, .tilix-search-frame entry:focus, .geary-composer-box entry:focus,
 .geary-composer-box spinbutton:focus:not(.vertical), editortweak entry.search:focus, layoutpane entry.search:focus, messagedialog.background entry:focus, notebook > stack:not(:only-child) entry:focus,
 notebook > stack:not(:only-child) spinbutton:focus:not(.vertical), popover.background entry:focus, .background spinbutton:focus:not(.vertical), .background .linked > entry:focus, .background entry.flat:focus {
@@ -250,7 +254,9 @@ notebook > stack:not(:only-child) spinbutton:focus:not(.vertical), popover.backg
   border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 100%, rgba(0, 0, 0, 0.38) 10%) 0 0 2/0 0 2px;
 }
 
-#login_window entry:drop(active), .budgie-run-dialog entry:drop(active), .budgie-polkit-dialog entry:drop(active), .budgie-session-dialog entry:drop(active), .background .raven .raven-background spinbutton:drop(active):not(.vertical), .background.budgie-popover entry:drop(active), .budgie-settings-window .settings-page .settings-frame .linked > entry:drop(active), window.background stack scrolledwindow entry:drop(active), dialog.background .dialog-vbox stack entry:drop(active),
+#login_window entry:drop(active), .budgie-session-dialog entry:drop(active),
+.budgie-polkit-dialog entry:drop(active),
+.budgie-run-dialog entry:drop(active), .background .raven .raven-background spinbutton:drop(active):not(.vertical), .background.budgie-popover entry:drop(active), .budgie-settings-window .settings-page .settings-frame .linked > entry:drop(active), window.background stack scrolledwindow entry:drop(active), dialog.background .dialog-vbox stack entry:drop(active),
 dialog.background .dialog-vbox stack spinbutton:drop(active):not(.vertical), window#whiskermenu-window entry:drop(active), .tilix-search-frame entry:drop(active), .geary-composer-box entry:drop(active),
 .geary-composer-box spinbutton:drop(active):not(.vertical), editortweak entry.search:drop(active), layoutpane entry.search:drop(active), messagedialog.background entry:drop(active), notebook > stack:not(:only-child) entry:drop(active),
 notebook > stack:not(:only-child) spinbutton:drop(active):not(.vertical), popover.background entry:drop(active), .background spinbutton:drop(active):not(.vertical), .background .linked > entry:drop(active), .background entry.flat:drop(active) {
@@ -261,7 +267,9 @@ notebook > stack:not(:only-child) spinbutton:drop(active):not(.vertical), popove
   box-shadow: inset 0 -2px rgba(0, 0, 0, 0.38);
 }
 
-#login_window entry:disabled, .budgie-run-dialog entry:disabled, .budgie-polkit-dialog entry:disabled, .budgie-session-dialog entry:disabled, .background .raven .raven-background spinbutton:disabled:not(.vertical), .background.budgie-popover entry:disabled, .budgie-settings-window .settings-page .settings-frame .linked > entry:disabled, window.background stack scrolledwindow entry:disabled, dialog.background .dialog-vbox stack entry:disabled,
+#login_window entry:disabled, .budgie-session-dialog entry:disabled,
+.budgie-polkit-dialog entry:disabled,
+.budgie-run-dialog entry:disabled, .background .raven .raven-background spinbutton:disabled:not(.vertical), .background.budgie-popover entry:disabled, .budgie-settings-window .settings-page .settings-frame .linked > entry:disabled, window.background stack scrolledwindow entry:disabled, dialog.background .dialog-vbox stack entry:disabled,
 dialog.background .dialog-vbox stack spinbutton:disabled:not(.vertical), window#whiskermenu-window entry:disabled, .tilix-search-frame entry:disabled, .geary-composer-box entry:disabled,
 .geary-composer-box spinbutton:disabled:not(.vertical), editortweak entry.search:disabled, layoutpane entry.search:disabled, messagedialog.background entry:disabled, notebook > stack:not(:only-child) entry:disabled,
 notebook > stack:not(:only-child) spinbutton:disabled:not(.vertical), popover.background entry:disabled, .background spinbutton:disabled:not(.vertical), .background .linked > entry:disabled, .background entry.flat:disabled {
@@ -609,10 +617,14 @@ button:checked:disabled {
   color: alpha(#4285F4, 0.5);
 }
 
-.lightdm-gtk-greeter button, .budgie-run-dialog .linked.horizontal > button, .budgie-polkit-dialog .linked.horizontal > button, .budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .background .raven .raven-header.top stackswitcher button, .background .raven .raven-header:not(.top) button, .background.budgie-popover button, .background.budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, PanelToplevel > widget > button, .nemo-window .toolbar button, .background tabbox > tab button, .background .gedit-search-slider > .linked:not(.vertical) > button:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button, .nemo-window .floating-bar button,
+.lightdm-gtk-greeter button, .budgie-session-dialog .linked.horizontal > button,
+.budgie-polkit-dialog .linked.horizontal > button,
+.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .background .raven .raven-header:not(.top) button.image-button, .background.budgie-popover button, .background.budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, PanelToplevel > widget > button, .nemo-window .toolbar button, .background tabbox > tab button, .background .gedit-search-slider > .linked:not(.vertical) > button:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button, .nemo-window .floating-bar button,
 .nautilus-window .floating-bar button, placessidebar row button.sidebar-button, calendar.button, check,
 radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) > button, modelbutton.flat,
-.menuitem.button.flat, .inline-toolbar button:not(.text-button), .background .osd button.flat, .budgie-run-dialog button, .budgie-polkit-dialog button, .budgie-session-dialog button, .budgie-notification-window button.image-button, .budgie-switcher-window button.image-button, .budgie-osd-window button.image-button, .background .raven stackswitcher.linked > button, .caja-navigation-window button.toggle.image-button, .mate-panel-menu-bar #PanelApplet button:not(.flat), toolbar.primary-toolbar toolitem.raised button, .tilix-search-frame button, .geary-composer-box button:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle,
+.menuitem.button.flat, .inline-toolbar button:not(.text-button), .background .osd button.flat, .budgie-session-dialog button,
+.budgie-polkit-dialog button,
+.budgie-run-dialog button, .budgie-notification-window .linked > button, .budgie-switcher-window .linked > button, .budgie-osd-window .linked > button, .budgie-notification-window button.image-button.close, .budgie-switcher-window button.image-button.close, .budgie-osd-window button.image-button.close, .caja-navigation-window button.toggle.image-button, .mate-panel-menu-bar #PanelApplet button:not(.flat), toolbar.primary-toolbar toolitem.raised button, .tilix-search-frame button, .geary-composer-box button:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button, layouttabbar button, messagedialog.background.csd .linked.dialog-action-area:not(.vertical) > button, messagedialog.background .linked.dialog-action-area:not(.vertical) > button, .background .app-notification button, toolbar button:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:not(:only-child), .linked > spinbutton:not(.vertical) > button.up, .linked > spinbutton:not(.vertical) > button.down, .background .osd button, .background .linked.stack-switcher > button, button.flat {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 600ms cubic-bezier(0, 0, 0.2, 1);
@@ -625,10 +637,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button, .sid
   color: rgba(0, 0, 0, 0.6);
 }
 
-.lightdm-gtk-greeter button:hover, .budgie-run-dialog .linked.horizontal > button:hover, .budgie-polkit-dialog .linked.horizontal > button:hover, .budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .background .raven .raven-header.top stackswitcher button:hover, .background .raven .raven-header:not(.top) button:hover, .background.budgie-popover button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, PanelToplevel > widget > button:hover, .nemo-window .toolbar button:hover, .background tabbox > tab button:hover, .background .gedit-search-slider > .linked:not(.vertical) > button:hover:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:hover, .nemo-window .floating-bar button:hover,
+.lightdm-gtk-greeter button:hover, .budgie-session-dialog .linked.horizontal > button:hover,
+.budgie-polkit-dialog .linked.horizontal > button:hover,
+.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .background .raven .raven-header:not(.top) button.image-button:hover, .background.budgie-popover button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, PanelToplevel > widget > button:hover, .nemo-window .toolbar button:hover, .background tabbox > tab button:hover, .background .gedit-search-slider > .linked:not(.vertical) > button:hover:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:hover, .nemo-window .floating-bar button:hover,
 .nautilus-window .floating-bar button:hover, placessidebar row button.sidebar-button:hover, calendar.button:hover, check:hover,
 radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover,
-.menuitem.button.flat:hover, .inline-toolbar button:hover:not(.text-button), .budgie-run-dialog button:hover, .budgie-polkit-dialog button:hover, .budgie-session-dialog button:hover, .budgie-notification-window button.image-button:hover, .budgie-switcher-window button.image-button:hover, .budgie-osd-window button.image-button:hover, .background .raven stackswitcher.linked > button:hover, .caja-navigation-window button.toggle.image-button:hover, .mate-panel-menu-bar #PanelApplet button:hover:not(.flat), toolbar.primary-toolbar toolitem.raised button:hover, .tilix-search-frame button:hover, .geary-composer-box button:hover:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:hover,
+.menuitem.button.flat:hover, .inline-toolbar button:hover:not(.text-button), .budgie-session-dialog button:hover,
+.budgie-polkit-dialog button:hover,
+.budgie-run-dialog button:hover, .budgie-notification-window .linked > button:hover, .budgie-switcher-window .linked > button:hover, .budgie-osd-window .linked > button:hover, .budgie-notification-window button.image-button.close:hover, .budgie-switcher-window button.image-button.close:hover, .budgie-osd-window button.image-button.close:hover, .caja-navigation-window button.toggle.image-button:hover, .mate-panel-menu-bar #PanelApplet button:hover:not(.flat), toolbar.primary-toolbar toolitem.raised button:hover, .tilix-search-frame button:hover, .geary-composer-box button:hover:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:hover,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:hover:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:hover, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:hover, window.csd > box.vertical > box.vertical > toolbar.horizontal button:hover,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:hover, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:hover, layouttabbar button:hover, messagedialog.background .linked:not(.vertical).dialog-action-area > button:hover, .background .app-notification button:hover, toolbar button:hover:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:hover:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:hover, .linked > spinbutton:not(.vertical) > button.down:hover, .background .osd button:hover, .background .linked.stack-switcher > button:hover, button.flat:hover, .background button.flat:hover {
   background-color: transparent;
@@ -636,10 +652,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:hover
   color: rgba(0, 0, 0, 0.87);
 }
 
-.lightdm-gtk-greeter button:active, .budgie-run-dialog .linked.horizontal > button:active, .budgie-polkit-dialog .linked.horizontal > button:active, .budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .background .raven .raven-header.top stackswitcher button:active, .background .raven .raven-header:not(.top) button:active, .background.budgie-popover button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, PanelToplevel > widget > button:active, .nemo-window .toolbar button:active, .background tabbox > tab button:active, .background .gedit-search-slider > .linked:not(.vertical) > button:active:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:active, .nemo-window .floating-bar button:active,
+.lightdm-gtk-greeter button:active, .budgie-session-dialog .linked.horizontal > button:active,
+.budgie-polkit-dialog .linked.horizontal > button:active,
+.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .background .raven .raven-header:not(.top) button.image-button:active, .background.budgie-popover button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, PanelToplevel > widget > button:active, .nemo-window .toolbar button:active, .background tabbox > tab button:active, .background .gedit-search-slider > .linked:not(.vertical) > button:active:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:active, .nemo-window .floating-bar button:active,
 .nautilus-window .floating-bar button:active, placessidebar row button.sidebar-button:active, calendar.button:active, check:active,
 radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active,
-.menuitem.button.flat:active, .inline-toolbar button:active:not(.text-button), .budgie-run-dialog button:active, .budgie-polkit-dialog button:active, .budgie-session-dialog button:active, .budgie-notification-window button.image-button:active, .budgie-switcher-window button.image-button:active, .budgie-osd-window button.image-button:active, .background .raven stackswitcher.linked > button:active, .caja-navigation-window button.toggle.image-button:active, .mate-panel-menu-bar #PanelApplet button:active:not(.flat), toolbar.primary-toolbar toolitem.raised button:active, .tilix-search-frame button:active, .geary-composer-box button:active:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:active,
+.menuitem.button.flat:active, .inline-toolbar button:active:not(.text-button), .budgie-session-dialog button:active,
+.budgie-polkit-dialog button:active,
+.budgie-run-dialog button:active, .budgie-notification-window .linked > button:active, .budgie-switcher-window .linked > button:active, .budgie-osd-window .linked > button:active, .budgie-notification-window button.image-button.close:active, .budgie-switcher-window button.image-button.close:active, .budgie-osd-window button.image-button.close:active, .caja-navigation-window button.toggle.image-button:active, .mate-panel-menu-bar #PanelApplet button:active:not(.flat), toolbar.primary-toolbar toolitem.raised button:active, .tilix-search-frame button:active, .geary-composer-box button:active:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:active,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:active, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal button:active,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, layouttabbar button:active, messagedialog.background .linked:not(.vertical).dialog-action-area > button:active, .background .app-notification button:active, toolbar button:active:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:active:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:active, .linked > spinbutton:not(.vertical) > button.down:active, .background .osd button:active, .background .linked.stack-switcher > button:active, button.flat:active, .background button.flat:active {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0;
@@ -651,10 +671,14 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:activ
   background-color: transparent;
 }
 
-.lightdm-gtk-greeter button:disabled, .budgie-run-dialog .linked.horizontal > button:disabled, .budgie-polkit-dialog .linked.horizontal > button:disabled, .budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .background .raven .raven-header.top stackswitcher button:disabled, .background .raven .raven-header:not(.top) button:disabled, .background.budgie-popover button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, PanelToplevel > widget > button:disabled, .nemo-window .toolbar button:disabled, .background tabbox > tab button:disabled, .background .gedit-search-slider > .linked:not(.vertical) > button:disabled:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:disabled, .nemo-window .floating-bar button:disabled,
+.lightdm-gtk-greeter button:disabled, .budgie-session-dialog .linked.horizontal > button:disabled,
+.budgie-polkit-dialog .linked.horizontal > button:disabled,
+.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .background .raven .raven-header:not(.top) button.image-button:disabled, .background.budgie-popover button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, PanelToplevel > widget > button:disabled, .nemo-window .toolbar button:disabled, .background tabbox > tab button:disabled, .background .gedit-search-slider > .linked:not(.vertical) > button:disabled:not(.combo), .background .gedit-search-slider > .linked:not(.vertical) > entry.error ~ button:disabled, .nemo-window .floating-bar button:disabled,
 .nautilus-window .floating-bar button:disabled, placessidebar row button.sidebar-button:disabled, calendar.button:disabled, check:disabled,
 radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled,
-.menuitem.button.flat:disabled, .inline-toolbar button:disabled:not(.text-button), .budgie-run-dialog button:disabled, .budgie-polkit-dialog button:disabled, .budgie-session-dialog button:disabled, .budgie-notification-window button.image-button:disabled, .budgie-switcher-window button.image-button:disabled, .budgie-osd-window button.image-button:disabled, .background .raven stackswitcher.linked > button:disabled, .caja-navigation-window button.toggle.image-button:disabled, .mate-panel-menu-bar #PanelApplet button:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:disabled, .tilix-search-frame button:disabled, .geary-composer-box button:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:disabled,
+.menuitem.button.flat:disabled, .inline-toolbar button:disabled:not(.text-button), .budgie-session-dialog button:disabled,
+.budgie-polkit-dialog button:disabled,
+.budgie-run-dialog button:disabled, .budgie-notification-window .linked > button:disabled, .budgie-switcher-window .linked > button:disabled, .budgie-osd-window .linked > button:disabled, .budgie-notification-window button.image-button.close:disabled, .budgie-switcher-window button.image-button.close:disabled, .budgie-osd-window button.image-button.close:disabled, .caja-navigation-window button.toggle.image-button:disabled, .mate-panel-menu-bar #PanelApplet button:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:disabled, .tilix-search-frame button:disabled, .geary-composer-box button:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:disabled,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:disabled:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:disabled, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:disabled, window.csd > box.vertical > box.vertical > toolbar.horizontal button:disabled,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:disabled, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:disabled, layouttabbar button:disabled, messagedialog.background .linked:not(.vertical).dialog-action-area > button:disabled, .background .app-notification button:disabled, toolbar button:disabled:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:disabled:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:disabled, .linked > spinbutton:not(.vertical) > button.down:disabled, .background .osd button:disabled, .background .linked.stack-switcher > button:disabled, button.flat:disabled, .background button.flat:disabled {
   box-shadow: none;
@@ -662,7 +686,9 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:disab
   color: rgba(0, 0, 0, 0.26);
 }
 
-.budgie-run-dialog button:checked, .budgie-polkit-dialog button:checked, .budgie-session-dialog button:checked, .budgie-notification-window button.image-button:checked, .budgie-switcher-window button.image-button:checked, .budgie-osd-window button.image-button:checked, .background .raven stackswitcher.linked > button:checked, .caja-navigation-window button.toggle.image-button:checked, .mate-panel-menu-bar #PanelApplet button:checked:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked, .tilix-search-frame button:checked, .geary-composer-box button:checked:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+.budgie-session-dialog button:checked,
+.budgie-polkit-dialog button:checked,
+.budgie-run-dialog button:checked, .budgie-notification-window .linked > button:checked, .budgie-switcher-window .linked > button:checked, .budgie-osd-window .linked > button:checked, .budgie-notification-window button.image-button.close:checked, .budgie-switcher-window button.image-button.close:checked, .budgie-osd-window button.image-button.close:checked, .caja-navigation-window button.toggle.image-button:checked, .mate-panel-menu-bar #PanelApplet button:checked:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked, .tilix-search-frame button:checked, .geary-composer-box button:checked:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:checked, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal button:checked,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked, layouttabbar button:checked, messagedialog.background .linked:not(.vertical).dialog-action-area > button:checked, .background .app-notification button:checked, toolbar button:checked:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:checked:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:checked, .linked > spinbutton:not(.vertical) > button.down:checked, .background .osd button:checked, .background .linked.stack-switcher > button:checked, button.flat:checked, .background button.flat:checked {
   color: rgba(0, 0, 0, 0.87);
@@ -670,7 +696,9 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:check
   box-shadow: none;
 }
 
-.budgie-run-dialog button:checked:disabled, .budgie-polkit-dialog button:checked:disabled, .budgie-session-dialog button:checked:disabled, .budgie-notification-window button.image-button:checked:disabled, .budgie-switcher-window button.image-button:checked:disabled, .budgie-osd-window button.image-button:checked:disabled, .background .raven stackswitcher.linked > button:checked:disabled, .caja-navigation-window button.toggle.image-button:checked:disabled, .mate-panel-menu-bar #PanelApplet button:checked:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked:disabled, .tilix-search-frame button:checked:disabled, .geary-composer-box button:checked:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked:disabled,
+.budgie-session-dialog button:checked:disabled,
+.budgie-polkit-dialog button:checked:disabled,
+.budgie-run-dialog button:checked:disabled, .budgie-notification-window .linked > button:checked:disabled, .budgie-switcher-window .linked > button:checked:disabled, .budgie-osd-window .linked > button:checked:disabled, .budgie-notification-window button.image-button.close:checked:disabled, .budgie-switcher-window button.image-button.close:checked:disabled, .budgie-osd-window button.image-button.close:checked:disabled, .caja-navigation-window button.toggle.image-button:checked:disabled, .mate-panel-menu-bar #PanelApplet button:checked:disabled:not(.flat), toolbar.primary-toolbar toolitem.raised button:checked:disabled, .tilix-search-frame button:checked:disabled, .geary-composer-box button:checked:disabled:not(.combo), window.background > box.vertical > toolbar.primary-toolbar toolitem > box.horizontal:not(.linked) > button.toggle:checked:disabled,
 window.background > box.vertical > toolbar.primary-toolbar toolitem > .linked > button:checked:disabled:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar toolitem button.flat.scale:checked:disabled, window.background > box.vertical > toolbar.primary-toolbar toolitem .linked > button.image-button.raised:checked:disabled, window.csd > box.vertical > box.vertical > toolbar.horizontal button:checked:disabled,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal button:checked:disabled, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked:disabled, layouttabbar button:checked:disabled, messagedialog.background .linked:not(.vertical).dialog-action-area > button:checked:disabled, .background .app-notification button:checked:disabled, toolbar button:checked:disabled:not(.destructive-action):not(.suggested-action), combobox > .linked:not(.vertical) > button.combo:checked:disabled:not(:only-child), .linked > spinbutton:not(.vertical) > button.up:checked:disabled, .linked > spinbutton:not(.vertical) > button.down:checked:disabled, .background .osd button:checked:disabled, .background .linked.stack-switcher > button:checked:disabled, button.flat:checked:disabled, .background button.flat:checked:disabled {
   background-color: alpha(currentColor, 0.06);
@@ -3594,7 +3622,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-menu button, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.background.budgie-popover.budgie-menu row.activatable > button.flat, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 600ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px transparent;
   background-color: transparent;
@@ -3605,13 +3633,13 @@ list row {
   color: rgba(0, 0, 0, 0.6);
 }
 
-.budgie-menu button:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   background-color: transparent;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.1);
   color: rgba(0, 0, 0, 0.87);
 }
 
-.budgie-menu button.has-open-popup, .background.budgie-popover scrolledwindow > viewport.frame > list > row.has-open-popup.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-menu button:active, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:active, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.background.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .background.budgie-popover scrolledwindow > viewport.frame > list > row.has-open-popup.activatable, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .background.budgie-popover.budgie-menu row.activatable > button.flat:active, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:active, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
   transition: all 100ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0;
   animation: ripple_effect 100ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.1);
@@ -3621,7 +3649,7 @@ list row {
   background-color: transparent;
 }
 
-.budgie-menu button:selected:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected:hover, treeview.view header button:selected:hover, row.activatable:selected:hover {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:selected:hover, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected:hover, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected:hover, treeview.view header button:selected:hover, row.activatable:selected:hover {
   background-color: #5a95f5;
 }
 
@@ -4301,14 +4329,14 @@ messagedialog.csd decoration {
   background-color: #e0e0e0;
 }
 
-.budgie-menu button:checked, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected, textview text selection, iconview:selected, flowbox flowboxchild:selected, entry selection, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .budgie-menu button:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected, treeview.view header button:selected, row.activatable:selected, calendar:selected {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:checked, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected, textview text selection, iconview:selected, flowbox flowboxchild:selected, entry selection, modelbutton.flat:selected,
+.menuitem.button.flat:selected, .background.budgie-popover.budgie-menu row.activatable > button.flat:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:selected, treeview.view header button:selected, row.activatable:selected, calendar:selected {
   background-color: #4285F4;
   color: white;
 }
 
-.budgie-menu button:disabled:checked, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .view:disabled:selected, textview text selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected,
-.menuitem.button.flat:disabled:selected, .budgie-menu button:disabled:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:disabled:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:disabled:selected, treeview.view header button:disabled:selected, row.activatable:disabled:selected, calendar:disabled:selected {
+.background.budgie-popover.budgie-menu row.activatable > button.flat:disabled:checked, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .view:disabled:selected, textview text selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected,
+.menuitem.button.flat:disabled:selected, .background.budgie-popover.budgie-menu row.activatable > button.flat:disabled:selected, .background.budgie-popover scrolledwindow > viewport.frame > list > row.activatable:disabled:selected, .background.budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:disabled:selected, treeview.view header button:disabled:selected, row.activatable:disabled:selected, calendar:disabled:selected {
   color: rgba(255, 255, 255, 0.45);
 }
 
@@ -4562,7 +4590,7 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
   font: initial;
 }
 
-.budgie-notification-window button.image-button, .budgie-switcher-window button.image-button, .budgie-osd-window button.image-button, .background .raven .expander-button, .background .raven .raven-header:not(.top) button.image-button, .background .raven button.image-button, widget > box.terminal-titlebar > button.image-button, widget > box.terminal-titlebar > button.image-button.toggle, .terminix-session-sidebar row.activatable button.tilix-sidebar-close-button, .terminix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button,
+.budgie-notification-window button.image-button.close, .budgie-switcher-window button.image-button.close, .budgie-osd-window button.image-button.close, .background .raven .expander-button, .background .raven .raven-header:not(.top) button.image-button, widget > box.terminal-titlebar > button.image-button, widget > box.terminal-titlebar > button.image-button.toggle, .terminix-session-sidebar row.activatable button.tilix-sidebar-close-button, .terminix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button,
 list.tilix-session-sidebar row.activatable button.tilix-sidebar-close-button,
 list.tilix-session-sidebar row.activatable:selected button.tilix-sidebar-close-button, .nautilus-window headerbar > revealer > button, button.close, button.round-button, button.circular, combobox > .linked:not(.vertical) > button.combo:not(:only-child), check,
 radio {
@@ -7440,11 +7468,15 @@ na-tray-applet {
 }
 
 .background.budgie-popover .container {
-  padding: 0;
+  padding: 6px;
   border: none;
 }
 
-.background.budgie-popover separator {
+.background.budgie-popover .container .container {
+  padding: 0;
+}
+
+.background.budgie-popover widget > separator {
   margin: 3px 0;
 }
 
@@ -7556,9 +7588,57 @@ na-tray-applet {
   padding: 0;
 }
 
+.background.budgie-popover.budgie-menu.background {
+  padding: 0;
+  background-color: #FFFFFF;
+}
+
+.background.budgie-popover.budgie-menu .categories:dir(ltr) {
+  border-bottom-left-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu .categories:dir(rtl) {
+  border-bottom-right-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu button.category-button {
+  border-radius: 0;
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat {
+  min-height: 32px;
+  padding: 0 8px;
+  border-radius: 0;
+  color: rgba(0, 0, 0, 0.87);
+  font-weight: normal;
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat:disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+.background.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
+  background-color: #4285F4;
+}
+
+.background.budgie-popover.budgie-menu row {
+  padding: 0;
+}
+
+.background.budgie-popover.budgie-menu row:hover {
+  box-shadow: none;
+}
+
+.background.budgie-popover.budgie-menu scrollbar,
 .background.budgie-popover.budgie-menu entry.search {
-  border-bottom: 0 none transparent;
-  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+  background-color: transparent;
+}
+
+.background.budgie-popover.budgie-menu entry.search {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 0;
+  box-shadow: none;
+  font-size: 120%;
 }
 
 .background.budgie-popover.budgie-menu entry.search:focus {
@@ -7584,38 +7664,70 @@ na-tray-applet {
   background-color: #4285F4;
 }
 
-.background.budgie-popover.user-menu .container {
+.background.budgie-popover.budgie-menu list.left-overlay-menu {
+  box-shadow: 0 2px 3px -1px rgba(0, 0, 0, 0.2), 0 4px 3px -1px rgba(0, 0, 0, 0.14), 0 1px 6px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  background-color: #FFFFFF;
   padding: 6px;
+  margin: 6px;
+  border-radius: 3px;
 }
 
-.background.budgie-popover.user-menu list, .background.budgie-popover.user-menu row {
-  border: none;
-  background: none;
-  box-shadow: none;
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
+  border-radius: 3px;
 }
 
-.background.budgie-popover.sound-popover .container {
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
+  margin-bottom: 3px;
+}
+
+.background.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
+  border-radius: 3px;
+}
+
+.background.budgie-popover.budgie-menu .budgie-menu-footer {
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
   padding: 6px;
 }
 
-.background.budgie-popover.caffeine-popover .container {
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
+  min-height: 16px;
+  min-width: 16px;
   padding: 6px;
+  border-radius: 3px;
 }
 
-.background.budgie-popover.caffeine-popover .view-header {
-  margin: 0 6px;
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
+  border-radius: 9999px;
 }
 
-.background.budgie-popover.night-light-indicator .container {
+.background.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
+  margin-right: 6px;
+}
+
+.background.budgie-popover.user-menu .content-box {
+  background-color: transparent;
+}
+
+.background.budgie-popover.user-menu separator {
+  margin: 3px 0;
+}
+
+.background.budgie-popover.user-menu list, .background.budgie-popover.user-menu row {
+  border: none;
+  background: none;
+  box-shadow: none;
+}
+
+.background.budgie-popover.sound-popover .container {
   padding: 6px;
 }
 
-.background.budgie-popover.night-light-indicator .view-header {
+.background.budgie-popover.caffeine-popover .view-header {
   margin: 0 6px;
 }
 
-.background.budgie-popover.places-menu .container {
-  padding: 6px;
+.background.budgie-popover.night-light-indicator .view-header {
+  margin: 0 6px;
 }
 
 .background.budgie-popover.places-menu row {
@@ -7649,6 +7761,14 @@ na-tray-applet {
   margin-right: 6px;
 }
 
+.background.budgie-popover button.budgie-menu-launcher {
+  padding: 0 3px;
+}
+
+.background.budgie-popover button.raven-trigger {
+  padding: 0 6px;
+}
+
 window.budgie-popover:not(.csd) > frame.container {
   margin: 0 -1px -1px;
 }
@@ -7726,111 +7846,6 @@ window.budgie-popover:not(.csd) > frame.container > border {
   border-radius: 2px;
 }
 
-.budgie-menu.background {
-  padding: 0;
-  background-color: #FFFFFF;
-}
-
-.budgie-menu scrollbar,
-.budgie-menu entry.search {
-  background-color: transparent;
-}
-
-.budgie-menu entry.search {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-  border-radius: 0;
-  box-shadow: none;
-  font-size: 120%;
-}
-
-.budgie-menu .categories:dir(ltr) {
-  border-bottom-left-radius: 3px;
-}
-
-.budgie-menu .categories:dir(rtl) {
-  border-bottom-right-radius: 3px;
-}
-
-.budgie-menu button {
-  min-height: 32px;
-  padding: 0 8px;
-  border-radius: 0;
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: normal;
-}
-
-.budgie-menu button:disabled {
-  color: rgba(0, 0, 0, 0.38);
-}
-
-.budgie-menu button:checked:disabled {
-  background-color: #4285F4;
-}
-
-.budgie-menu row {
-  padding: 0;
-}
-
-.budgie-menu row:hover {
-  box-shadow: none;
-}
-
-popover.background.user-menu {
-  padding: 8px;
-}
-
-popover.background.user-menu .content-box {
-  background-color: transparent;
-}
-
-popover.background.user-menu separator {
-  margin: 4px 0;
-}
-
-popover.background.user-menu row {
-  padding: 0;
-  box-shadow: none;
-  background-image: none;
-}
-
-popover.background.places-menu {
-  padding: 8px;
-}
-
-popover.background.places-menu .name-button.text-button {
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-popover.background.places-menu .name-button.text-button image:dir(ltr) {
-  margin-right: 3px;
-}
-
-popover.background.places-menu .name-button.text-button image:dir(rtl) {
-  margin-left: 3px;
-}
-
-popover.background.places-menu .places-section-header > image:dir(ltr) {
-  margin: 0 -2px 0 5px;
-}
-
-popover.background.places-menu .places-section-header > image:dir(rtl) {
-  margin: 0 5px 0 -2px;
-}
-
-popover.background.places-menu .places-list {
-  margin-top: 4px;
-  padding-top: 4px;
-  border-top: 1px solid rgba(0, 0, 0, 0.12);
-  background-color: transparent;
-}
-
-popover.background.places-menu row {
-  padding: 0;
-  box-shadow: none;
-  background-image: none;
-}
-
 .budgie-panel {
   transition: background-color 100ms cubic-bezier(0, 0, 0.2, 1);
   background-color: #202020;
@@ -7900,7 +7915,7 @@ popover.background.places-menu row {
 }
 
 .budgie-panel #tasklist-button {
-  padding: 0 4px;
+  padding: 0 6px;
 }
 
 .budgie-panel.vertical #tasklist-button {
@@ -7923,6 +7938,36 @@ popover.background.places-menu row {
   color: rgba(255, 255, 255, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #4285F4 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -8128,24 +8173,11 @@ frame.raven-frame > border {
 }
 
 .background .raven stackswitcher {
-  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
-}
-
-.background .raven stackswitcher.stack-switcher {
   background-image: none;
   background-color: transparent;
   border-radius: 0;
 }
 
-.background .raven stackswitcher.linked > button {
-  border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 0%, transparent 0%) 0 0 0/0 0 0px;
-}
-
-.background .raven stackswitcher.linked > button:checked {
-  border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4285F4 100%, transparent 0%) 0 0 2/0 0 2px;
-  background-color: transparent;
-}
-
 .background .raven .raven-header {
   min-height: 36px;
   padding: 3px;
@@ -8160,10 +8192,6 @@ frame.raven-frame > border {
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-.background .raven .raven-header.top stackswitcher {
-  box-shadow: none;
-}
-
 .background .raven .raven-header.top stackswitcher button {
   border-radius: 0;
   margin: -4px 0;
@@ -8289,6 +8317,12 @@ calendar.raven-calendar:selected {
   padding: 9px;
 }
 
+image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
+  border-radius: 3px;
+}
+
 box.vertical > stack > box.vertical > .raven-background > viewport.frame {
   padding: 0;
 }
@@ -8404,71 +8438,104 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
-  border-radius: 2px;
+  padding: 6px;
+  border-radius: 6px;
   box-shadow: 0 2px 3px -2px rgba(0, 0, 0, 0.2), 0 2px 3px -1px rgba(0, 0, 0, 0.14), 0 3px 4px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: white;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 2px;
-}
-
-.budgie-run-dialog, .budgie-polkit-dialog, .budgie-session-dialog {
-  border-radius: 2px;
+.budgie-session-dialog,
+.budgie-polkit-dialog,
+.budgie-run-dialog {
+  border-radius: 6px;
   background-color: white;
+  box-shadow: 0 2px 3px -2px rgba(0, 0, 0, 0.2), 0 2px 3px -1px rgba(0, 0, 0, 0.14), 0 3px 4px -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-.budgie-run-dialog decoration, .budgie-polkit-dialog decoration, .budgie-session-dialog decoration {
-  border-radius: 2px;
+.budgie-session-dialog decoration,
+.budgie-polkit-dialog decoration,
+.budgie-run-dialog decoration {
+  border-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button, .budgie-polkit-dialog .linked.horizontal > button, .budgie-session-dialog .linked.horizontal > button {
+.budgie-session-dialog .linked.horizontal > button,
+.budgie-polkit-dialog .linked.horizontal > button,
+.budgie-run-dialog .linked.horizontal > button {
   padding: 8px 16px;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 0;
 }
 
-.budgie-run-dialog .linked.horizontal > button:first-child, .budgie-polkit-dialog .linked.horizontal > button:first-child, .budgie-session-dialog .linked.horizontal > button:first-child {
-  border-bottom-left-radius: 2px;
+.budgie-session-dialog .linked.horizontal > button:first-child,
+.budgie-polkit-dialog .linked.horizontal > button:first-child,
+.budgie-run-dialog .linked.horizontal > button:first-child {
+  border-bottom-left-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button:last-child, .budgie-polkit-dialog .linked.horizontal > button:last-child, .budgie-session-dialog .linked.horizontal > button:last-child {
-  border-bottom-right-radius: 2px;
+.budgie-session-dialog .linked.horizontal > button:last-child,
+.budgie-polkit-dialog .linked.horizontal > button:last-child,
+.budgie-run-dialog .linked.horizontal > button:last-child {
+  border-bottom-right-radius: 6px;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action, .budgie-polkit-dialog .linked.horizontal > button.suggested-action, .budgie-session-dialog .linked.horizontal > button.suggested-action {
+.budgie-session-dialog .linked.horizontal > button.suggested-action,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action,
+.budgie-run-dialog .linked.horizontal > button.suggested-action {
   color: #4285F4;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action:active, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:active, .budgie-session-dialog .linked.horizontal > button.suggested-action:active, .budgie-run-dialog .linked.horizontal > button.suggested-action:checked, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:checked, .budgie-session-dialog .linked.horizontal > button.suggested-action:checked {
+.budgie-session-dialog .linked.horizontal > button.suggested-action:active,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:active,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:active, .budgie-session-dialog .linked.horizontal > button.suggested-action:checked,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:checked,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:checked {
   background-color: #4285F4;
   color: white;
   border-color: #4285F4;
   box-shadow: none;
 }
 
-.budgie-run-dialog .linked.horizontal > button.suggested-action:disabled, .budgie-polkit-dialog .linked.horizontal > button.suggested-action:disabled, .budgie-session-dialog .linked.horizontal > button.suggested-action:disabled {
+.budgie-session-dialog .linked.horizontal > button.suggested-action:disabled,
+.budgie-polkit-dialog .linked.horizontal > button.suggested-action:disabled,
+.budgie-run-dialog .linked.horizontal > button.suggested-action:disabled {
   opacity: 0.65;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action, .budgie-polkit-dialog .linked.horizontal > button.destructive-action, .budgie-session-dialog .linked.horizontal > button.destructive-action {
+.budgie-session-dialog .linked.horizontal > button.destructive-action,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action,
+.budgie-run-dialog .linked.horizontal > button.destructive-action {
   color: #FF5252;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action:active, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:active, .budgie-session-dialog .linked.horizontal > button.destructive-action:active, .budgie-run-dialog .linked.horizontal > button.destructive-action:checked, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:checked, .budgie-session-dialog .linked.horizontal > button.destructive-action:checked {
+.budgie-session-dialog .linked.horizontal > button.destructive-action:active,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:active,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:active, .budgie-session-dialog .linked.horizontal > button.destructive-action:checked,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:checked,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:checked {
   background-color: #FF5252;
   color: white;
   border-color: #FF5252;
   box-shadow: none;
 }
 
-.budgie-run-dialog .linked.horizontal > button.destructive-action:disabled, .budgie-polkit-dialog .linked.horizontal > button.destructive-action:disabled, .budgie-session-dialog .linked.horizontal > button.destructive-action:disabled {
+.budgie-session-dialog .linked.horizontal > button.destructive-action:disabled,
+.budgie-polkit-dialog .linked.horizontal > button.destructive-action:disabled,
+.budgie-run-dialog .linked.horizontal > button.destructive-action:disabled {
   opacity: 0.65;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog label:not(:last-child),
-.budgie-session-dialog .dialog-title {
+.budgie-session-dialog .dialog-title,
+.budgie-polkit-dialog label:not(:last-child),
+.budgie-polkit-dialog .dialog-title,
+.budgie-run-dialog label:not(:last-child),
+.budgie-run-dialog .dialog-title {
   font-size: 120%;
 }
 
@@ -8480,6 +8547,10 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
   color: #FF5252;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding-bottom: 0;
+}
+
 .budgie-run-dialog {
   background-color: #FFFFFF;
 }