From 2999eb7c0266480d421fc9bd7e215793fc408896 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 27 Feb 2023 14:31:32 +0800
Subject: [PATCH] Update

---
 src/_sass/gtk/_common-3.20.scss   |  12 +-
 src/_sass/gtk/apps/_budgie.scss   |  86 ++++++++-----
 src/_sass/gtk/apps/_misc.scss     |  11 ++
 src/gtk/3.0/gtk-Compact.css       | 190 +++++++++++++++--------------
 src/gtk/3.0/gtk-Dark-Compact.css  | 194 ++++++++++++++++--------------
 src/gtk/3.0/gtk-Dark.css          | 194 ++++++++++++++++--------------
 src/gtk/3.0/gtk-Light-Compact.css | 190 +++++++++++++++--------------
 src/gtk/3.0/gtk-Light.css         | 190 +++++++++++++++--------------
 src/gtk/3.0/gtk.css               | 190 +++++++++++++++--------------
 9 files changed, 691 insertions(+), 566 deletions(-)

diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
index 004e062..dd09124 100644
--- a/src/_sass/gtk/_common-3.20.scss
+++ b/src/_sass/gtk/_common-3.20.scss
@@ -1704,19 +1704,21 @@ menubar,
   border-radius: $menu-radius + 1px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: $space-size / 2; // See https://bugzilla.gnome.org/show_bug.cgi?id=591258
   padding: $space-size;
   box-shadow: inset 0 1px highlight($surface);
   background-color: $surface;
   background-clip: border-box;
-  border: 1px solid $frame; // adds borders in a non composited env
+  border-radius: $menu-radius;
+
+  background:not(.popup) & {
+    border: 1px solid $frame; // adds borders in a non composited env
+    border-radius: 0;
+  }
 
   .csd & {
     border: none; // axes borders in a composited env
-    border-radius: $menu-radius;
   }
 
   menuitem {
diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
index 5959313..6b81195 100644
--- a/src/_sass/gtk/apps/_budgie.scss
+++ b/src/_sass/gtk/apps/_budgie.scss
@@ -35,8 +35,8 @@
   border: none;
   border-radius: $corner-radius;
   box-shadow: $shadow-z3;
-  background-color: $surface;
-  border-color: $surface;
+  background-color: $base;
+  border-color: $base;
 
   .container { padding: $space-size; }
 
@@ -46,6 +46,33 @@
 
   list { background-color: transparent; }
 
+  entry, button, spinbutton, button.combo {
+    border-radius: $menuitem-radius;
+  }
+
+  .linked > entry,
+  .linked > button {
+    &:first-child {
+      border-top-left-radius: $menuitem-radius;
+      border-bottom-left-radius: $menuitem-radius;
+    }
+
+    &:last-child {
+      border-top-right-radius: $menuitem-radius;
+      border-bottom-right-radius: $menuitem-radius;
+    }
+  }
+
+  button.flat:not(.image-button) {
+    min-height: $menuitem-size;
+    padding: 0 8px;
+    color: $text;
+    font-weight: normal;
+    border-radius: $menuitem-radius;
+
+    &:disabled { color: $text-disabled; }
+  }
+
   row {
     padding: 0;
 
@@ -53,11 +80,11 @@
 
     button {
       @extend %button-flat-simple;
-      border-radius: $corner-radius - $space-size;
+      border-radius: $menuitem-radius;
     }
   }
 
-  calendar:not(.header) { border-radius: $corner-radius - $space-size; }
+  calendar:not(.header) { border-radius: $menuitem-radius; }
 
   scrolledwindow.sidebar.categories { // AppMenu
     background-color: $fill;
@@ -108,18 +135,6 @@
     }
   }
 
-  button { border-radius: $corner-radius - $space-size; }
-
-  button.flat:not(.image-button) {
-    min-height: $menuitem-size;
-    padding: 0 8px;
-    color: $text;
-    font-weight: normal;
-    border-radius: $corner-radius - $space-size;
-
-    &:disabled { color: $text-disabled; }
-  }
-
   &.budgie-menu {
     .container { padding: 0; }
 
@@ -135,7 +150,7 @@
       font-size: 120%;
     }
 
