diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index be000b3..93c1eea 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -81,17 +81,17 @@
   color: white;
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+.csd filechooser stack.view scrolledwindow treeview.view, iconview, .view {
   color: #dadada;
   background-color: #242424;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
+.csd filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
   background-color: #2c2c2c;
 }
 
-filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
+.csd filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
   color: white;
   background-color: #0860f2;
   transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -3953,23 +3953,71 @@ messagedialog.csd.background {
   border: none;
 }
 
-filechooser #pathbarbox {
-  border-bottom: 1px solid rgba(255, 255, 255, 0);
-}
-
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
+.csd filechooser {
   background-color: #242424;
   border-radius: 0 0 14px 14px;
 }
 
-filechooser stack.view scrolledwindow treeview.view {
+.csd filechooser placessidebar.sidebar {
   background-color: transparent;
 }
 
+.csd filechooser actionbar {
+  color: #dadada;
+  background-color: transparent;
+  border-color: rgba(255, 255, 255, 0.12);
+  border-radius: 0 0 14px 0;
+}
+
+.csd filechooser actionbar label, .csd filechooser actionbar combobox {
+  color: #dadada;
+}
+
+.csd filechooser stack.view {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow {
+  background-color: transparent;
+  border-radius: 0 0 14px 14px;
+}
+
+.csd filechooser stack.view scrolledwindow list {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow treeview.view {
+  background-color: transparent;
+}
+
+.csd filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#242424);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #0e0e0e;
+}
+
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(255, 255, 255, 0);
+}
+
 filechooserbutton:drop(active) {
   box-shadow: none;
   border-color: transparent;
@@ -4665,7 +4713,7 @@ modelbutton.flat:active,
 modelbutton.flat:active arrow,
 modelbutton.flat:selected,
 modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus,
-calendar:selected {
+calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:selected:focus {
   background-color: #0860f2;
   color: white;
 }
@@ -5044,42 +5092,6 @@ filechooser paned > separator:hover,
   border: none;
 }
 
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #0e0e0e;
-}
-
-filechooser actionbar.background {
-  color: #dadada;
-  background-color: #333333;
-  border-color: rgba(255, 255, 255, 0.12);
-  border-radius: 0 0 14px 0;
-}
-
-filechooser actionbar.background label, filechooser actionbar.background combobox {
-  color: #dadada;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#242424);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
-}
-
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6126,6 +6138,10 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-left-width: 0;
 }
 
+window.background.csd > box.vertical > overlay > stack.background {
+  border-radius: 0 0 14px 14px;
+}
+
 #weather-page,
 #weekly-forecast-frame {
   border-bottom-right-radius: 14px;
@@ -8843,7 +8859,6 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 }
 
 .budgie-popover .container {
-  padding: 2px;
   border: none;
 }
 
@@ -8881,6 +8896,22 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: rgba(222, 222, 222, 0.35);
 }
 
+.budgie-popover treeview.view.sidebar {
+  min-height: 36px;
+  background: none;
+  border-right: none;
+  color: #dedede;
+}
+
+.budgie-popover treeview.view.sidebar:hover {
+  background-color: rgba(222, 222, 222, 0.05);
+}
+
+.budgie-popover treeview.view.sidebar:selected, .budgie-popover treeview.view.sidebar:selected:hover {
+  color: white;
+  background-color: #0860f2;
+}
+
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -8897,12 +8928,16 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   margin: 3px 0;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.caffeine-popover .container {
   padding: 8px;
 }
 
