diff --git a/themes/luna/blue/Resources/notebook_tab_bottom_border.png b/themes/luna/blue/Resources/notebook_tab_bottom_border.png
index 6d871b4..9c6db67 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_bottom_border.png and b/themes/luna/blue/Resources/notebook_tab_bottom_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_bottom_checked_border.png b/themes/luna/blue/Resources/notebook_tab_bottom_checked_border.png
deleted file mode 100644
index 16260df..0000000
Binary files a/themes/luna/blue/Resources/notebook_tab_bottom_checked_border.png and /dev/null differ
diff --git a/themes/luna/blue/Resources/notebook_tab_bottom_hover_border.png b/themes/luna/blue/Resources/notebook_tab_bottom_hover_border.png
index e857d13..c251199 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_bottom_hover_border.png and b/themes/luna/blue/Resources/notebook_tab_bottom_hover_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_bottom_selected_border.png b/themes/luna/blue/Resources/notebook_tab_bottom_selected_border.png
new file mode 100644
index 0000000..fc2883a
Binary files /dev/null and b/themes/luna/blue/Resources/notebook_tab_bottom_selected_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_left_border.png b/themes/luna/blue/Resources/notebook_tab_left_border.png
index e6a89a2..bf72070 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_left_border.png and b/themes/luna/blue/Resources/notebook_tab_left_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_left_checked_border.png b/themes/luna/blue/Resources/notebook_tab_left_checked_border.png
deleted file mode 100644
index 22f2742..0000000
Binary files a/themes/luna/blue/Resources/notebook_tab_left_checked_border.png and /dev/null differ
diff --git a/themes/luna/blue/Resources/notebook_tab_left_hover_border.png b/themes/luna/blue/Resources/notebook_tab_left_hover_border.png
index a7f94ec..745c0c2 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_left_hover_border.png and b/themes/luna/blue/Resources/notebook_tab_left_hover_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_left_selected_border.png b/themes/luna/blue/Resources/notebook_tab_left_selected_border.png
new file mode 100644
index 0000000..e61de8b
Binary files /dev/null and b/themes/luna/blue/Resources/notebook_tab_left_selected_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_right_border.png b/themes/luna/blue/Resources/notebook_tab_right_border.png
index 7cf243c..5551a00 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_right_border.png and b/themes/luna/blue/Resources/notebook_tab_right_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_right_checked_border.png b/themes/luna/blue/Resources/notebook_tab_right_checked_border.png
deleted file mode 100644
index 9bdd9a8..0000000
Binary files a/themes/luna/blue/Resources/notebook_tab_right_checked_border.png and /dev/null differ
diff --git a/themes/luna/blue/Resources/notebook_tab_right_hover_border.png b/themes/luna/blue/Resources/notebook_tab_right_hover_border.png
index 7c545e3..49a41cf 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_right_hover_border.png and b/themes/luna/blue/Resources/notebook_tab_right_hover_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_right_selected_border.png b/themes/luna/blue/Resources/notebook_tab_right_selected_border.png
new file mode 100644
index 0000000..62c24ab
Binary files /dev/null and b/themes/luna/blue/Resources/notebook_tab_right_selected_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_top_border.png b/themes/luna/blue/Resources/notebook_tab_top_border.png
index 1f74c60..7d72ec1 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_top_border.png and b/themes/luna/blue/Resources/notebook_tab_top_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_top_checked_border.png b/themes/luna/blue/Resources/notebook_tab_top_checked_border.png
deleted file mode 100644
index 98ebc34..0000000
Binary files a/themes/luna/blue/Resources/notebook_tab_top_checked_border.png and /dev/null differ
diff --git a/themes/luna/blue/Resources/notebook_tab_top_hover_border.png b/themes/luna/blue/Resources/notebook_tab_top_hover_border.png
index ab35295..6e74273 100644
Binary files a/themes/luna/blue/Resources/notebook_tab_top_hover_border.png and b/themes/luna/blue/Resources/notebook_tab_top_hover_border.png differ
diff --git a/themes/luna/blue/Resources/notebook_tab_top_selected_border.png b/themes/luna/blue/Resources/notebook_tab_top_selected_border.png
new file mode 100644
index 0000000..994292c
Binary files /dev/null and b/themes/luna/blue/Resources/notebook_tab_top_selected_border.png differ
diff --git a/themes/luna/blue/gtk-3.0/styling/notebook.scss b/themes/luna/blue/gtk-3.0/styling/notebook.scss
index 2ae573c..fb37e8e 100644
--- a/themes/luna/blue/gtk-3.0/styling/notebook.scss
+++ b/themes/luna/blue/gtk-3.0/styling/notebook.scss
@@ -66,6 +66,19 @@ $notebook_header_top_styles:
 //
 // NOTEBOOK TAB
 //
+$notebook_tab_styles:
+    wintc_define_props_borders(
+        $notebook_tab_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );
+
 $notebook_tab_selected_styles:
     wintc_define_props_bg(
         $notebook_tab_selected_styles,
@@ -92,13 +105,23 @@ $notebook_tab_bottom_styles:
         $notebook_tab_bottom_styles,
         false,
         solid,
-        0,
+        1,
+        3,
         3,
-        5,
         3,
         undefined,
         default
     );
+$notebook_tab_bottom_styles:
+    wintc_define_props_box(
+        $notebook_tab_bottom_styles,
+        false,
+        margin,
+        -1,
+        undefined,
+        default,
+        undefined
+    );
 $notebook_tab_bottom_hover_styles:
     wintc_define_props_borders(
         $notebook_tab_bottom_hover_styles,
@@ -128,9 +151,19 @@ $notebook_tab_left_styles:
         false,
         solid,
         3,
-        0,
+        1,
         3,
-        5,
+        3,
+        undefined,
+        default
+    );
+$notebook_tab_left_styles:
+    wintc_define_props_box(
+        $notebook_tab_left_styles,
+        false,
+        margin,
+        undefined,
+        -1,
         undefined,
         default
     );
@@ -163,12 +196,22 @@ $notebook_tab_right_styles:
         false,
         solid,
         3,
-        5,
         3,
-        0,
+        3,
+        1,
         undefined,
         default
     );
+$notebook_tab_right_styles:
+    wintc_define_props_box(
+        $notebook_tab_right_styles,
+        false,
+        margin,
+        undefined,
+        default,
+        undefined,
+        -1
+    );
 $notebook_tab_right_hover_styles:
     wintc_define_props_borders(
         $notebook_tab_right_hover_styles,
@@ -197,13 +240,23 @@ $notebook_tab_top_styles:
         $notebook_tab_top_styles,
         false,
         solid,
-        5,
         3,
-        0,
+        3,
+        1,
         3,
         undefined,
         default
     );
+$notebook_tab_top_styles:
+    wintc_define_props_box(
+        $notebook_tab_top_styles,
+        false,
+        margin,
+        default,
+        undefined,
+        -1,
+        undefined
+    );
 $notebook_tab_top_hover_styles:
     wintc_define_props_borders(
         $notebook_tab_top_hover_styles,