diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index fcdd50f..d0fe334 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -3124,9 +3124,24 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:
     .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover {
       color: #a9caf1; }
 
-.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked,
+terminal-window notebook > header.top > tabs > tab:checked {
   box-shadow: inset 0 -1px #2b2e39; }
 
+terminal-window scrollbar.vertical slider {
+  margin-left: 3px; }
+
+terminal-window scrollbar trough {
+  border-width: 0; }
+
+terminal-window notebook > header.top {
+  padding-top: 3px;
+  box-shadow: inset 0 1px #262a33, inset 0 -1px #2b2e39; }
+  terminal-window notebook > header.top button {
+    padding: 0;
+    min-width: 24px;
+    min-height: 24px; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index d60fd80..91bca7d 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -3123,9 +3123,24 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:
     .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover {
       color: #a9caf1; }
 
-.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked,
+terminal-window notebook > header.top > tabs > tab:checked {
   box-shadow: inset 0 -1px #dcdfe3; }
 
+terminal-window scrollbar.vertical slider {
+  margin-left: 3px; }
+
+terminal-window scrollbar trough {
+  border-width: 0; }
+
+terminal-window notebook > header.top {
+  padding-top: 3px;
+  box-shadow: inset 0 1px #262a33, inset 0 -1px #dcdfe3; }
+  terminal-window notebook > header.top button {
+    padding: 0;
+    min-width: 24px;
+    min-height: 24px; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index e6e020f..690501a 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -3124,9 +3124,24 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:
     .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover {
       color: #a9caf1; }
 
-.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked,
+terminal-window notebook > header.top > tabs > tab:checked {
   box-shadow: inset 0 -1px #2b2e39; }
 
+terminal-window scrollbar.vertical slider {
+  margin-left: 3px; }
+
+terminal-window scrollbar trough {
+  border-width: 0; }
+
+terminal-window notebook > header.top {
+  padding-top: 3px;
+  box-shadow: inset 0 1px #262a33, inset 0 -1px #2b2e39; }
+  terminal-window notebook > header.top button {
+    padding: 0;
+    min-width: 24px;
+    min-height: 24px; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index ea16217..641437b 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -3123,9 +3123,24 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:
     .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover {
       color: #a9caf1; }
 
-.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked,
+terminal-window notebook > header.top > tabs > tab:checked {
   box-shadow: inset 0 -1px #dcdfe3; }
 
+terminal-window scrollbar.vertical slider {
+  margin-left: 3px; }
+
+terminal-window scrollbar trough {
+  border-width: 0; }
+
+terminal-window notebook > header.top {
+  padding-top: 3px;
+  box-shadow: inset 0 1px #262a33, inset 0 -1px #dcdfe3; }
+  terminal-window notebook > header.top button {
+    padding: 0;
+    min-width: 24px;
+    min-height: 24px; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index d6c9d4d..ba5d78f 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -3127,9 +3127,24 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:
     .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover {
       color: #a9caf1; }
 
-.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked,
+terminal-window notebook > header.top > tabs > tab:checked {
   box-shadow: inset 0 -1px #dcdfe3; }
 
+terminal-window scrollbar.vertical slider {
+  margin-left: 3px; }
+
+terminal-window scrollbar trough {
+  border-width: 0; }
+
+terminal-window notebook > header.top {
+  padding-top: 3px;
+  box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; }
+  terminal-window notebook > header.top button {
+    padding: 0;
+    min-width: 24px;
+    min-height: 24px; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index f9334fb..8999203 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -3127,9 +3127,24 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:
     .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover {
       color: #a9caf1; }
 
-.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked,
+terminal-window notebook > header.top > tabs > tab:checked {
   box-shadow: inset 0 -1px #dcdfe3; }
 
+terminal-window scrollbar.vertical slider {
+  margin-left: 3px; }
+
+terminal-window scrollbar trough {
+  border-width: 0; }
+
+terminal-window notebook > header.top {
+  padding-top: 3px;
+  box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; }
+  terminal-window notebook > header.top button {
+    padding: 0;
+    min-width: 24px;
+    min-height: 24px; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 543d4a6..75db7a2 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -1,62 +1,37 @@
 //
 // Tab overrides
 //
-.gedit-bottom-panel-paned notebook {
-//ScratchMainWindow .notebook,
-//EphyNotebook.notebook,
-//MidoriNotebook .notebook,
-//TerminalWindow .notebook,
-//PantheonTerminalPantheonTerminalWindow .notebook {
+.gedit-bottom-panel-paned notebook,
+terminal-window notebook {
   > header.top > tabs > tab:checked { box-shadow: inset 0 -1px $borders_color; }
 }
 
-//TerminalWindow .notebook,
-//PantheonTerminalPantheonTerminalWindow .notebook {
-
-//  &.header.top {
-//    box-shadow: inset 0  1px opacify($header_border, 1),
-//                inset 0 -1px $borders_color;
-//
-//    tab {
-//      padding-top: 7px;
-//      border-top-width: 3px;
-//    }
-//  }
-//}
-
 //
 // GNOME Terminal
 //
-//TerminalWindow {
-//  .background {
-//    background-color: transparent;
-//  }
-//
-//  scrollbar {
-//    &.vertical slider { margin-left: 3px; }
-//
-//    trough { border-width: 0; }
-//  }
-//
-//  .notebook {
-//    tab button {
-//      color: mix($bg_color, $fg_color, 35%);
-//
-//      &:hover {
-//        color: $fg_color;
-//        border-color: $button_border;
-//        background-color: $button_bg;
-//      }
-//    }
-//    tab:active, tab:hover {
-//      button {
-//        @extend %undecorated_button;
-//        &:hover { color: lighten(red, 15%); @extend %undecorated_button;}
-//        &:active { color: $selected_bg_color; @extend %undecorated_button;}
-//      }
-//    }
-//  }
-//}
+terminal-window {
+
+  scrollbar {
+    &.vertical slider { margin-left: 3px; }
+
+    trough { border-width: 0; }
+  }
+
+  notebook {
+    > header.top {
+      padding-top: 3px;
+
+      box-shadow: inset 0  1px opacify($header_border, 1),
+                  inset 0 -1px $borders_color;
+
+      button {
+        padding: 0;
+        min-width: 24px;
+        min-height: 24px;
+      }
+    }
+  }
+}
 
 //
 // Nautilus