-    button.flat:not(.image-button):not(.indicator-item) {
+    row.activatable > button.flat {
       @extend %row_activatable;
       min-height: 32px;
       padding: 0 8px;
@@ -170,7 +185,7 @@
       border-top: 1px solid $border;
       padding: $space-size;
 
-      button.flat:not(.indicator-item) {
+      button.flat {
         min-height: 16px;
         min-width: 16px;
         padding: $space-size;
@@ -438,7 +453,7 @@
   separator { background-color: on($panel, track); }
 
   // used to indicate unread notifications
-  .alert { color: $destructive; }
+  .alert { color: $suggested; }
 
   // End Section needs to be fancy
   // .end-region { }
@@ -683,6 +698,8 @@ calendar.raven-calendar {
 }
 
 image.raven-mpris {
+  background-color: $divider;
+  color: $text-secondary;
   border-radius: $corner-radius;
 }
 
@@ -726,21 +743,25 @@ image.raven-mpris {
 // Notifications
 .budgie-notification-window {
   background-color: transparent;
+
+  .linked > button {
+    &, &:first-child, &:last-child {
+      @extend %circular-button;
+    }
+  }
 }
 
 .budgie-notification {
+  padding: $space-size * 2;
+
   .notification-title { font-size: 120%; }
 
   .notification-body { color: $text-secondary; }
-
-  .linked > button {
-    @extend %circular-button;
-  }
 }
 
 // On Screen Display in Budgie
 .budgie-osd-window {
-  @extend .budgie-notification-window;
+  background-color: transparent;
 }
 
 // Internal part of the OSD
@@ -750,12 +771,13 @@ image.raven-mpris {
 
 // Alt+tab switcher in Budgie
 .budgie-switcher-window {
-  @extend .budgie-notification-window;
+  background-color: transparent;
 }
 
 // Internal part of the Switcher
 .budgie-switcher {
-  @extend .budgie-notification;
+  padding: $space-size * 2;
+  margin: $space-size;
 }
 
 .budgie-panel {
@@ -766,19 +788,21 @@ image.raven-mpris {
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: $space-size;
   border-radius: $window-radius;
   box-shadow: $shadow-z4, inset 0 1px highlight($surface);
   background-color: $surface;
 
   button { @extend %button-flat-simple; }
-
-  .linked > button { border-radius: $window-radius; }
 }
 
 %budgie_dialog {
   box-shadow: inset 0 1px highlight($surface);
   background-color: $surface;
+
+  > box > grid {
+    padding: 24px;
+  }
 }
 
 // Session Dialog
@@ -809,6 +833,10 @@ image.raven-mpris {
 .budgie-polkit-dialog {
   .message { color: $text-secondary; }
   .failure { color: $destructive; }
+
+  > box > grid {
+    padding: 24px 24px 0;
+  }
 }
 
 // Run Dialog
diff --git a/src/_sass/gtk/apps/_misc.scss b/src/_sass/gtk/apps/_misc.scss
index c6a4d38..2bb460f 100644
--- a/src/_sass/gtk/apps/_misc.scss
+++ b/src/_sass/gtk/apps/_misc.scss
@@ -260,6 +260,17 @@ window.background:not(.csd) {
   }
 }
 
+//
+// Xapp popup
+//
+
+.background.popup.xapp-status-icon-menu-window {
+  decoration {
+    border-radius: $menu-radius;
+    box-shadow: $shadow-z4;
+  }
+}
+
 /************
  * Inkscape *
  ************/
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index a605007..7438555 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -41,7 +41,7 @@
   outline-color: alpha(currentColor, 0.1);
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
@@ -615,7 +615,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
   color: rgba(0, 0, 0, 0.38);
 }
 
-.budgie-notification .linked > button, .budgie-switcher .linked > button, .raven .expander-button, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+.budgie-notification-window .linked > button, .budgie-notification-window .linked > button:first-child, .budgie-notification-window .linked > button:last-child, .raven .expander-button, 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 > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
@@ -624,7 +624,7 @@ radio, headerbar button.titlebutton, button.close, button.circular, .inline-tool
   border-radius: 9999px;
 }
 
-.budgie-notification .linked > button label, .budgie-switcher .linked > button label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
+.budgie-notification-window .linked > button label, .budgie-notification-window .linked > button:first-child label, .budgie-notification-window .linked > button:last-child label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
@@ -1835,25 +1835,25 @@ menubar > menuitem label:disabled,
   border-radius: 10px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: 2px;
   padding: 4px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+  border-radius: 9px;
+}
+
+background:not(.popup) menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 0;
 }
 
-.csd menu, .csd .menu, .csd .context-menu {
+.csd menu {
   border: none;
-  border-radius: 9px;
 }
 
-menu menuitem,
-.menu menuitem,
-.context-menu menuitem {
+menu menuitem {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1);
   min-height: 20px;
   min-width: 40px;
@@ -1864,58 +1864,40 @@ menu menuitem,
   border-radius: 5px;
 }
 
-menu menuitem:hover,
-.menu menuitem:hover,
-.context-menu menuitem:hover {
+menu menuitem:hover {
   transition: none;
   background-color: alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
 }
 
-menu menuitem:disabled,
-.menu menuitem:disabled,
-.context-menu menuitem:disabled {
+menu menuitem:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
-menu menuitem arrow,
-.menu menuitem arrow,
-.context-menu menuitem arrow {
+menu menuitem arrow {
   min-height: 16px;
   min-width: 16px;
 }
 
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr),
-.context-menu menuitem arrow:dir(ltr) {
+menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-left: 8px;
 }
 
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl),
-.context-menu menuitem arrow:dir(rtl) {
+menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
   margin-right: 8px;
 }
 
-menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
-.menu menuitem label:dir(rtl),
-.menu menuitem label:dir(ltr),
-.context-menu menuitem label:dir(rtl),
-.context-menu menuitem label:dir(ltr) {
+menu menuitem label:dir(rtl), menu menuitem label:dir(ltr) {
   color: inherit;
 }
 
-menu .view:selected,
-.menu .view:selected,
-.context-menu .view:selected {
+menu .view:selected {
   background-color: rgba(235, 235, 235, 0.987);
 }
 
-menu > arrow,
-.menu > arrow,
-.context-menu > arrow {
+menu > arrow {
   min-height: 16px;
   min-width: 16px;
   padding: 4px;
@@ -1924,41 +1906,31 @@ menu > arrow,
   border-radius: 6px;
 }
 
-menu > arrow.top,
-.menu > arrow.top,
-.context-menu > arrow.top {
+menu > arrow.top {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 0 0 1/0 0 1px;
 }
 
-menu > arrow.bottom,
-.menu > arrow.bottom,
-.context-menu > arrow.bottom {
+menu > arrow.bottom {
   margin-top: 10px;
   margin-bottom: -12px;
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 1 0 0/1px 0 0;
 }
 
-menu > arrow:hover,
-.menu > arrow:hover,
-.context-menu > arrow:hover {
+menu > arrow:hover {
   background-image: image(alpha(currentColor, 0.08));
   color: rgba(0, 0, 0, 0.87);
   border-image: none;
 }
 
-menu > arrow:disabled,
-.menu > arrow:disabled,
-.context-menu > arrow:disabled {
+menu > arrow:disabled {
   border-color: transparent;
   background-color: transparent;
   color: transparent;
 }
 
-menu separator,
-.menu separator,
-.context-menu separator {
+menu separator {
   margin: 3px 0;
 }
 
@@ -3299,7 +3271,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -3309,16 +3281,16 @@ list row {
   background-size: 1000% 1000%;
 }
 
-.budgie-popover.budgie-menu button.flat:focus:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
+.budgie-popover.budgie-menu row.activatable > button.flat:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 0ms, background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, .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 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0ms, background-image 0ms;
   animation: ripple 225ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
@@ -6238,6 +6210,11 @@ window.background:not(.csd) > window > menu menuitem {
   transition: none;
 }
 
+.background.popup.xapp-status-icon-menu-window decoration {
+  border-radius: 9px;
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+}
+
 /************
  * Inkscape *
  ************/
@@ -7126,6 +7103,34 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: transparent;
 }
 
+.budgie-popover entry, .budgie-popover button, .budgie-popover spinbutton, .budgie-popover button.combo {
+  border-radius: 5px;
+}
+
+.budgie-popover .linked > entry:first-child,
+.budgie-popover .linked > button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.budgie-popover .linked > entry:last-child,
+.budgie-popover .linked > button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button) {
+  min-height: 24px;
+  padding: 0 8px;
+  color: rgba(0, 0, 0, 0.87);
+  font-weight: normal;
+  border-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button):disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
 .budgie-popover row {
   padding: 0;
 }
@@ -7135,11 +7140,11 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-popover row button {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover calendar:not(.header) {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover scrolledwindow.sidebar.categories {
@@ -7186,22 +7191,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover button {
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button) {
-  min-height: 24px;
-  padding: 0 8px;
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: normal;
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button):disabled {
-  color: rgba(0, 0, 0, 0.38);
-}
-
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -7220,13 +7209,13 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 120%;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
@@ -7255,18 +7244,18 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 4px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
   min-height: 16px;
   min-width: 16px;
   padding: 4px;
   border-radius: 5px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
   border-radius: 9999px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
   margin-right: 4px;
 }
 
@@ -7519,7 +7508,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel .alert {
-  color: #E53935;
+  color: #1A73E8;
 }
 
 .budgie-panel .titlebar:not(headerbar) {
@@ -7773,6 +7762,8 @@ calendar.raven-calendar:selected {
 }
 
 image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
   border-radius: 10px;
 }
 
@@ -7811,38 +7802,51 @@ image.raven-mpris {
   box-shadow: none;
 }
 
-.budgie-notification-window, .budgie-switcher-window, .budgie-osd-window {
+.budgie-notification-window {
   background-color: transparent;
 }
 
-.budgie-notification .notification-title, .budgie-switcher .notification-title {
+.budgie-notification {
+  padding: 8px;
+}
+
+.budgie-notification .notification-title {
   font-size: 120%;
 }
 
-.budgie-notification .notification-body, .budgie-switcher .notification-body {
+.budgie-notification .notification-body {
   color: rgba(0, 0, 0, 0.6);
 }
 
+.budgie-osd-window {
+  background-color: transparent;
+}
+
 .budgie-osd .budgie-osd-text {
   font-size: 120%;
 }
 
+.budgie-switcher-window {
+  background-color: transparent;
+}
+
+.budgie-switcher {
+  padding: 8px;
+  margin: 4px;
+}
+
 .budgie-panel .lock-keys image:disabled {
   color: rgba(255, 255, 255, 0.3);
 }
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 4px;
   border-radius: 16px;
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 16px;
-}
-
 .budgie-session-dialog,
 .budgie-polkit-dialog,
 .budgie-run-dialog {
@@ -7850,6 +7854,12 @@ image.raven-mpris {
   background-color: #FFFFFF;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
 .budgie-polkit-dialog.background.csd,
 .budgie-polkit-dialog decoration,
@@ -7895,6 +7905,10 @@ image.raven-mpris {
   color: #E53935;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding: 24px 24px 0;
+}
+
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 4px 12px;
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index f4e7101..04dc076 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -41,7 +41,7 @@
   outline-color: alpha(currentColor, 0.1);
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected {
   color: white;
   background-color: #414141;
@@ -615,7 +615,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
   color: rgba(255, 255, 255, 0.5);
 }
 
-.budgie-notification .linked > button, .budgie-switcher .linked > button, .raven .expander-button, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+.budgie-notification-window .linked > button, .budgie-notification-window .linked > button:first-child, .budgie-notification-window .linked > button:last-child, .raven .expander-button, 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 > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
@@ -624,7 +624,7 @@ radio, headerbar button.titlebutton, button.close, button.circular, .inline-tool
   border-radius: 9999px;
 }
 
-.budgie-notification .linked > button label, .budgie-switcher .linked > button label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
+.budgie-notification-window .linked > button label, .budgie-notification-window .linked > button:first-child label, .budgie-notification-window .linked > button:last-child label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
@@ -1835,25 +1835,25 @@ menubar > menuitem label:disabled,
   border-radius: 10px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: 2px;
   padding: 4px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   background-clip: border-box;
+  border-radius: 9px;
+}
+
+background:not(.popup) menu {
   border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 0;
 }
 
-.csd menu, .csd .menu, .csd .context-menu {
+.csd menu {
   border: none;
-  border-radius: 9px;
 }
 
-menu menuitem,
-.menu menuitem,
-.context-menu menuitem {
+menu menuitem {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1);
   min-height: 20px;
   min-width: 40px;
@@ -1864,58 +1864,40 @@ menu menuitem,
   border-radius: 5px;
 }
 
-menu menuitem:hover,
-.menu menuitem:hover,
-.context-menu menuitem:hover {
+menu menuitem:hover {
   transition: none;
   background-color: alpha(currentColor, 0.08);
   color: white;
 }
 
-menu menuitem:disabled,
-.menu menuitem:disabled,
-.context-menu menuitem:disabled {
+menu menuitem:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
-menu menuitem arrow,
-.menu menuitem arrow,
-.context-menu menuitem arrow {
+menu menuitem arrow {
   min-height: 16px;
   min-width: 16px;
 }
 
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr),
-.context-menu menuitem arrow:dir(ltr) {
+menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-left: 8px;
 }
 
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl),
-.context-menu menuitem arrow:dir(rtl) {
+menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
   margin-right: 8px;
 }
 
-menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
-.menu menuitem label:dir(rtl),
-.menu menuitem label:dir(ltr),
-.context-menu menuitem label:dir(rtl),
-.context-menu menuitem label:dir(ltr) {
+menu menuitem label:dir(rtl), menu menuitem label:dir(ltr) {
   color: inherit;
 }
 
-menu .view:selected,
-.menu .view:selected,
-.context-menu .view:selected {
+menu .view:selected {
   background-color: #505050;
 }
 
-menu > arrow,
-.menu > arrow,
-.context-menu > arrow {
+menu > arrow {
   min-height: 16px;
   min-width: 16px;
   padding: 4px;
@@ -1924,41 +1906,31 @@ menu > arrow,
   border-radius: 6px;
 }
 
-menu > arrow.top,
-.menu > arrow.top,
-.context-menu > arrow.top {
+menu > arrow.top {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
   border-image: image(rgba(255, 255, 255, 0.12)) 0 0 1/0 0 1px;
 }
 
-menu > arrow.bottom,
-.menu > arrow.bottom,
-.context-menu > arrow.bottom {
+menu > arrow.bottom {
   margin-top: 10px;
   margin-bottom: -12px;
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
   border-image: image(rgba(255, 255, 255, 0.12)) 1 0 0/1px 0 0;
 }
 
-menu > arrow:hover,
-.menu > arrow:hover,
-.context-menu > arrow:hover {
+menu > arrow:hover {
   background-image: image(alpha(currentColor, 0.08));
   color: white;
   border-image: none;
 }
 
-menu > arrow:disabled,
-.menu > arrow:disabled,
-.context-menu > arrow:disabled {
+menu > arrow:disabled {
   border-color: transparent;
   background-color: transparent;
   color: transparent;
 }
 
-menu separator,
-.menu separator,
-.context-menu separator {
+menu separator {
   margin: 3px 0;
 }
 
@@ -3299,7 +3271,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -3309,16 +3281,16 @@ list row {
   background-size: 1000% 1000%;
 }
 
-.budgie-popover.budgie-menu button.flat:focus:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
+.budgie-popover.budgie-menu row.activatable > button.flat:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 0ms, background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, .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 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0ms, background-image 0ms;
   animation: ripple 225ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
@@ -6234,6 +6206,11 @@ window.background:not(.csd) > window > menu menuitem {
   transition: none;
 }
 
+.background.popup.xapp-status-icon-menu-window decoration {
+  border-radius: 9px;
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+}
+
 /************
  * Inkscape *
  ************/
@@ -7102,8 +7079,8 @@ MsdOsdWindow.background.osd .progressbar {
   border: none;
   border-radius: 10px;
   box-shadow: 0 3px 2px -2px rgba(0, 0, 0, 0.2), 0 3px 2.4px 0 rgba(0, 0, 0, 0.14), 0 1px 4.8px 0 rgba(0, 0, 0, 0.12);
-  background-color: #3C3C3C;
-  border-color: #3C3C3C;
+  background-color: #2C2C2C;
+  border-color: #2C2C2C;
 }
 
 .budgie-popover .container {
@@ -7122,6 +7099,34 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: transparent;
 }
 
+.budgie-popover entry, .budgie-popover button, .budgie-popover spinbutton, .budgie-popover button.combo {
+  border-radius: 5px;
+}
+
+.budgie-popover .linked > entry:first-child,
+.budgie-popover .linked > button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.budgie-popover .linked > entry:last-child,
+.budgie-popover .linked > button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button) {
+  min-height: 24px;
+  padding: 0 8px;
+  color: white;
+  font-weight: normal;
+  border-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button):disabled {
+  color: rgba(255, 255, 255, 0.5);
+}
+
 .budgie-popover row {
   padding: 0;
 }
@@ -7131,11 +7136,11 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-popover row button {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover calendar:not(.header) {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover scrolledwindow.sidebar.categories {
@@ -7182,22 +7187,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-.budgie-popover button {
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button) {
-  min-height: 24px;
-  padding: 0 8px;
-  color: white;
-  font-weight: normal;
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button):disabled {
-  color: rgba(255, 255, 255, 0.5);
-}
-
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -7216,13 +7205,13 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 120%;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
@@ -7251,18 +7240,18 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 4px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
   min-height: 16px;
   min-width: 16px;
   padding: 4px;
   border-radius: 5px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
   border-radius: 9999px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
   margin-right: 4px;
 }
 
@@ -7515,7 +7504,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel .alert {
-  color: #F44336;
+  color: #3281EA;
 }
 
 .budgie-panel .titlebar:not(headerbar) {
@@ -7769,6 +7758,8 @@ calendar.raven-calendar:selected {
 }
 
 image.raven-mpris {
+  background-color: rgba(255, 255, 255, 0.12);
+  color: rgba(255, 255, 255, 0.7);
   border-radius: 10px;
 }
 
@@ -7807,38 +7798,51 @@ image.raven-mpris {
   box-shadow: none;
 }
 
-.budgie-notification-window, .budgie-switcher-window, .budgie-osd-window {
+.budgie-notification-window {
   background-color: transparent;
 }
 
-.budgie-notification .notification-title, .budgie-switcher .notification-title {
+.budgie-notification {
+  padding: 8px;
+}
+
+.budgie-notification .notification-title {
   font-size: 120%;
 }
 
-.budgie-notification .notification-body, .budgie-switcher .notification-body {
+.budgie-notification .notification-body {
   color: rgba(255, 255, 255, 0.7);
 }
 
+.budgie-osd-window {
+  background-color: transparent;
+}
+
 .budgie-osd .budgie-osd-text {
   font-size: 120%;
 }
 
+.budgie-switcher-window {
+  background-color: transparent;
+}
+
+.budgie-switcher {
+  padding: 8px;
+  margin: 4px;
+}
+
 .budgie-panel .lock-keys image:disabled {
   color: rgba(255, 255, 255, 0.3);
 }
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 4px;
   border-radius: 16px;
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 16px;
-}
-
 .budgie-session-dialog,
 .budgie-polkit-dialog,
 .budgie-run-dialog {
@@ -7846,6 +7850,12 @@ image.raven-mpris {
   background-color: #3C3C3C;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
 .budgie-polkit-dialog.background.csd,
 .budgie-polkit-dialog decoration,
@@ -7891,6 +7901,10 @@ image.raven-mpris {
   color: #F44336;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding: 24px 24px 0;
+}
+
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 4px 12px;
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index 0444db0..5d2bb36 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -41,7 +41,7 @@
   outline-color: alpha(currentColor, 0.1);
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected {
   color: white;
   background-color: #414141;
@@ -615,7 +615,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
   color: rgba(255, 255, 255, 0.5);
 }
 
-.budgie-notification .linked > button, .budgie-switcher .linked > button, .raven .expander-button, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+.budgie-notification-window .linked > button, .budgie-notification-window .linked > button:first-child, .budgie-notification-window .linked > button:last-child, .raven .expander-button, 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 > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
@@ -624,7 +624,7 @@ radio, headerbar button.titlebutton, button.close, button.circular, .inline-tool
   border-radius: 9999px;
 }
 
-.budgie-notification .linked > button label, .budgie-switcher .linked > button label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
+.budgie-notification-window .linked > button label, .budgie-notification-window .linked > button:first-child label, .budgie-notification-window .linked > button:last-child label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
@@ -1835,25 +1835,25 @@ menubar > menuitem label:disabled,
   border-radius: 12px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: 3px;
   padding: 6px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   background-clip: border-box;
+  border-radius: 11px;
+}
+
+background:not(.popup) menu {
   border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 0;
 }
 
-.csd menu, .csd .menu, .csd .context-menu {
+.csd menu {
   border: none;
-  border-radius: 11px;
 }
 
-menu menuitem,
-.menu menuitem,
-.context-menu menuitem {
+menu menuitem {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1);
   min-height: 20px;
   min-width: 40px;
@@ -1864,58 +1864,40 @@ menu menuitem,
   border-radius: 5px;
 }
 
-menu menuitem:hover,
-.menu menuitem:hover,
-.context-menu menuitem:hover {
+menu menuitem:hover {
   transition: none;
   background-color: alpha(currentColor, 0.08);
   color: white;
 }
 
-menu menuitem:disabled,
-.menu menuitem:disabled,
-.context-menu menuitem:disabled {
+menu menuitem:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
-menu menuitem arrow,
-.menu menuitem arrow,
-.context-menu menuitem arrow {
+menu menuitem arrow {
   min-height: 16px;
   min-width: 16px;
 }
 
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr),
-.context-menu menuitem arrow:dir(ltr) {
+menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-left: 8px;
 }
 
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl),
-.context-menu menuitem arrow:dir(rtl) {
+menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
   margin-right: 8px;
 }
 
-menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
-.menu menuitem label:dir(rtl),
-.menu menuitem label:dir(ltr),
-.context-menu menuitem label:dir(rtl),
-.context-menu menuitem label:dir(ltr) {
+menu menuitem label:dir(rtl), menu menuitem label:dir(ltr) {
   color: inherit;
 }
 
-menu .view:selected,
-.menu .view:selected,
-.context-menu .view:selected {
+menu .view:selected {
   background-color: #505050;
 }
 
-menu > arrow,
-.menu > arrow,
-.context-menu > arrow {
+menu > arrow {
   min-height: 16px;
   min-width: 16px;
   padding: 6px;
@@ -1924,41 +1906,31 @@ menu > arrow,
   border-radius: 8px;
 }
 
-menu > arrow.top,
-.menu > arrow.top,
-.context-menu > arrow.top {
+menu > arrow.top {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
   border-image: image(rgba(255, 255, 255, 0.12)) 0 0 1/0 0 1px;
 }
 
-menu > arrow.bottom,
-.menu > arrow.bottom,
-.context-menu > arrow.bottom {
+menu > arrow.bottom {
   margin-top: 11px;
   margin-bottom: -12px;
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
   border-image: image(rgba(255, 255, 255, 0.12)) 1 0 0/1px 0 0;
 }
 
-menu > arrow:hover,
-.menu > arrow:hover,
-.context-menu > arrow:hover {
+menu > arrow:hover {
   background-image: image(alpha(currentColor, 0.08));
   color: white;
   border-image: none;
 }
 
-menu > arrow:disabled,
-.menu > arrow:disabled,
-.context-menu > arrow:disabled {
+menu > arrow:disabled {
   border-color: transparent;
   background-color: transparent;
   color: transparent;
 }
 
-menu separator,
-.menu separator,
-.context-menu separator {
+menu separator {
   margin: 3px 0;
 }
 
@@ -3299,7 +3271,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -3309,16 +3281,16 @@ list row {
   background-size: 1000% 1000%;
 }
 
-.budgie-popover.budgie-menu button.flat:focus:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
+.budgie-popover.budgie-menu row.activatable > button.flat:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 0ms, background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, .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 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0ms, background-image 0ms;
   animation: ripple 225ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
@@ -6234,6 +6206,11 @@ window.background:not(.csd) > window > menu menuitem {
   transition: none;
 }
 
+.background.popup.xapp-status-icon-menu-window decoration {
+  border-radius: 11px;
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+}
+
 /************
  * Inkscape *
  ************/
@@ -7102,8 +7079,8 @@ MsdOsdWindow.background.osd .progressbar {
   border: none;
   border-radius: 12px;
   box-shadow: 0 3px 2px -2px rgba(0, 0, 0, 0.2), 0 3px 2.4px 0 rgba(0, 0, 0, 0.14), 0 1px 4.8px 0 rgba(0, 0, 0, 0.12);
-  background-color: #3C3C3C;
-  border-color: #3C3C3C;
+  background-color: #2C2C2C;
+  border-color: #2C2C2C;
 }
 
 .budgie-popover .container {
@@ -7122,6 +7099,34 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: transparent;
 }
 
+.budgie-popover entry, .budgie-popover button, .budgie-popover spinbutton, .budgie-popover button.combo {
+  border-radius: 5px;
+}
+
+.budgie-popover .linked > entry:first-child,
+.budgie-popover .linked > button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.budgie-popover .linked > entry:last-child,
+.budgie-popover .linked > button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button) {
+  min-height: 28px;
+  padding: 0 8px;
+  color: white;
+  font-weight: normal;
+  border-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button):disabled {
+  color: rgba(255, 255, 255, 0.5);
+}
+
 .budgie-popover row {
   padding: 0;
 }
@@ -7131,11 +7136,11 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-popover row button {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover calendar:not(.header) {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover scrolledwindow.sidebar.categories {
@@ -7182,22 +7187,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-.budgie-popover button {
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button) {
-  min-height: 28px;
-  padding: 0 8px;
-  color: white;
-  font-weight: normal;
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button):disabled {
-  color: rgba(255, 255, 255, 0.5);
-}
-
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -7216,13 +7205,13 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 120%;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
@@ -7251,18 +7240,18 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 6px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
   min-height: 16px;
   min-width: 16px;
   padding: 6px;
   border-radius: 5px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
   border-radius: 9999px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
   margin-right: 6px;
 }
 
@@ -7515,7 +7504,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel .alert {
-  color: #F44336;
+  color: #3281EA;
 }
 
 .budgie-panel .titlebar:not(headerbar) {
@@ -7769,6 +7758,8 @@ calendar.raven-calendar:selected {
 }
 
 image.raven-mpris {
+  background-color: rgba(255, 255, 255, 0.12);
+  color: rgba(255, 255, 255, 0.7);
   border-radius: 12px;
 }
 
@@ -7807,38 +7798,51 @@ image.raven-mpris {
   box-shadow: none;
 }
 
-.budgie-notification-window, .budgie-switcher-window, .budgie-osd-window {
+.budgie-notification-window {
   background-color: transparent;
 }
 
-.budgie-notification .notification-title, .budgie-switcher .notification-title {
+.budgie-notification {
+  padding: 12px;
+}
+
+.budgie-notification .notification-title {
   font-size: 120%;
 }
 
-.budgie-notification .notification-body, .budgie-switcher .notification-body {
+.budgie-notification .notification-body {
   color: rgba(255, 255, 255, 0.7);
 }
 
+.budgie-osd-window {
+  background-color: transparent;
+}
+
 .budgie-osd .budgie-osd-text {
   font-size: 120%;
 }
 
+.budgie-switcher-window {
+  background-color: transparent;
+}
+
+.budgie-switcher {
+  padding: 12px;
+  margin: 6px;
+}
+
 .budgie-panel .lock-keys image:disabled {
   color: rgba(255, 255, 255, 0.3);
 }
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 6px;
   border-radius: 18px;
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 18px;
-}
-
 .budgie-session-dialog,
 .budgie-polkit-dialog,
 .budgie-run-dialog {
@@ -7846,6 +7850,12 @@ image.raven-mpris {
   background-color: #3C3C3C;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
 .budgie-polkit-dialog.background.csd,
 .budgie-polkit-dialog decoration,
@@ -7891,6 +7901,10 @@ image.raven-mpris {
   color: #F44336;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding: 24px 24px 0;
+}
+
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 6px 14px;
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index a138405..2f65dfd 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -41,7 +41,7 @@
   outline-color: alpha(currentColor, 0.1);
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
@@ -615,7 +615,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
   color: rgba(0, 0, 0, 0.38);
 }
 
-.budgie-notification .linked > button, .budgie-switcher .linked > button, .raven .expander-button, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+.budgie-notification-window .linked > button, .budgie-notification-window .linked > button:first-child, .budgie-notification-window .linked > button:last-child, .raven .expander-button, 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 > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
@@ -624,7 +624,7 @@ radio, headerbar button.titlebutton, button.close, button.circular, .inline-tool
   border-radius: 9999px;
 }
 
-.budgie-notification .linked > button label, .budgie-switcher .linked > button label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
+.budgie-notification-window .linked > button label, .budgie-notification-window .linked > button:first-child label, .budgie-notification-window .linked > button:last-child label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
@@ -1835,25 +1835,25 @@ menubar > menuitem label:disabled,
   border-radius: 10px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: 2px;
   padding: 4px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+  border-radius: 9px;
+}
+
+background:not(.popup) menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 0;
 }
 
-.csd menu, .csd .menu, .csd .context-menu {
+.csd menu {
   border: none;
-  border-radius: 9px;
 }
 
-menu menuitem,
-.menu menuitem,
-.context-menu menuitem {
+menu menuitem {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1);
   min-height: 20px;
   min-width: 40px;
@@ -1864,58 +1864,40 @@ menu menuitem,
   border-radius: 5px;
 }
 
-menu menuitem:hover,
-.menu menuitem:hover,
-.context-menu menuitem:hover {
+menu menuitem:hover {
   transition: none;
   background-color: alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
 }
 
-menu menuitem:disabled,
-.menu menuitem:disabled,
-.context-menu menuitem:disabled {
+menu menuitem:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
-menu menuitem arrow,
-.menu menuitem arrow,
-.context-menu menuitem arrow {
+menu menuitem arrow {
   min-height: 16px;
   min-width: 16px;
 }
 
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr),
-.context-menu menuitem arrow:dir(ltr) {
+menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-left: 8px;
 }
 
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl),
-.context-menu menuitem arrow:dir(rtl) {
+menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
   margin-right: 8px;
 }
 
-menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
-.menu menuitem label:dir(rtl),
-.menu menuitem label:dir(ltr),
-.context-menu menuitem label:dir(rtl),
-.context-menu menuitem label:dir(ltr) {
+menu menuitem label:dir(rtl), menu menuitem label:dir(ltr) {
   color: inherit;
 }
 
-menu .view:selected,
-.menu .view:selected,
-.context-menu .view:selected {
+menu .view:selected {
   background-color: rgba(235, 235, 235, 0.987);
 }
 
-menu > arrow,
-.menu > arrow,
-.context-menu > arrow {
+menu > arrow {
   min-height: 16px;
   min-width: 16px;
   padding: 4px;
@@ -1924,41 +1906,31 @@ menu > arrow,
   border-radius: 6px;
 }
 
-menu > arrow.top,
-.menu > arrow.top,
-.context-menu > arrow.top {
+menu > arrow.top {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 0 0 1/0 0 1px;
 }
 
-menu > arrow.bottom,
-.menu > arrow.bottom,
-.context-menu > arrow.bottom {
+menu > arrow.bottom {
   margin-top: 10px;
   margin-bottom: -12px;
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 1 0 0/1px 0 0;
 }
 
-menu > arrow:hover,
-.menu > arrow:hover,
-.context-menu > arrow:hover {
+menu > arrow:hover {
   background-image: image(alpha(currentColor, 0.08));
   color: rgba(0, 0, 0, 0.87);
   border-image: none;
 }
 
-menu > arrow:disabled,
-.menu > arrow:disabled,
-.context-menu > arrow:disabled {
+menu > arrow:disabled {
   border-color: transparent;
   background-color: transparent;
   color: transparent;
 }
 
-menu separator,
-.menu separator,
-.context-menu separator {
+menu separator {
   margin: 3px 0;
 }
 
@@ -3299,7 +3271,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -3309,16 +3281,16 @@ list row {
   background-size: 1000% 1000%;
 }
 
-.budgie-popover.budgie-menu button.flat:focus:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
+.budgie-popover.budgie-menu row.activatable > button.flat:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 0ms, background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, .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 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0ms, background-image 0ms;
   animation: ripple 225ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
@@ -6237,6 +6209,11 @@ window.background:not(.csd) > window > menu menuitem {
   transition: none;
 }
 
+.background.popup.xapp-status-icon-menu-window decoration {
+  border-radius: 9px;
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+}
+
 /************
  * Inkscape *
  ************/
@@ -7125,6 +7102,34 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: transparent;
 }
 
+.budgie-popover entry, .budgie-popover button, .budgie-popover spinbutton, .budgie-popover button.combo {
+  border-radius: 5px;
+}
+
+.budgie-popover .linked > entry:first-child,
+.budgie-popover .linked > button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.budgie-popover .linked > entry:last-child,
+.budgie-popover .linked > button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button) {
+  min-height: 24px;
+  padding: 0 8px;
+  color: rgba(0, 0, 0, 0.87);
+  font-weight: normal;
+  border-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button):disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
 .budgie-popover row {
   padding: 0;
 }
@@ -7134,11 +7139,11 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-popover row button {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover calendar:not(.header) {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover scrolledwindow.sidebar.categories {
@@ -7185,22 +7190,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover button {
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button) {
-  min-height: 24px;
-  padding: 0 8px;
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: normal;
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button):disabled {
-  color: rgba(0, 0, 0, 0.38);
-}
-
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -7219,13 +7208,13 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 120%;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
@@ -7254,18 +7243,18 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 4px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
   min-height: 16px;
   min-width: 16px;
   padding: 4px;
   border-radius: 5px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
   border-radius: 9999px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
   margin-right: 4px;
 }
 
@@ -7518,7 +7507,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel .alert {
-  color: #E53935;
+  color: #1A73E8;
 }
 
 .budgie-panel .titlebar:not(headerbar) {
@@ -7772,6 +7761,8 @@ calendar.raven-calendar:selected {
 }
 
 image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
   border-radius: 10px;
 }
 
@@ -7810,38 +7801,51 @@ image.raven-mpris {
   box-shadow: none;
 }
 
-.budgie-notification-window, .budgie-switcher-window, .budgie-osd-window {
+.budgie-notification-window {
   background-color: transparent;
 }
 
-.budgie-notification .notification-title, .budgie-switcher .notification-title {
+.budgie-notification {
+  padding: 8px;
+}
+
+.budgie-notification .notification-title {
   font-size: 120%;
 }
 
-.budgie-notification .notification-body, .budgie-switcher .notification-body {
+.budgie-notification .notification-body {
   color: rgba(0, 0, 0, 0.6);
 }
 
+.budgie-osd-window {
+  background-color: transparent;
+}
+
 .budgie-osd .budgie-osd-text {
   font-size: 120%;
 }
 
+.budgie-switcher-window {
+  background-color: transparent;
+}
+
+.budgie-switcher {
+  padding: 8px;
+  margin: 4px;
+}
+
 .budgie-panel .lock-keys image:disabled {
   color: rgba(0, 0, 0, 0.26);
 }
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 4px;
   border-radius: 16px;
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 16px;
-}
-
 .budgie-session-dialog,
 .budgie-polkit-dialog,
 .budgie-run-dialog {
@@ -7849,6 +7853,12 @@ image.raven-mpris {
   background-color: #FFFFFF;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
 .budgie-polkit-dialog.background.csd,
 .budgie-polkit-dialog decoration,
@@ -7894,6 +7904,10 @@ image.raven-mpris {
   color: #E53935;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding: 24px 24px 0;
+}
+
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 4px 12px;
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index b52d1ff..e6c73b3 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -41,7 +41,7 @@
   outline-color: alpha(currentColor, 0.1);
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
@@ -615,7 +615,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
   color: rgba(0, 0, 0, 0.38);
 }
 
-.budgie-notification .linked > button, .budgie-switcher .linked > button, .raven .expander-button, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+.budgie-notification-window .linked > button, .budgie-notification-window .linked > button:first-child, .budgie-notification-window .linked > button:last-child, .raven .expander-button, 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 > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
@@ -624,7 +624,7 @@ radio, headerbar button.titlebutton, button.close, button.circular, .inline-tool
   border-radius: 9999px;
 }
 
-.budgie-notification .linked > button label, .budgie-switcher .linked > button label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
+.budgie-notification-window .linked > button label, .budgie-notification-window .linked > button:first-child label, .budgie-notification-window .linked > button:last-child label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
@@ -1835,25 +1835,25 @@ menubar > menuitem label:disabled,
   border-radius: 12px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: 3px;
   padding: 6px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+  border-radius: 11px;
+}
+
+background:not(.popup) menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 0;
 }
 
-.csd menu, .csd .menu, .csd .context-menu {
+.csd menu {
   border: none;
-  border-radius: 11px;
 }
 
-menu menuitem,
-.menu menuitem,
-.context-menu menuitem {
+menu menuitem {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1);
   min-height: 20px;
   min-width: 40px;
@@ -1864,58 +1864,40 @@ menu menuitem,
   border-radius: 5px;
 }
 
-menu menuitem:hover,
-.menu menuitem:hover,
-.context-menu menuitem:hover {
+menu menuitem:hover {
   transition: none;
   background-color: alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
 }
 
-menu menuitem:disabled,
-.menu menuitem:disabled,
-.context-menu menuitem:disabled {
+menu menuitem:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
-menu menuitem arrow,
-.menu menuitem arrow,
-.context-menu menuitem arrow {
+menu menuitem arrow {
   min-height: 16px;
   min-width: 16px;
 }
 
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr),
-.context-menu menuitem arrow:dir(ltr) {
+menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-left: 8px;
 }
 
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl),
-.context-menu menuitem arrow:dir(rtl) {
+menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
   margin-right: 8px;
 }
 
-menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
-.menu menuitem label:dir(rtl),
-.menu menuitem label:dir(ltr),
-.context-menu menuitem label:dir(rtl),
-.context-menu menuitem label:dir(ltr) {
+menu menuitem label:dir(rtl), menu menuitem label:dir(ltr) {
   color: inherit;
 }
 
-menu .view:selected,
-.menu .view:selected,
-.context-menu .view:selected {
+menu .view:selected {
   background-color: rgba(235, 235, 235, 0.987);
 }
 
-menu > arrow,
-.menu > arrow,
-.context-menu > arrow {
+menu > arrow {
   min-height: 16px;
   min-width: 16px;
   padding: 6px;
@@ -1924,41 +1906,31 @@ menu > arrow,
   border-radius: 8px;
 }
 
-menu > arrow.top,
-.menu > arrow.top,
-.context-menu > arrow.top {
+menu > arrow.top {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 0 0 1/0 0 1px;
 }
 
-menu > arrow.bottom,
-.menu > arrow.bottom,
-.context-menu > arrow.bottom {
+menu > arrow.bottom {
   margin-top: 11px;
   margin-bottom: -12px;
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 1 0 0/1px 0 0;
 }
 
-menu > arrow:hover,
-.menu > arrow:hover,
-.context-menu > arrow:hover {
+menu > arrow:hover {
   background-image: image(alpha(currentColor, 0.08));
   color: rgba(0, 0, 0, 0.87);
   border-image: none;
 }
 
-menu > arrow:disabled,
-.menu > arrow:disabled,
-.context-menu > arrow:disabled {
+menu > arrow:disabled {
   border-color: transparent;
   background-color: transparent;
   color: transparent;
 }
 
-menu separator,
-.menu separator,
-.context-menu separator {
+menu separator {
   margin: 3px 0;
 }
 
@@ -3299,7 +3271,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -3309,16 +3281,16 @@ list row {
   background-size: 1000% 1000%;
 }
 
-.budgie-popover.budgie-menu button.flat:focus:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
+.budgie-popover.budgie-menu row.activatable > button.flat:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 0ms, background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, .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 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0ms, background-image 0ms;
   animation: ripple 225ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
@@ -6237,6 +6209,11 @@ window.background:not(.csd) > window > menu menuitem {
   transition: none;
 }
 
+.background.popup.xapp-status-icon-menu-window decoration {
+  border-radius: 11px;
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+}
+
 /************
  * Inkscape *
  ************/
@@ -7125,6 +7102,34 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: transparent;
 }
 
+.budgie-popover entry, .budgie-popover button, .budgie-popover spinbutton, .budgie-popover button.combo {
+  border-radius: 5px;
+}
+
+.budgie-popover .linked > entry:first-child,
+.budgie-popover .linked > button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.budgie-popover .linked > entry:last-child,
+.budgie-popover .linked > button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button) {
+  min-height: 28px;
+  padding: 0 8px;
+  color: rgba(0, 0, 0, 0.87);
+  font-weight: normal;
+  border-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button):disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
 .budgie-popover row {
   padding: 0;
 }
@@ -7134,11 +7139,11 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-popover row button {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover calendar:not(.header) {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover scrolledwindow.sidebar.categories {
@@ -7185,22 +7190,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover button {
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button) {
-  min-height: 28px;
-  padding: 0 8px;
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: normal;
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button):disabled {
-  color: rgba(0, 0, 0, 0.38);
-}
-
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -7219,13 +7208,13 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 120%;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
@@ -7254,18 +7243,18 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 6px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
   min-height: 16px;
   min-width: 16px;
   padding: 6px;
   border-radius: 5px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
   border-radius: 9999px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
   margin-right: 6px;
 }
 
@@ -7518,7 +7507,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel .alert {
-  color: #E53935;
+  color: #1A73E8;
 }
 
 .budgie-panel .titlebar:not(headerbar) {
@@ -7772,6 +7761,8 @@ calendar.raven-calendar:selected {
 }
 
 image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
   border-radius: 12px;
 }
 
@@ -7810,38 +7801,51 @@ image.raven-mpris {
   box-shadow: none;
 }
 
-.budgie-notification-window, .budgie-switcher-window, .budgie-osd-window {
+.budgie-notification-window {
   background-color: transparent;
 }
 
-.budgie-notification .notification-title, .budgie-switcher .notification-title {
+.budgie-notification {
+  padding: 12px;
+}
+
+.budgie-notification .notification-title {
   font-size: 120%;
 }
 
-.budgie-notification .notification-body, .budgie-switcher .notification-body {
+.budgie-notification .notification-body {
   color: rgba(0, 0, 0, 0.6);
 }
 
+.budgie-osd-window {
+  background-color: transparent;
+}
+
 .budgie-osd .budgie-osd-text {
   font-size: 120%;
 }
 
+.budgie-switcher-window {
+  background-color: transparent;
+}
+
+.budgie-switcher {
+  padding: 12px;
+  margin: 6px;
+}
+
 .budgie-panel .lock-keys image:disabled {
   color: rgba(0, 0, 0, 0.26);
 }
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 6px;
   border-radius: 18px;
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 18px;
-}
-
 .budgie-session-dialog,
 .budgie-polkit-dialog,
 .budgie-run-dialog {
@@ -7849,6 +7853,12 @@ image.raven-mpris {
   background-color: #FFFFFF;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
 .budgie-polkit-dialog.background.csd,
 .budgie-polkit-dialog decoration,
@@ -7894,6 +7904,10 @@ image.raven-mpris {
   color: #E53935;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding: 24px 24px 0;
+}
+
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 6px 14px;
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index 88ac572..67d9d5f 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -41,7 +41,7 @@
   outline-color: alpha(currentColor, 0.1);
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
@@ -615,7 +615,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
   color: rgba(0, 0, 0, 0.38);
 }
 
-.budgie-notification .linked > button, .budgie-switcher .linked > button, .raven .expander-button, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+.budgie-notification-window .linked > button, .budgie-notification-window .linked > button:first-child, .budgie-notification-window .linked > button:last-child, .raven .expander-button, 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 > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
@@ -624,7 +624,7 @@ radio, headerbar button.titlebutton, button.close, button.circular, .inline-tool
   border-radius: 9999px;
 }
 
-.budgie-notification .linked > button label, .budgie-switcher .linked > button label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
+.budgie-notification-window .linked > button label, .budgie-notification-window .linked > button:first-child label, .budgie-notification-window .linked > button:last-child label, .raven .expander-button label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle label,
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
@@ -1835,25 +1835,25 @@ menubar > menuitem label:disabled,
   border-radius: 12px;
 }
 
-menu,
-.menu,
-.context-menu {
+menu {
   margin: 3px;
   padding: 6px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+  border-radius: 11px;
+}
+
+background:not(.popup) menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 0;
 }
 
-.csd menu, .csd .menu, .csd .context-menu {
+.csd menu {
   border: none;
-  border-radius: 11px;
 }
 
-menu menuitem,
-.menu menuitem,
-.context-menu menuitem {
+menu menuitem {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1);
   min-height: 20px;
   min-width: 40px;
@@ -1864,58 +1864,40 @@ menu menuitem,
   border-radius: 5px;
 }
 
-menu menuitem:hover,
-.menu menuitem:hover,
-.context-menu menuitem:hover {
+menu menuitem:hover {
   transition: none;
   background-color: alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
 }
 
-menu menuitem:disabled,
-.menu menuitem:disabled,
-.context-menu menuitem:disabled {
+menu menuitem:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
-menu menuitem arrow,
-.menu menuitem arrow,
-.context-menu menuitem arrow {
+menu menuitem arrow {
   min-height: 16px;
   min-width: 16px;
 }
 
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr),
-.context-menu menuitem arrow:dir(ltr) {
+menu menuitem arrow:dir(ltr) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   margin-left: 8px;
 }
 
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl),
-.context-menu menuitem arrow:dir(rtl) {
+menu menuitem arrow:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
   margin-right: 8px;
 }
 
-menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
-.menu menuitem label:dir(rtl),
-.menu menuitem label:dir(ltr),
-.context-menu menuitem label:dir(rtl),
-.context-menu menuitem label:dir(ltr) {
+menu menuitem label:dir(rtl), menu menuitem label:dir(ltr) {
   color: inherit;
 }
 
-menu .view:selected,
-.menu .view:selected,
-.context-menu .view:selected {
+menu .view:selected {
   background-color: rgba(235, 235, 235, 0.987);
 }
 
-menu > arrow,
-.menu > arrow,
-.context-menu > arrow {
+menu > arrow {
   min-height: 16px;
   min-width: 16px;
   padding: 6px;
@@ -1924,41 +1906,31 @@ menu > arrow,
   border-radius: 8px;
 }
 
-menu > arrow.top,
-.menu > arrow.top,
-.context-menu > arrow.top {
+menu > arrow.top {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 0 0 1/0 0 1px;
 }
 
-menu > arrow.bottom,
-.menu > arrow.bottom,
-.context-menu > arrow.bottom {
+menu > arrow.bottom {
   margin-top: 11px;
   margin-bottom: -12px;
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
   border-image: image(rgba(0, 0, 0, 0.12)) 1 0 0/1px 0 0;
 }
 
-menu > arrow:hover,
-.menu > arrow:hover,
-.context-menu > arrow:hover {
+menu > arrow:hover {
   background-image: image(alpha(currentColor, 0.08));
   color: rgba(0, 0, 0, 0.87);
   border-image: none;
 }
 
-menu > arrow:disabled,
-.menu > arrow:disabled,
-.context-menu > arrow:disabled {
+menu > arrow:disabled {
   border-color: transparent;
   background-color: transparent;
   color: transparent;
 }
 
-menu separator,
-.menu separator,
-.context-menu separator {
+menu separator {
   margin: 3px 0;
 }
 
@@ -3299,7 +3271,7 @@ list row {
   padding: 2px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable, treeview.view header button, row.activatable {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -3309,16 +3281,16 @@ list row {
   background-size: 1000% 1000%;
 }
 
-.budgie-popover.budgie-menu button.flat:focus:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
+.budgie-popover.budgie-menu row.activatable > button.flat:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:focus, treeview.view header button:focus, row.activatable:focus {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:hover, treeview.view header button:hover, row.activatable:hover {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 0ms, background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.has-open-popup.activatable, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, .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 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0ms, background-image 0ms;
   animation: ripple 225ms cubic-bezier(0, 0, 0.2, 1) forwards;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
@@ -6238,6 +6210,11 @@ window.background:not(.csd) > window > menu menuitem {
   transition: none;
 }
 
+.background.popup.xapp-status-icon-menu-window decoration {
+  border-radius: 11px;
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+}
+
 /************
  * Inkscape *
  ************/
@@ -7126,6 +7103,34 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: transparent;
 }
 
+.budgie-popover entry, .budgie-popover button, .budgie-popover spinbutton, .budgie-popover button.combo {
+  border-radius: 5px;
+}
+
+.budgie-popover .linked > entry:first-child,
+.budgie-popover .linked > button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.budgie-popover .linked > entry:last-child,
+.budgie-popover .linked > button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button) {
+  min-height: 28px;
+  padding: 0 8px;
+  color: rgba(0, 0, 0, 0.87);
+  font-weight: normal;
+  border-radius: 5px;
+}
+
+.budgie-popover button.flat:not(.image-button):disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
 .budgie-popover row {
   padding: 0;
 }
@@ -7135,11 +7140,11 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-popover row button {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover calendar:not(.header) {
-  border-radius: 6px;
+  border-radius: 5px;
 }
 
 .budgie-popover scrolledwindow.sidebar.categories {
@@ -7186,22 +7191,6 @@ MsdOsdWindow.background.osd .progressbar {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.budgie-popover button {
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button) {
-  min-height: 28px;
-  padding: 0 8px;
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: normal;
-  border-radius: 6px;
-}
-
-.budgie-popover button.flat:not(.image-button):disabled {
-  color: rgba(0, 0, 0, 0.38);
-}
-
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -7220,13 +7209,13 @@ MsdOsdWindow.background.osd .progressbar {
   font-size: 120%;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
@@ -7255,18 +7244,18 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 6px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
   min-height: 16px;
   min-width: 16px;
   padding: 6px;
   border-radius: 5px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
   border-radius: 9999px;
 }
 
-.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
   margin-right: 6px;
 }
 
@@ -7519,7 +7508,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel .alert {
-  color: #E53935;
+  color: #1A73E8;
 }
 
 .budgie-panel .titlebar:not(headerbar) {
@@ -7773,6 +7762,8 @@ calendar.raven-calendar:selected {
 }
 
 image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
   border-radius: 12px;
 }
 
@@ -7811,38 +7802,51 @@ image.raven-mpris {
   box-shadow: none;
 }
 
-.budgie-notification-window, .budgie-switcher-window, .budgie-osd-window {
+.budgie-notification-window {
   background-color: transparent;
 }
 
-.budgie-notification .notification-title, .budgie-switcher .notification-title {
+.budgie-notification {
+  padding: 12px;
+}
+
+.budgie-notification .notification-title {
   font-size: 120%;
 }
 
-.budgie-notification .notification-body, .budgie-switcher .notification-body {
+.budgie-notification .notification-body {
   color: rgba(0, 0, 0, 0.6);
 }
 
+.budgie-osd-window {
+  background-color: transparent;
+}
+
 .budgie-osd .budgie-osd-text {
   font-size: 120%;
 }
 
+.budgie-switcher-window {
+  background-color: transparent;
+}
+
+.budgie-switcher {
+  padding: 12px;
+  margin: 6px;
+}
+
 .budgie-panel .lock-keys image:disabled {
   color: rgba(255, 255, 255, 0.3);
 }
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 6px;
   border-radius: 18px;
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
-.drop-shadow .linked > button {
-  border-radius: 18px;
-}
-
 .budgie-session-dialog,
 .budgie-polkit-dialog,
 .budgie-run-dialog {
@@ -7850,6 +7854,12 @@ image.raven-mpris {
   background-color: #FFFFFF;
 }
 
+.budgie-session-dialog > box > grid,
+.budgie-polkit-dialog > box > grid,
+.budgie-run-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
 .budgie-polkit-dialog.background.csd,
 .budgie-polkit-dialog decoration,
@@ -7895,6 +7905,10 @@ image.raven-mpris {
   color: #E53935;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding: 24px 24px 0;
+}
+
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 6px 14px;