+.budgie-popover.night-light-indicator .container {
+  padding: 6px;
+}
+
 .budgie-popover.places-menu .container {
-  padding: 8px;
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -9225,13 +9260,6 @@ popover.background.places-menu row {
   font-weight: normal;
 }
 
-.budgie-panel menubar > menuitem > window.background.popup > decoration,
-.budgie-panel menubar > menuitem > window.background.popup > menu,
-.budgie-panel .menubar > menuitem > window.background.popup > decoration,
-.budgie-panel .menubar > menuitem > window.background.popup > menu {
-  border-radius: 0 0 14px 14px;
-}
-
 .budgie-panel menubar > menuitem:hover,
 .budgie-panel .menubar > menuitem:hover {
   background-color: #0860f2;
@@ -10110,6 +10138,42 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   padding: 0 3px;
 }
 
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-dark.png"), url("windows-assets/titlebutton-close-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-hover-dark.png"), url("windows-assets/titlebutton-close-hover-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-active-dark.png"), url("windows-assets/titlebutton-close-active-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-dark.png"), url("windows-assets/titlebutton-maximize-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-hover-dark.png"), url("windows-assets/titlebutton-maximize-hover-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-active-dark.png"), url("windows-assets/titlebutton-maximize-active-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-dark.png"), url("windows-assets/titlebutton-minimize-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-hover-dark.png"), url("windows-assets/titlebutton-minimize-hover-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-active-dark.png"), url("windows-assets/titlebutton-minimize-active-dark@2.png"));
+}
+
 .budgie-panel box.titlebar.horizontal {
   padding: 0 3px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 8d43363..2e39a9a 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -81,17 +81,17 @@
   color: white;
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+.csd filechooser stack.view scrolledwindow treeview.view, iconview, .view {
   color: #dadada;
   background-color: #242424;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
+.csd filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
   background-color: #2c2c2c;
 }
 
-filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
+.csd filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
   color: white;
   background-color: #0860f2;
   transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -3953,23 +3953,71 @@ messagedialog.csd.background {
   border: none;
 }
 
-filechooser #pathbarbox {
-  border-bottom: 1px solid rgba(255, 255, 255, 0);
-}
-
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
+.csd filechooser {
   background-color: #242424;
   border-radius: 0 0 14px 14px;
 }
 
-filechooser stack.view scrolledwindow treeview.view {
+.csd filechooser placessidebar.sidebar {
   background-color: transparent;
 }
 
+.csd filechooser actionbar {
+  color: #dadada;
+  background-color: transparent;
+  border-color: rgba(255, 255, 255, 0.12);
+  border-radius: 0 0 14px 0;
+}
+
+.csd filechooser actionbar label, .csd filechooser actionbar combobox {
+  color: #dadada;
+}
+
+.csd filechooser stack.view {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow {
+  background-color: transparent;
+  border-radius: 0 0 14px 14px;
+}
+
+.csd filechooser stack.view scrolledwindow list {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow treeview.view {
+  background-color: transparent;
+}
+
+.csd filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#242424);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #0e0e0e;
+}
+
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(255, 255, 255, 0);
+}
+
 filechooserbutton:drop(active) {
   box-shadow: none;
   border-color: transparent;
@@ -4665,7 +4713,7 @@ modelbutton.flat:active,
 modelbutton.flat:active arrow,
 modelbutton.flat:selected,
 modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus,
-calendar:selected {
+calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:selected:focus {
   background-color: #0860f2;
   color: white;
 }
@@ -5040,42 +5088,6 @@ filechooser paned > separator:hover,
   border: none;
 }
 
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #0e0e0e;
-}
-
-filechooser actionbar.background {
-  color: #dadada;
-  background-color: rgba(51, 51, 51, 0.95);
-  border-color: rgba(255, 255, 255, 0.12);
-  border-radius: 0 0 14px 0;
-}
-
-filechooser actionbar.background label, filechooser actionbar.background combobox {
-  color: #dadada;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#242424);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
-}
-
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6122,6 +6134,10 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-left-width: 0;
 }
 
+window.background.csd > box.vertical > overlay > stack.background {
+  border-radius: 0 0 14px 14px;
+}
+
 #weather-page,
 #weekly-forecast-frame {
   border-bottom-right-radius: 14px;
@@ -8839,7 +8855,6 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 }
 
 .budgie-popover .container {
-  padding: 2px;
   border: none;
 }
 
@@ -8877,6 +8892,22 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: rgba(222, 222, 222, 0.35);
 }
 
+.budgie-popover treeview.view.sidebar {
+  min-height: 36px;
+  background: none;
+  border-right: none;
+  color: #dedede;
+}
+
+.budgie-popover treeview.view.sidebar:hover {
+  background-color: rgba(222, 222, 222, 0.05);
+}
+
+.budgie-popover treeview.view.sidebar:selected, .budgie-popover treeview.view.sidebar:selected:hover {
+  color: white;
+  background-color: #0860f2;
+}
+
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -8893,12 +8924,16 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   margin: 3px 0;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.caffeine-popover .container {
   padding: 8px;
 }
 
