diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index e1958462..8fb00b30 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1780,13 +1780,9 @@ combobox {
 // Toolbars
 //
 
-%toolbar {
-  padding: $container_padding / 2 $container_padding;
-  border-spacing: $container_padding;
-}
-
 .toolbar {
-  @extend %toolbar;
+  padding: $container_padding;
+  border-spacing: $container_padding;
   background-color: $bg_color;
   color: $text_color;
 
@@ -1796,8 +1792,7 @@ combobox {
   &.vertical separator { margin: $container_padding 0; }
 
   // oldstyle toolbar buttons
-  button {
-    margin: 1px;
+  > button {
     @extend %flat_button;
   }
 
@@ -1830,7 +1825,6 @@ searchbar {
   > revealer > box {
     padding: $container_padding;
     border-spacing: $container_padding;
-    @extend %toolbar;
 
     entry, button { margin: 0; }
 
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 29f8f246..0d5da75b 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -517,7 +517,7 @@ toolbarview.undershoot-bottom scrolledwindow {
     padding: $container_padding $container_padding * 2;
   }
 
-  .navigation-sidebar:not(.view) {
+  list.navigation-sidebar:not(.view) {
     padding: $container_padding * 2;
 
     > row {