diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index aac6ff565a..44df0679a3 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -273,16 +273,9 @@
     }
   }
 
-  // headerbar buttons
-  .header-bar & {
-    &.text-button {
-      padding: 6px 8px 5px; // due to font metrics the image buttons
-                            // are 1px shorter
-    }
-    &.image-button {
-      padding: 8px;
-    }
-  }
+  // buttons in header bars and action bars
+  &.image-button { padding: 8px; }
+  &.text-button { padding: 6px 8px 5px; } // due to font metrics
 
   //inline-toolbar buttons
   .inline-toolbar &, .inline-toolbar &:backdrop {
@@ -562,10 +555,6 @@ GtkComboBox {
   }
 }
 
-.action-bar {
-  padding: 4px;
-}
-
 /***************
  * Header bars *
  ***************/
@@ -1549,8 +1538,12 @@ GtkLevelBar.vertical {
  **********/
 .frame {
   border: 1px solid $borders_color;
-  padding: 0;
   &:backdrop { border-color: $backdrop_borders_color; }
+  padding: 0;
+  &.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0;
+  }
 }
 
 GtkScrolledWindow {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 53ca6c43e9..cef7567d21 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -408,10 +408,10 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-  .header-bar .button.text-button {
-    padding: 6px 8px 5px; }
-  .header-bar .button.image-button {
+  .button.image-button {
     padding: 8px; }
+  .button.text-button {
+    padding: 6px 8px 5px; }
   .inline-toolbar .button, .inline-toolbar .button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
@@ -672,9 +672,6 @@ GtkComboBox {
     background-color: #2f3434;
     box-shadow: none; }
 
-.action-bar {
-  padding: 4px; }
-
 /***************
  * Header bars *
  ***************/
@@ -2124,6 +2121,9 @@ GtkLevelBar.vertical {
   padding: 0; }
   .frame:backdrop {
     border-color: #1e2222; }
+  .frame.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0; }
 
 GtkScrolledWindow .frame {
   border-radius: 2px; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 19ad7caca3..bd7821f5ab 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -408,10 +408,10 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-  .header-bar .button.text-button {
-    padding: 6px 8px 5px; }
-  .header-bar .button.image-button {
+  .button.image-button {
     padding: 8px; }
+  .button.text-button {
+    padding: 6px 8px 5px; }
   .inline-toolbar .button, .inline-toolbar .button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
@@ -672,9 +672,6 @@ GtkComboBox {
     background-color: #d4d4d4;
     box-shadow: none; }
 
-.action-bar {
-  padding: 4px; }
-
 /***************
  * Header bars *
  ***************/
@@ -2122,6 +2119,9 @@ GtkLevelBar.vertical {
   padding: 0; }
   .frame:backdrop {
     border-color: #a8a8a8; }
+  .frame.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0; }
 
 GtkScrolledWindow .frame {
   border-radius: 2px; }