+.budgie-popover.night-light-indicator .container {
+  padding: 6px;
+}
+
 .budgie-popover.places-menu .container {
-  padding: 8px;
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -9221,13 +9256,6 @@ popover.background.places-menu row {
   font-weight: normal;
 }
 
-.budgie-panel menubar > menuitem > window.background.popup > decoration,
-.budgie-panel menubar > menuitem > window.background.popup > menu,
-.budgie-panel .menubar > menuitem > window.background.popup > decoration,
-.budgie-panel .menubar > menuitem > window.background.popup > menu {
-  border-radius: 0 0 14px 14px;
-}
-
 .budgie-panel menubar > menuitem:hover,
 .budgie-panel .menubar > menuitem:hover {
   background-color: #0860f2;
@@ -10106,6 +10134,42 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   padding: 0 3px;
 }
 
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-dark.png"), url("windows-assets/titlebutton-close-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-hover-dark.png"), url("windows-assets/titlebutton-close-hover-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-active-dark.png"), url("windows-assets/titlebutton-close-active-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-dark.png"), url("windows-assets/titlebutton-maximize-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-hover-dark.png"), url("windows-assets/titlebutton-maximize-hover-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-active-dark.png"), url("windows-assets/titlebutton-maximize-active-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-dark.png"), url("windows-assets/titlebutton-minimize-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-hover-dark.png"), url("windows-assets/titlebutton-minimize-hover-dark@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-active-dark.png"), url("windows-assets/titlebutton-minimize-active-dark@2.png"));
+}
+
 .budgie-panel box.titlebar.horizontal {
   padding: 0 3px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 0fbb388..27539e6 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -81,17 +81,17 @@
   color: white;
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+.csd filechooser stack.view scrolledwindow treeview.view, iconview, .view {
   color: #363636;
   background-color: #ffffff;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
+.csd filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
   background-color: #f7f7f7;
 }
 
-filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
+.csd filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
   color: white;
   background-color: #0860f2;
   transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -3965,23 +3965,71 @@ messagedialog.csd.background {
   border: none;
 }
 
-filechooser #pathbarbox {
-  border-bottom: 1px solid rgba(0, 0, 0, 0);
-}
-
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
+.csd filechooser {
   background-color: #ffffff;
   border-radius: 0 0 14px 14px;
 }
 
-filechooser stack.view scrolledwindow treeview.view {
+.csd filechooser placessidebar.sidebar {
   background-color: transparent;
 }
 
+.csd filechooser actionbar {
+  color: #363636;
+  background-color: transparent;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-radius: 0 0 14px 0;
+}
+
+.csd filechooser actionbar label, .csd filechooser actionbar combobox {
+  color: #363636;
+}
+
+.csd filechooser stack.view {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow {
+  background-color: transparent;
+  border-radius: 0 0 14px 14px;
+}
+
+.csd filechooser stack.view scrolledwindow list {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow treeview.view {
+  background-color: transparent;
+}
+
+.csd filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#ffffff);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #d6d6d6;
+}
+
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(0, 0, 0, 0);
+}
+
 filechooserbutton:drop(active) {
   box-shadow: none;
   border-color: transparent;
@@ -4686,7 +4734,7 @@ modelbutton.flat:active,
 modelbutton.flat:active arrow,
 modelbutton.flat:selected,
 modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus,
-calendar:selected {
+calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:selected:focus {
   background-color: #0860f2;
   color: white;
 }
@@ -5065,42 +5113,6 @@ filechooser paned > separator:hover,
   border: none;
 }
 
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #d6d6d6;
-}
-
-filechooser actionbar.background {
-  color: #363636;
-  background-color: #f0f0f0;
-  border-color: rgba(0, 0, 0, 0.12);
-  border-radius: 0 0 14px 0;
-}
-
-filechooser actionbar.background label, filechooser actionbar.background combobox {
-  color: #363636;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#ffffff);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
-}
-
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6148,6 +6160,10 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-left-width: 0;
 }
 
+window.background.csd > box.vertical > overlay > stack.background {
+  border-radius: 0 0 14px 14px;
+}
+
 #weather-page,
 #weekly-forecast-frame {
   border-bottom-right-radius: 14px;
@@ -8880,7 +8896,6 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 }
 
 .budgie-popover .container {
-  padding: 2px;
   border: none;
 }
 
@@ -8918,6 +8933,22 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: rgba(36, 36, 36, 0.45);
 }
 
+.budgie-popover treeview.view.sidebar {
+  min-height: 36px;
+  background: none;
+  border-right: none;
+  color: #242424;
+}
+
+.budgie-popover treeview.view.sidebar:hover {
+  background-color: rgba(36, 36, 36, 0.05);
+}
+
+.budgie-popover treeview.view.sidebar:selected, .budgie-popover treeview.view.sidebar:selected:hover {
+  color: white;
+  background-color: #0860f2;
+}
+
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -8934,12 +8965,16 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   margin: 3px 0;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.caffeine-popover .container {
   padding: 8px;
 }
 
