diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css
index cdbe3e98..c421aed9 100644
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@@ -7,6 +7,10 @@
 	-moz-window-dragging: drag;
 }
 
+#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]):not([orient="vertical"]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {
+	margin-inline-start: 6px !important;
+}
+
 tab > stack {
 	margin: 0 3px !important;
 }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 82e504d0..e63ee4f0 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1889,15 +1889,6 @@ searchbar {
   > revealer > box {
     padding: $container_padding;
     border-spacing: $container_padding;
-
-    entry, button { margin: 0; }
-
-   .close {
-      min-width: 18px;
-      min-height: 18px;
-      padding: 4px;
-      border-radius: 50%;
-    }
   }
 
   &:not(.inline) > revealer > box {
@@ -1910,8 +1901,11 @@ searchbar {
   }
 
   // Close button on searchbar
-  button.flat {
-    @extend %circular_button;
+  button.flat, .close {
+    min-width: 18px;
+    min-height: 18px;
+    padding: 4px;
+    border-radius: 50%;
   }
 
   .top-bar &:not(.inline) > revealer > box,
@@ -1928,11 +1922,34 @@ actionbar > revealer > box {
   box-shadow: none;
   color: $text_color;
 
-  entry, button { margin: 0; }
-
   &, > box.start, > box.end {
     border-spacing: $container_padding;
   }
+
+  &:backdrop {
+    background-color: $bg_color;
+
+    > * {
+      filter: opacity(.5);
+    }
+  }
+}
+
+%actionbar-inline > revealer > box {
+  background-color: transparent;
+  color: inherit;
+  box-shadow: none;
+  padding-top: $container_padding;
+
+  &:backdrop {
+    background-color: transparent;
+    transition: none;
+
+    > * {
+      filter: none;
+      transition: none;
+    }
+  }
 }
 
 //
@@ -2037,11 +2054,11 @@ actionbar > revealer > box {
 headerbar {
   min-height: $headerbar_size;
   padding: 0;
+  margin: 0;
   color: $header_fg;
   background-color: $header_bg;
   border-bottom: 1px solid $header_border;
   box-shadow: none;
-  margin: 0;
 
   &:backdrop {
     opacity: 1;
@@ -2058,16 +2075,6 @@ headerbar {
       background: none;
     }
 
-    > windowhandle > box {
-      padding: 0 8px;
-  
-      &,
-      > box.start,
-      > box.end {
-        border-spacing: $container_padding;
-      }
-    }
-
     windowcontrols {
       padding: 0 $container_padding / 2;
     }
@@ -2085,7 +2092,7 @@ headerbar {
   }
 
   > windowhandle > box {
-    padding: 0 8px;
+    padding: 8px;
 
     &,
     > box.start,
@@ -2096,6 +2103,7 @@ headerbar {
 
   entry {
     @extend %headerbar_entrys;
+    border-spacing: 4px;
   }
 
   button {
@@ -2108,33 +2116,6 @@ headerbar {
     }
   }
 
-  entry,
-  spinbutton,
-  button,
-  menubutton,
-  splitbutton,
-  stackswitcher,
-  separator:not(.sidebar) {
-    margin-top: 8px;
-    margin-bottom: 8px;
-  }
-
-  menubutton > button,
-  spinbutton > button,
-  splitbutton > button,
-  splitbutton > menubutton,
-  entry > menubutton,
-  popover entry,
-  popover spinbutton,
-  popover button,
-  popover menubutton,
-  popover splitbutton,
-  popover stackswitcher,
-  popover separator:not(.sidebar) {
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-
   // Reset linked buttons
   .linked.raised > & {
     // min-width: 16px;
@@ -2146,7 +2127,6 @@ headerbar {
   }
 
   stackswitcher.linked:not(.vertical) > button {
-    // min-height: $menuitem_size - 8px;
     min-width: $menuitem_size - 4px;
     border-radius: $bt_radius;
   }
@@ -2154,18 +2134,14 @@ headerbar {
   // Reset linking entrys
   .linked:not(.vertical) > entry {
     @include entry(header-normal);
-    // margin: 8px ($container_padding / 2 + 1px);
     padding: 0 $container_padding * 2;
-    // border-radius: $bt_radius;
     border: none;
 
     &:focus {
-      // border-radius: $bt_radius;
       @include entry(header-focus);
     }
 
     &:disabled {
-      // border-radius: $bt_radius;
       @include entry(header-insensitive);
     }
 
@@ -2178,8 +2154,6 @@ headerbar {
     padding: 0;
 
     > button {
-      // min-height: $menuitem_size - 8px;
-      margin: 0;
       font-weight: 500;
 
       &:not(:first-child) {
@@ -2302,7 +2276,7 @@ headerbar {
 
   // Titlebuttons
   windowcontrols {
-    border-spacing: 6px;
+    border-spacing: $container_padding;
     padding: 0 10px;
   
     &:not(.empty) {
@@ -2332,7 +2306,6 @@ headerbar {
       &.close, &.maximize, &.minimize {
         min-width: 16px;
         min-height: 16px;
-        margin: 8px 0;
         padding: ($menuitem_size - 20px) / 2 0;
         background-position: center;
         background-repeat: no-repeat;
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 99dca378..6c27ce25 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -84,8 +84,6 @@ $flap_sidebar_size: 240px;
     }
   }
 
-  headerbar > windowhandle > box { padding: 0 10px; }
-
   flap.unfolded,
   .sidebar-pane {
     &, &:backdrop {
@@ -211,9 +209,8 @@ $flap_sidebar_size: 240px;
 }
 
 #NautilusQueryEditor { // search entry
-  padding: 0 $container_padding;
+  padding: 2px $container_padding;
   border-spacing: 0;
-  margin: 9px 0 8px 0;
 
   > image, > box, > text {
     margin: 0;
@@ -239,7 +236,7 @@ $flap_sidebar_size: 240px;
 #NautilusPathBar {
   background-color: $fill_color;
   border-radius: $bt_radius;
-  margin: 8px 0 8px $container_padding;
+  margin: 0 0 0 $container_padding;
 
   #NautilusPathButton {
     margin: 0 $container_padding / 2;
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 0edc3a6a..8f8f808b 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -239,10 +239,6 @@ viewswitcher {
 
   &.wide {
     border-spacing: 0;
-
-    > button.toggle {
-      margin: 8px 0;
-    }
   }
 
   &.narrow > button.toggle {
@@ -361,7 +357,6 @@ headerbar > windowhandle > box viewswitcher {
     box-shadow: inset 0 0 0 1px $light_borders_color;
     border-radius: $bt_radius;
     padding: 0;
-    margin: 8px 0;
   
     > button.toggle {
       margin: 0;
@@ -855,6 +850,112 @@ dialog-host > dialog.osd:not(progressbar):not(button):not(menubutton):not(splitb
   }
 }
 
+//
+// AdwToolbarView
+//
+toolbarview {
+  > .top-bar,
+  > .bottom-bar {
+    searchbar,
+    actionbar {
+      > revealer > box {
+        background-color: transparent;
+        border: none;
+        box-shadow: none;
+      }
+    }
+
+    .toolbar  {
+      background-color: transparent;
+    }
+
+    .collapse-spacing {
+      padding-top: 0;
+      padding-bottom: 0;
+
+      headerbar {
+        min-height: $headerbar_size;
+
+        > windowhandle > box {
+          padding-top: 8px;
+          padding-bottom: 8px;
+        }
+
+        &.default-decoration {
+          min-height: $medium_size;
+
+          > windowhandle > box {
+            padding-top: 0;
+            padding-bottom: 0;
+          }
+        }
+      }
+
+      searchbar,
+      actionbar {
+        > revealer > box {
+          padding-top: $container_padding;
+          padding-bottom: $container_padding;
+        }
+      }
+
+      .toolbar  {
+        padding-top: $container_padding;
+        padding-bottom: $container_padding;
+      }
+
+      tabbar {
+        padding-top: 0;
+        padding-bottom: 0;
+      }
+    }
+
+    &.raised {
+      background-color: transparent;
+      color: $header_fg;
+
+      &:backdrop {
+        background-color: transparent;
+      }
+    }
+
+    &:backdrop > windowhandle {
+      filter: none;
+    }
+  }
+
+  > .bottom-bar {
+    padding: 0;
+    border-spacing: 0;
+    box-shadow: inset 0 1px $borders_color;
+    background-color: darken($bg_color, 3%);
+    color: $text_color;
+
+    &:backdrop {
+      background-color: $bg_color;
+      color: $disabled_fg_color;
+    }
+
+    actionbar { @extend %actionbar-inline; }
+  }
+
+  > .top-bar.raised {
+    box-shadow: none;
+
+    &.border {
+      box-shadow: none;
+    }
+  }
+
+  > .bottom-bar.raised {
+    box-shadow: none;
+
+    &.border {
+      box-shadow: none;
+    }
+  }
+}
+
 // ThemeSelector
 themeselector, // Gnome text editor
 panelthemeselector { // Gnome builder