diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 92d18ed..14f2d98 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -6152,7 +6152,18 @@ window.background.csd > box.vertical > overlay > stack.background {
   border-bottom-left-radius: 14px;
 }
 
-hdyviewswitcherbar > actionbar {
+window.background.csd.unified {
+  border-top-left-radius: 14px;
+  border-top-right-radius: 14px;
+}
+
+window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio {
+  margin: 0;
+  border-radius: 0;
+}
+
+hdyviewswitcherbar > actionbar,
+viewswitcherbar > actionbar {
   background: none;
   border: none;
 }
@@ -7235,6 +7246,10 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g
   background: none;
 }
 
+.geary-settings entry {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+}
+
 window.background:not(.csd) > widget > separator {
   padding-top: 1px;
   margin-top: 1px;
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 392c387..6beec6a 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -6148,7 +6148,18 @@ window.background.csd > box.vertical > overlay > stack.background {
   border-bottom-left-radius: 14px;
 }
 
-hdyviewswitcherbar > actionbar {
+window.background.csd.unified {
+  border-top-left-radius: 14px;
+  border-top-right-radius: 14px;
+}
+
+window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio {
+  margin: 0;
+  border-radius: 0;
+}
+
+hdyviewswitcherbar > actionbar,
+viewswitcherbar > actionbar {
   background: none;
   border: none;
 }
@@ -7231,6 +7242,10 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g
   background: none;
 }
 
+.geary-settings entry {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+}
+
 window.background:not(.csd) > widget > separator {
   padding-top: 1px;
   margin-top: 1px;
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 53d7860..a0f6955 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -6174,7 +6174,18 @@ window.background.csd > box.vertical > overlay > stack.background {
   border-bottom-left-radius: 14px;
 }
 
-hdyviewswitcherbar > actionbar {
+window.background.csd.unified {
+  border-top-left-radius: 14px;
+  border-top-right-radius: 14px;
+}
+
+window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio {
+  margin: 0;
+  border-radius: 0;
+}
+
+hdyviewswitcherbar > actionbar,
+viewswitcherbar > actionbar {
   background: none;
   border: none;
 }
@@ -7250,6 +7261,10 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g
   background: none;
 }
 
+.geary-settings entry {
+  background-color: rgba(0, 0, 0, 0.05) !important;
+}
+
 window.background:not(.csd) > widget > separator {
   padding-top: 1px;
   margin-top: 1px;
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index f76e53a..d0d7d55 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -6170,7 +6170,18 @@ window.background.csd > box.vertical > overlay > stack.background {
   border-bottom-left-radius: 14px;
 }
 
-hdyviewswitcherbar > actionbar {
+window.background.csd.unified {
+  border-top-left-radius: 14px;
+  border-top-right-radius: 14px;
+}
+
+window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio {
+  margin: 0;
+  border-radius: 0;
+}
+
+hdyviewswitcherbar > actionbar,
+viewswitcherbar > actionbar {
   background: none;
   border: none;
 }
@@ -7246,6 +7257,10 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g
   background: none;
 }
 
+.geary-settings entry {
+  background-color: rgba(0, 0, 0, 0.05) !important;
+}
+
 window.background:not(.csd) > widget > separator {
   padding-top: 1px;
   margin-top: 1px;
diff --git a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css
index daa3b87..b944530 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css
@@ -14,6 +14,8 @@
 	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore,
+:root[tabsintitlebar] #titlebar #titlebar-restore,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
@@ -52,6 +54,8 @@
 	background-size: contain;
 	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-restore,
+:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark.svg") no-repeat;
@@ -72,6 +76,8 @@
 	background: url("../titlebuttons/titlebutton-minimize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:active .titlebar-restore,
+:root[tabsintitlebar] #titlebar #titlebar-restore:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox:active .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-dark.svg") no-repeat;
@@ -92,6 +98,8 @@
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox .titlebar-restore,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-buttonbox .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
@@ -112,6 +120,8 @@
 	background: url("../titlebuttons/titlebutton-minimize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-restore,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark.svg") no-repeat;
diff --git a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css
index e6be77a..7d7c277 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css
@@ -13,7 +13,6 @@
 	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
 	background-size: contain;
 }
-
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox .titlebar-max,
@@ -120,6 +119,8 @@
 	background: url("../titlebuttons/titlebutton-minimize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-restore,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop.svg") no-repeat;
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index e776f9f..f9c7868 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -1700,7 +1700,26 @@ window.background.csd {
 //
 // Gnome Clocks
 //
-hdyviewswitcherbar > actionbar {
+window.background.csd.unified {
+  border-top-left-radius: $wm_radius;
+  border-top-right-radius: $wm_radius;
+
+  > deck > deck > deck {
+    > box.vertical > headerbar.titlebar.windowhandle {
+      > viewswitchertitle > squeezer {
+        > viewswitcher > box.horizontal {
+          > button.radio {
+            margin: 0;
+            border-radius: 0;
+          }
+        }
+      }
+    }
+  }
+}
+
+hdyviewswitcherbar > actionbar,
+viewswitcherbar > actionbar { // Gnome 3.38
   background: none;
   border: none;
 }
@@ -2809,6 +2828,10 @@ window#GearyMainWindow.background.csd {
   }
 }
 
+.geary-settings {
+  entry { background-color: $entry_bg !important; }
+}
+
 //
 // * Firefox and Thunderbird *
 //