+.budgie-popover.night-light-indicator .container {
+  padding: 6px;
+}
+
 .budgie-popover.places-menu .container {
-  padding: 8px;
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -9262,13 +9297,6 @@ popover.background.places-menu row {
   font-weight: normal;
 }
 
-.budgie-panel menubar > menuitem > window.background.popup > decoration,
-.budgie-panel menubar > menuitem > window.background.popup > menu,
-.budgie-panel .menubar > menuitem > window.background.popup > decoration,
-.budgie-panel .menubar > menuitem > window.background.popup > menu {
-  border-radius: 0 0 14px 14px;
-}
-
 .budgie-panel menubar > menuitem:hover,
 .budgie-panel .menubar > menuitem:hover {
   background-color: #0860f2;
@@ -10146,6 +10174,42 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   padding: 0 3px;
 }
 
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close.png"), url("windows-assets/titlebutton-close@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-hover.png"), url("windows-assets/titlebutton-close-hover@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-active.png"), url("windows-assets/titlebutton-close-active@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize.png"), url("windows-assets/titlebutton-maximize@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-hover.png"), url("windows-assets/titlebutton-maximize-hover@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-active.png"), url("windows-assets/titlebutton-maximize-active@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize.png"), url("windows-assets/titlebutton-minimize@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-hover.png"), url("windows-assets/titlebutton-minimize-hover@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-active.png"), url("windows-assets/titlebutton-minimize-active@2.png"));
+}
+
 .budgie-panel box.titlebar.horizontal {
   padding: 0 3px;
 }
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 1454a58..33e139e 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -81,17 +81,17 @@
   color: white;
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+.csd filechooser stack.view scrolledwindow treeview.view, iconview, .view {
   color: #363636;
   background-color: #ffffff;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
+.csd filechooser stack.view scrolledwindow treeview.view:hover, iconview:hover, .view:hover {
   background-color: #f7f7f7;
 }
 
-filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
+.csd filechooser stack.view scrolledwindow treeview.view:selected, iconview:selected, .view:selected {
   color: white;
   background-color: #0860f2;
   transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -3965,23 +3965,71 @@ messagedialog.csd.background {
   border: none;
 }
 
-filechooser #pathbarbox {
-  border-bottom: 1px solid rgba(0, 0, 0, 0);
-}
-
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
+.csd filechooser {
   background-color: #ffffff;
   border-radius: 0 0 14px 14px;
 }
 
-filechooser stack.view scrolledwindow treeview.view {
+.csd filechooser placessidebar.sidebar {
   background-color: transparent;
 }
 
+.csd filechooser actionbar {
+  color: #363636;
+  background-color: transparent;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-radius: 0 0 14px 0;
+}
+
+.csd filechooser actionbar label, .csd filechooser actionbar combobox {
+  color: #363636;
+}
+
+.csd filechooser stack.view {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow {
+  background-color: transparent;
+  border-radius: 0 0 14px 14px;
+}
+
+.csd filechooser stack.view scrolledwindow list {
+  background-color: transparent;
+}
+
+.csd filechooser stack.view scrolledwindow treeview.view {
+  background-color: transparent;
+}
+
+.csd filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#ffffff);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+.csd filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #d6d6d6;
+}
+
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(0, 0, 0, 0);
+}
+
 filechooserbutton:drop(active) {
   box-shadow: none;
   border-color: transparent;
@@ -4686,7 +4734,7 @@ modelbutton.flat:active,
 modelbutton.flat:active arrow,
 modelbutton.flat:selected,
 modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus,
-calendar:selected {
+calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:selected:focus {
   background-color: #0860f2;
   color: white;
 }
@@ -5061,42 +5109,6 @@ filechooser paned > separator:hover,
   border: none;
 }
 
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #d6d6d6;
-}
-
-filechooser actionbar.background {
-  color: #363636;
-  background-color: rgba(240, 240, 240, 0.94);
-  border-color: rgba(0, 0, 0, 0.12);
-  border-radius: 0 0 14px 0;
-}
-
-filechooser actionbar.background label, filechooser actionbar.background combobox {
-  color: #363636;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#ffffff);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
-}
-
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6144,6 +6156,10 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-left-width: 0;
 }
 
