diff --git a/gtk/gtk-win32.css b/gtk/gtk-win32.css
index 7b60a6b061..fa30883a4c 100644
--- a/gtk/gtk-win32.css
+++ b/gtk/gtk-win32.css
@@ -589,10 +589,14 @@ GtkComboBox.combobox-entry .button:insensitive {
 
 .notebook {
     background-color: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(tab, 9 1);
+    border-width: 1 3 2 2;
+    border-style: solid;
+    background-origin: padding-box;
+    background-clip: border-box;
+    /*background-image: -gtk-win32-theme-part(tab, 9 1, margins(-2)); */
+    border-image: -gtk-win32-theme-part(tab, 9 1) 1 3 2 2 stretch;
     -GtkNotebook-tab-overlap: 1;
-    -GtkNotebook-tab-curvature: 1;
+    -GtkNotebook-tab-curvature: 0;
 }
 
 .notebook tab {
@@ -602,10 +606,18 @@ GtkComboBox.combobox-entry .button:insensitive {
 }
 
 .notebook tab:active {
-    background-image: -gtk-win32-theme-part(tab, 1 3);
+    background-image: -gtk-win32-theme-part(tab, 1 3, margins(0 0 -1 0));
     padding: 4;
 }
 
+.notebook tab:last-child {
+    background-image: -gtk-win32-theme-part(tab, 3 1);
+}
+
+.notebook tab:active:last-child {
+    background-image: -gtk-win32-theme-part(tab, 3 3, margins(0 0 -1 0));
+}
+
 .notebook {
     background-color: #ffffff;
 }