diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css
index 93a403d..4cb778b 100644
--- a/gtk-3.0/apps/granite-widgets.css
+++ b/gtk-3.0/apps/granite-widgets.css
@@ -23,6 +23,7 @@
 
 .dynamic-notebook .notebook tab {
     padding: 3px;
+    border-width: 0 1px;
     border-color: shade(@theme_bg_color, 0.85);
     border-radius: 0;
     background-color: shade(@theme_bg_color, 0.9);
@@ -31,16 +32,14 @@
 }
 
 .dynamic-notebook .notebook tab:nth-child(first) {
-    border-width: 0 1px 0 1px;
 }
 
 .dynamic-notebook .notebook tab:active {
-    border-width: 1px;
     border-color: shade(@theme_bg_color, 0.8);
-    border-top-color: @theme_selected_bg_color;
-    background-color: shade(@theme_bg_color, 1.08);
+    background-color: shade(@theme_base_color, 0.85);
     background-image: none;
     color: @theme_fg_color;
+    box-shadow:inset 0 -2px @theme_selected_bg_color;
 }
 
 .dynamic-notebook .notebook tab .entry {
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index dc47396..9c407d6 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -964,7 +964,7 @@ GtkModelMenuItem GtkBox GtkImage {
 
 .notebook.header {
     border-width: 0;
-    background-color: shade(@theme_base_color, 0.95);
+    background-color: shade(@theme_base_color, 0.85);
 }
 
 .notebook.header.frame {
@@ -995,56 +995,50 @@ GtkModelMenuItem GtkBox GtkImage {
 
 .notebook tab {
     padding: 4px;
-    border-color: shade(@theme_base_color, 0.75);
-    border-radius: 0;
+    border-style: none;
     background-color: shade(@theme_base_color, 0.85);
     background-image: none;
 }
 
 .notebook tab:active {
-    border-color: shade(@theme_base_color, 0.7);
-    background-color: @theme_base_color;
+    background-color: shade(@theme_base_color, 0.85);
     background-image: none;
 }
 
 .notebook tab.top {
-    border-width: 1px 1px 0 1px;
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
 }
 
 .notebook tab.top:active {
-    border-top-color: @theme_selected_bg_color;
+    box-shadow:inset 0 -2px @theme_selected_bg_color;
 }
 
 .notebook tab.right {
-    border-width: 1px 1px 1px 0;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
 }
 
 .notebook tab.right:active {
-    border-right-color: @theme_selected_bg_color;
+    box-shadow:inset 2px 0 @theme_selected_bg_color;
 }
 
 .notebook tab.bottom {
-    border-width: 0 1px 1px 1px;
     border-top-right-radius: 0;
     border-top-left-radius: 0;
 }
 
 .notebook tab.bottom:active {
-    border-bottom-color: @theme_selected_bg_color;
+    box-shadow:inset 0 2px @theme_selected_bg_color;
 }
 
 .notebook tab.left {
-    border-width: 1px 0 1px 1px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }
 
 .notebook tab.left:active {
-    border-left-color: @theme_selected_bg_color;
+    box-shadow:inset -2px 0 @theme_selected_bg_color;
 }
 
 .notebook tab GtkLabel {