+window.background.csd > box.vertical > overlay > stack.background {
+  border-radius: 0 0 14px 14px;
+}
+
 #weather-page,
 #weekly-forecast-frame {
   border-bottom-right-radius: 14px;
@@ -8876,7 +8892,6 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 }
 
 .budgie-popover .container {
-  padding: 2px;
   border: none;
 }
 
@@ -8914,6 +8929,22 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: rgba(36, 36, 36, 0.45);
 }
 
+.budgie-popover treeview.view.sidebar {
+  min-height: 36px;
+  background: none;
+  border-right: none;
+  color: #242424;
+}
+
+.budgie-popover treeview.view.sidebar:hover {
+  background-color: rgba(36, 36, 36, 0.05);
+}
+
+.budgie-popover treeview.view.sidebar:selected, .budgie-popover treeview.view.sidebar:selected:hover {
+  color: white;
+  background-color: #0860f2;
+}
+
 .budgie-popover.budgie-menu .container {
   padding: 0;
 }
@@ -8930,12 +8961,16 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   margin: 3px 0;
 }
 
-.budgie-popover.night-light-indicator .container {
+.budgie-popover.caffeine-popover .container {
   padding: 8px;
 }
 
+.budgie-popover.night-light-indicator .container {
+  padding: 6px;
+}
+
 .budgie-popover.places-menu .container {
-  padding: 8px;
+  padding: 6px;
 }
 
 .budgie-popover.places-menu .places-list:not(.always-expand) {
@@ -9258,13 +9293,6 @@ popover.background.places-menu row {
   font-weight: normal;
 }
 
-.budgie-panel menubar > menuitem > window.background.popup > decoration,
-.budgie-panel menubar > menuitem > window.background.popup > menu,
-.budgie-panel .menubar > menuitem > window.background.popup > decoration,
-.budgie-panel .menubar > menuitem > window.background.popup > menu {
-  border-radius: 0 0 14px 14px;
-}
-
 .budgie-panel menubar > menuitem:hover,
 .budgie-panel .menubar > menuitem:hover {
   background-color: #0860f2;
@@ -10142,6 +10170,42 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   padding: 0 3px;
 }
 
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close.png"), url("windows-assets/titlebutton-close@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-hover.png"), url("windows-assets/titlebutton-close-hover@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.close:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-close-active.png"), url("windows-assets/titlebutton-close-active@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize.png"), url("windows-assets/titlebutton-maximize@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-hover.png"), url("windows-assets/titlebutton-maximize-hover@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.maximize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-maximize-active.png"), url("windows-assets/titlebutton-maximize-active@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize.png"), url("windows-assets/titlebutton-minimize@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:hover {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-hover.png"), url("windows-assets/titlebutton-minimize-hover@2.png"));
+}
+
+.budgie-panel box.titlebar > button.image-button.titlebutton.minimize:backdrop:active {
+  background-image: -gtk-scaled(url("windows-assets/titlebutton-minimize-active.png"), url("windows-assets/titlebutton-minimize-active@2.png"));
+}
+
 .budgie-panel box.titlebar.horizontal {
   padding: 0 3px;
 }
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index ae1f508..c4c1548 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -337,35 +337,6 @@ filechooser,
   }
 }
 
-filechooser {
-  placessidebar.sidebar {
-    border: none;
-    background-color: transparent;
-
-    &.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
-  }
-
-  actionbar.background {
-    color: $dark_sidebar_fg;
-    background-color: $dark_sidebar_bg;
-    border-color: $borders_color;
-    border-radius: 0 0 $wm_radius 0;
-
-    label, combobox { color: $dark_sidebar_fg; }
-  }
-
-  box.vertical > paned > separator { // Use paned separator to hide stack border-bottom-left-radius
-    border: none;
-    background-color: transparent;
-    background-image: image($base_color);
-    background-size: 8px 8px;
-    background-position: left bottom;
-
-    &:dir(ltr) { margin-left: -1px; }
-    &:dir(rtl) { margin-right: -1px; }
-  }
-}
-
 .nautilus-canvas-item { border-radius: 5px; }
 
 // .view.nautilus-desktop,
diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss
index 7df3376..8599242 100644
--- a/src/sass/gtk/_budgie.scss
+++ b/src/sass/gtk/_budgie.scss
@@ -116,7 +116,7 @@ $raven_padding: 8px;
               0 0 0 1px if($variant=='light', $borders_color, rgba($dark_borders_color, 0.55)),
               inset 0 0 0 1px if($variant=='light', rgba(black, 0.0), rgba(white, 0.08));
 
