diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a17a9b51ea..07fa131c8e 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1928,12 +1928,15 @@ notebook {
     }
 
     tab {
-      font-weight: bold;
-      min-height: 36px;
-      min-width: 36px;
-      padding-left: 12px;
-      padding-right: 12px;
+      min-height: 30px;
+      min-width: 30px;
+      padding: 3px 12px;
+
+      outline-offset: -5px;
+
       color: $insensitive_fg_color;
+      font-weight: bold;
+
       border-width: 1px;         // for reorderable tabs
       border-color: transparent; //
 
@@ -1981,8 +1984,8 @@ notebook {
         &, &:backdrop { color: gtkalpha(currentColor, 0.3); }
 
         padding: 0;
-        margin-top: 7px;
-        margin-bottom: 7px;
+        margin-top: 4px;
+        margin-bottom: 4px;
         // FIXME: generalize .small-button?
         min-width: 20px;
         min-height: 20px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 569b114b95..dcb0e7f63f 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2235,12 +2235,12 @@ notebook > header {
       background-color: transparent;
       border-color: transparent; }
   notebook > header tab {
-    font-weight: bold;
-    min-height: 36px;
-    min-width: 36px;
-    padding-left: 12px;
-    padding-right: 12px;
+    min-height: 30px;
+    min-width: 30px;
+    padding: 3px 12px;
+    outline-offset: -5px;
     color: #949796;
+    font-weight: bold;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
@@ -2269,8 +2269,8 @@ notebook > header {
     notebook > header tab .titlebar button.titlebutton,
     .titlebar notebook > header tab button.titlebutton {
       padding: 0;
-      margin-top: 7px;
-      margin-bottom: 7px;
+      margin-top: 4px;
+      margin-bottom: 4px;
       min-width: 20px;
       min-height: 20px; }
       notebook > header tab button.flat:hover, notebook > header tab notebook > header > tabs > arrow:hover, notebook > header tab button.sidebar-button:hover, notebook > header tab headerbar button.titlebutton:hover, headerbar notebook > header tab button.titlebutton:hover,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a826da1389..cc9736268c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2245,12 +2245,12 @@ notebook > header {
       background-color: transparent;
       border-color: transparent; }
   notebook > header tab {
-    font-weight: bold;
-    min-height: 36px;
-    min-width: 36px;
-    padding-left: 12px;
-    padding-right: 12px;
+    min-height: 30px;
+    min-width: 30px;
+    padding: 3px 12px;
+    outline-offset: -5px;
     color: #8b8e8f;
+    font-weight: bold;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
@@ -2279,8 +2279,8 @@ notebook > header {
     notebook > header tab .titlebar button.titlebutton,
     .titlebar notebook > header tab button.titlebutton {
       padding: 0;
-      margin-top: 7px;
-      margin-bottom: 7px;
+      margin-top: 4px;
+      margin-bottom: 4px;
       min-width: 20px;
       min-height: 20px; }
       notebook > header tab button.flat:hover, notebook > header tab notebook > header > tabs > arrow:hover, notebook > header tab button.sidebar-button:hover, notebook > header tab headerbar button.titlebutton:hover, headerbar notebook > header tab button.titlebutton:hover,