-  .container { padding: 2px; border: none; }
+  .container { border: none; }
   border { border: none; }
   list { background-color: transparent; }
 
@@ -139,6 +139,20 @@ $raven_padding: 8px;
     &:disabled { color: $disabled_fg_color; }
   }
 
+  treeview.view.sidebar { //AppMenu (Elementary)
+    min-height: 36px;
+    background: none;
+    border-right: none;
+    color: $fg_color;
+
+    &:hover { background-color: rgba($fg_color, 0.05); }
+
+    &:selected, &:selected:hover {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+    }
+  }
+
   &.budgie-menu {
     .container { padding: 0; }
   }
@@ -152,12 +166,16 @@ $raven_padding: 8px;
     separator { margin: 3px 0; }
   }
 
-  &.night-light-indicator {
+  &.caffeine-popover {
     .container { padding: 8px; }
   }
 
+  &.night-light-indicator {
+    .container { padding: 6px; }
+  }
+
   &.places-menu {
-    .container { padding: 8px; }
+    .container { padding: 6px; }
 
     .places-list:not(.always-expand) {
       margin-top: 4px;
@@ -464,8 +482,8 @@ popover.background.places-menu {
       background-image: none;
       font-weight: normal;
 
-      > window.background.popup > decoration,
-      > window.background.popup > menu { border-radius: 0 0 $wm_radius $wm_radius; }
+      // > window.background.popup > decoration,
+      // > window.background.popup > menu { border-radius: 0 0 $wm_radius $wm_radius; }
 
       &:hover { background-color: $selected_bg_color; }
       &:disabled { color: transparentize($panel_fg, 0.6); }
@@ -1236,7 +1254,19 @@ window.budgie-switcher-window {
 
   > widget > label { color: rgba($panel_fg, 0.75); } // titles
 
-  > button.image-button.titlebutton { padding: 0 3px; }
+  > button.image-button.titlebutton {
+    padding: 0 3px;
+
+    // Load png assets for each button, Fix the Chrome window restore button bug
+    @each $k in ('close', 'maximize', 'minimize') {
+      @each $l, $m in (':backdrop',''), (':backdrop:hover','-hover'), (':backdrop:active','-active') {
+        &.#{$k}#{$l} {
+          background-image: -gtk-scaled(url('windows-assets/titlebutton-#{$k}#{$m}#{$asset_suffix}.png'),
+                                        url('windows-assets/titlebutton-#{$k}#{$m}#{$asset_suffix}@2.png'));
+        }
+      }
+    }
+  }
 
   &.horizontal { // spacing
     padding: 0 3px;
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index c1864b6..a775c94 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -3291,21 +3291,56 @@ messagedialog { // Message Dialog styling
 // Filechooser
 //
 filechooser {
-  #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); }
+  .csd & {
+    background-color: $base_color;
+    border-radius: 0 0 $wm_radius $wm_radius;
 
-  stack.view {
-    background-color: transparent;
+    placessidebar.sidebar { background-color: transparent; }
 
-    scrolledwindow {
-      background-color: $base_color;
-      border-radius: 0 0 $wm_radius $wm_radius;
+    actionbar {
+      color: $dark_sidebar_fg;
+      background-color: transparent;
+      border-color: $borders_color;
+      border-radius: 0 0 $wm_radius 0;
 
-      treeview.view {
-        @extend %view;
+      label, combobox { color: $dark_sidebar_fg; }
+    }
+
+    stack.view {
+      background-color: transparent;
+
+      scrolledwindow {
         background-color: transparent;
+        border-radius: 0 0 $wm_radius $wm_radius;
+
+        list { background-color: transparent; }
+
+        treeview.view {
+          @extend %view;
+          background-color: transparent;
+        }
       }
     }
+
+    box.vertical > paned > separator { // Use paned separator to hide stack border-bottom-left-radius
+      border: none;
+      background-color: transparent;
+      background-image: image($base_color);
+      background-size: 8px 8px;
+      background-position: left bottom;
+
+      &:dir(ltr) { margin-left: -1px; }
+      &:dir(rtl) { margin-right: -1px; }
+    }
   }
+
+  placessidebar.sidebar {
+    border: none;
+
+    &.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
+  }
+
+  #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); }
 }
 
 filechooserbutton:drop(active) {