diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index b109595..65a3724 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -938,12 +938,12 @@ paned.titlebar separator {
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
   border-radius: 0; }
 
-paned.titlebar > headerbar:first-child {
-  border-top-right-radius: 0; }
-
-paned.titlebar > headerbar:last-child {
+paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
+paned.titlebar > headerbar:first-child:dir(ltr) {
+  border-top-right-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2773,6 +2773,9 @@ modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:select
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
 
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+  box-shadow: inset 0 -1px #2b2e39; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
@@ -2857,34 +2860,31 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: rgba(255, 255, 255, 0.9); }
 
 .gedit-document-panel row button {
+  min-width: 22px;
+  min-height: 22px;
+  padding: 0;
   color: transparent;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
-  box-shadow: none;
-  padding: 4px; }
+  box-shadow: none; }
   .gedit-document-panel row button image {
     color: inherit; }
 
-.gedit-document-panel .prelight-row button {
+.gedit-document-panel row:hover:not(:selected) button {
   color: #9da3ad; }
+  .gedit-document-panel row:hover:not(:selected) button:hover {
+    color: #ff4d4d; }
+  .gedit-document-panel row:hover:not(:selected) button:active {
+    color: #D3DAE3; }
 
-.gedit-document-panel row button:hover,
-.gedit-document-panel .prelight-row button:hover {
-  color: #ff4d4d; }
-
-.gedit-document-panel .prelight-row:selected button:hover {
+.gedit-document-panel row:hover:selected button:hover {
   color: #ff6666;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
   box-shadow: none; }
-  .gedit-document-panel .prelight-row:selected button:hover:active {
+  .gedit-document-panel row:hover:selected button:hover:active {
     color: #ffffff; }
 
-.gedit-document-panel .prelight-row button:active {
-  color: #D3DAE3; }
-
 .gedit-document-panel-dragged-row {
   border: 1px solid #2b2e39;
   background-color: #22242d;
@@ -3453,29 +3453,20 @@ GtkListBox .h4 {
   .maximized .gedit-document-panel {
     background-color: #353945; }
   .gedit-document-panel row {
-    color: #BAC3CF; }
-  .gedit-document-panel row {
-    background-color: rgba(186, 195, 207, 0);
-    border: solid rgba(186, 195, 207, 0);
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel row:hover {
-    border: solid rgba(186, 195, 207, 0.15);
-    border-width: 3px 2px 3px 2px;
-    background-color: rgba(186, 195, 207, 0.15); }
-  .gedit-document-panel row:active {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-    .gedit-document-panel row:active button {
-      color: #ffffff; }
-  .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel .prelight-row button:active {
-    color: #BAC3CF; }
+    color: #BAC3CF;
+    background-color: rgba(186, 195, 207, 0); }
+    .gedit-document-panel row:hover {
+      background-color: rgba(186, 195, 207, 0.15); }
+    .gedit-document-panel row:active {
+      color: #ffffff;
+      background-color: #5294E2; }
+      .gedit-document-panel row:active button {
+        color: #ffffff; }
+    .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
+      color: #ffffff;
+      background-color: #5294E2; }
+    .gedit-document-panel row:hover:not(:selected) button:active {
+      color: #BAC3CF; }
 
 .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
   background-color: #e7eaee;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index ea834e4..07bb4e6 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -937,12 +937,12 @@ paned.titlebar separator {
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
   border-radius: 0; }
 
-paned.titlebar > headerbar:first-child {
-  border-top-right-radius: 0; }
-
-paned.titlebar > headerbar:last-child {
+paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
+paned.titlebar > headerbar:first-child:dir(ltr) {
+  border-top-right-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2772,6 +2772,9 @@ modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:select
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
 
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
@@ -2856,34 +2859,31 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: rgba(255, 255, 255, 0.9); }
 
 .gedit-document-panel row button {
+  min-width: 22px;
+  min-height: 22px;
+  padding: 0;
   color: transparent;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
-  box-shadow: none;
-  padding: 4px; }
+  box-shadow: none; }
   .gedit-document-panel row button image {
     color: inherit; }
 
-.gedit-document-panel .prelight-row button {
+.gedit-document-panel row:hover:not(:selected) button {
   color: #92959d; }
+  .gedit-document-panel row:hover:not(:selected) button:hover {
+    color: #ff4d4d; }
+  .gedit-document-panel row:hover:not(:selected) button:active {
+    color: #5c616c; }
 
-.gedit-document-panel row button:hover,
-.gedit-document-panel .prelight-row button:hover {
-  color: #ff4d4d; }
-
-.gedit-document-panel .prelight-row:selected button:hover {
+.gedit-document-panel row:hover:selected button:hover {
   color: #ff6666;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
   box-shadow: none; }
-  .gedit-document-panel .prelight-row:selected button:hover:active {
+  .gedit-document-panel row:hover:selected button:hover:active {
     color: #ffffff; }
 
-.gedit-document-panel .prelight-row button:active {
-  color: #5c616c; }
-
 .gedit-document-panel-dragged-row {
   border: 1px solid #dcdfe3;
   background-color: #d9dde0;
@@ -3452,29 +3452,20 @@ GtkListBox .h4 {
   .maximized .gedit-document-panel {
     background-color: #353945; }
   .gedit-document-panel row {
-    color: #BAC3CF; }
-  .gedit-document-panel row {
-    background-color: rgba(186, 195, 207, 0);
-    border: solid rgba(186, 195, 207, 0);
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel row:hover {
-    border: solid rgba(186, 195, 207, 0.15);
-    border-width: 3px 2px 3px 2px;
-    background-color: rgba(186, 195, 207, 0.15); }
-  .gedit-document-panel row:active {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-    .gedit-document-panel row:active button {
-      color: #ffffff; }
-  .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel .prelight-row button:active {
-    color: #BAC3CF; }
+    color: #BAC3CF;
+    background-color: rgba(186, 195, 207, 0); }
+    .gedit-document-panel row:hover {
+      background-color: rgba(186, 195, 207, 0.15); }
+    .gedit-document-panel row:active {
+      color: #ffffff;
+      background-color: #5294E2; }
+      .gedit-document-panel row:active button {
+        color: #ffffff; }
+    .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
+      color: #ffffff;
+      background-color: #5294E2; }
+    .gedit-document-panel row:hover:not(:selected) button:active {
+      color: #BAC3CF; }
 
 .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
   background-color: #e7eaee;
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 07b744a..0b4c22c 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -938,12 +938,12 @@ paned.titlebar separator {
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
   border-radius: 0; }
 
-paned.titlebar > headerbar:first-child {
-  border-top-right-radius: 0; }
-
-paned.titlebar > headerbar:last-child {
+paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
+paned.titlebar > headerbar:first-child:dir(ltr) {
+  border-top-right-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2773,6 +2773,9 @@ modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:select
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
 
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+  box-shadow: inset 0 -1px #2b2e39; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
@@ -2857,34 +2860,31 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: rgba(255, 255, 255, 0.9); }
 
 .gedit-document-panel row button {
+  min-width: 22px;
+  min-height: 22px;
+  padding: 0;
   color: transparent;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
-  box-shadow: none;
-  padding: 4px; }
+  box-shadow: none; }
   .gedit-document-panel row button image {
     color: inherit; }
 
-.gedit-document-panel .prelight-row button {
+.gedit-document-panel row:hover:not(:selected) button {
   color: #9da3ad; }
+  .gedit-document-panel row:hover:not(:selected) button:hover {
+    color: #ff4d4d; }
+  .gedit-document-panel row:hover:not(:selected) button:active {
+    color: #D3DAE3; }
 
-.gedit-document-panel row button:hover,
-.gedit-document-panel .prelight-row button:hover {
-  color: #ff4d4d; }
-
-.gedit-document-panel .prelight-row:selected button:hover {
+.gedit-document-panel row:hover:selected button:hover {
   color: #ff6666;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
   box-shadow: none; }
-  .gedit-document-panel .prelight-row:selected button:hover:active {
+  .gedit-document-panel row:hover:selected button:hover:active {
     color: #ffffff; }
 
-.gedit-document-panel .prelight-row button:active {
-  color: #D3DAE3; }
-
 .gedit-document-panel-dragged-row {
   border: 1px solid #2b2e39;
   background-color: #22242d;
@@ -3453,29 +3453,20 @@ GtkListBox .h4 {
   .maximized .gedit-document-panel {
     background-color: #353945; }
   .gedit-document-panel row {
-    color: #BAC3CF; }
-  .gedit-document-panel row {
-    background-color: rgba(186, 195, 207, 0);
-    border: solid rgba(186, 195, 207, 0);
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel row:hover {
-    border: solid rgba(186, 195, 207, 0.15);
-    border-width: 3px 2px 3px 2px;
-    background-color: rgba(186, 195, 207, 0.15); }
-  .gedit-document-panel row:active {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-    .gedit-document-panel row:active button {
-      color: #ffffff; }
-  .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel .prelight-row button:active {
-    color: #BAC3CF; }
+    color: #BAC3CF;
+    background-color: rgba(186, 195, 207, 0); }
+    .gedit-document-panel row:hover {
+      background-color: rgba(186, 195, 207, 0.15); }
+    .gedit-document-panel row:active {
+      color: #ffffff;
+      background-color: #5294E2; }
+      .gedit-document-panel row:active button {
+        color: #ffffff; }
+    .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
+      color: #ffffff;
+      background-color: #5294E2; }
+    .gedit-document-panel row:hover:not(:selected) button:active {
+      color: #BAC3CF; }
 
 .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
   background-color: #e7eaee;
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 622ccd0..bed4d94 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -937,12 +937,12 @@ paned.titlebar separator {
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
   border-radius: 0; }
 
-paned.titlebar > headerbar:first-child {
-  border-top-right-radius: 0; }
-
-paned.titlebar > headerbar:last-child {
+paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
+paned.titlebar > headerbar:first-child:dir(ltr) {
+  border-top-right-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2772,6 +2772,9 @@ modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:select
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
 
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
@@ -2856,34 +2859,31 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: rgba(255, 255, 255, 0.9); }
 
 .gedit-document-panel row button {
+  min-width: 22px;
+  min-height: 22px;
+  padding: 0;
   color: transparent;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
-  box-shadow: none;
-  padding: 4px; }
+  box-shadow: none; }
   .gedit-document-panel row button image {
     color: inherit; }
 
-.gedit-document-panel .prelight-row button {
+.gedit-document-panel row:hover:not(:selected) button {
   color: #92959d; }
+  .gedit-document-panel row:hover:not(:selected) button:hover {
+    color: #ff4d4d; }
+  .gedit-document-panel row:hover:not(:selected) button:active {
+    color: #5c616c; }
 
-.gedit-document-panel row button:hover,
-.gedit-document-panel .prelight-row button:hover {
-  color: #ff4d4d; }
-
-.gedit-document-panel .prelight-row:selected button:hover {
+.gedit-document-panel row:hover:selected button:hover {
   color: #ff6666;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
   box-shadow: none; }
-  .gedit-document-panel .prelight-row:selected button:hover:active {
+  .gedit-document-panel row:hover:selected button:hover:active {
     color: #ffffff; }
 
-.gedit-document-panel .prelight-row button:active {
-  color: #5c616c; }
-
 .gedit-document-panel-dragged-row {
   border: 1px solid #dcdfe3;
   background-color: #d9dde0;
@@ -3452,29 +3452,20 @@ GtkListBox .h4 {
   .maximized .gedit-document-panel {
     background-color: #353945; }
   .gedit-document-panel row {
-    color: #BAC3CF; }
-  .gedit-document-panel row {
-    background-color: rgba(186, 195, 207, 0);
-    border: solid rgba(186, 195, 207, 0);
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel row:hover {
-    border: solid rgba(186, 195, 207, 0.15);
-    border-width: 3px 2px 3px 2px;
-    background-color: rgba(186, 195, 207, 0.15); }
-  .gedit-document-panel row:active {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-    .gedit-document-panel row:active button {
-      color: #ffffff; }
-  .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel .prelight-row button:active {
-    color: #BAC3CF; }
+    color: #BAC3CF;
+    background-color: rgba(186, 195, 207, 0); }
+    .gedit-document-panel row:hover {
+      background-color: rgba(186, 195, 207, 0.15); }
+    .gedit-document-panel row:active {
+      color: #ffffff;
+      background-color: #5294E2; }
+      .gedit-document-panel row:active button {
+        color: #ffffff; }
+    .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
+      color: #ffffff;
+      background-color: #5294E2; }
+    .gedit-document-panel row:hover:not(:selected) button:active {
+      color: #BAC3CF; }
 
 .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
   background-color: #e7eaee;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 094e15f..15e910d 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -937,12 +937,12 @@ paned.titlebar separator {
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
   border-radius: 0; }
 
-paned.titlebar > headerbar:first-child {
-  border-top-right-radius: 0; }
-
-paned.titlebar > headerbar:last-child {
+paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
+paned.titlebar > headerbar:first-child:dir(ltr) {
+  border-top-right-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2776,6 +2776,9 @@ modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:select
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
 
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
@@ -2860,34 +2863,31 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: rgba(255, 255, 255, 0.9); }
 
 .gedit-document-panel row button {
+  min-width: 22px;
+  min-height: 22px;
+  padding: 0;
   color: transparent;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
-  box-shadow: none;
-  padding: 4px; }
+  box-shadow: none; }
   .gedit-document-panel row button image {
     color: inherit; }
 
-.gedit-document-panel .prelight-row button {
+.gedit-document-panel row:hover:not(:selected) button {
   color: #92959d; }
+  .gedit-document-panel row:hover:not(:selected) button:hover {
+    color: #ff4d4d; }
+  .gedit-document-panel row:hover:not(:selected) button:active {
+    color: #5c616c; }
 
-.gedit-document-panel row button:hover,
-.gedit-document-panel .prelight-row button:hover {
-  color: #ff4d4d; }
-
-.gedit-document-panel .prelight-row:selected button:hover {
+.gedit-document-panel row:hover:selected button:hover {
   color: #ff6666;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
   box-shadow: none; }
-  .gedit-document-panel .prelight-row:selected button:hover:active {
+  .gedit-document-panel row:hover:selected button:hover:active {
     color: #ffffff; }
 
-.gedit-document-panel .prelight-row button:active {
-  color: #5c616c; }
-
 .gedit-document-panel-dragged-row {
   border: 1px solid #dcdfe3;
   background-color: #d9dde0;
@@ -3456,29 +3456,20 @@ GtkListBox .h4 {
   .maximized .gedit-document-panel {
     background-color: #353945; }
   .gedit-document-panel row {
-    color: #BAC3CF; }
-  .gedit-document-panel row {
-    background-color: rgba(186, 195, 207, 0);
-    border: solid rgba(186, 195, 207, 0);
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel row:hover {
-    border: solid rgba(186, 195, 207, 0.15);
-    border-width: 3px 2px 3px 2px;
-    background-color: rgba(186, 195, 207, 0.15); }
-  .gedit-document-panel row:active {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-    .gedit-document-panel row:active button {
-      color: #ffffff; }
-  .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel .prelight-row button:active {
-    color: #BAC3CF; }
+    color: #BAC3CF;
+    background-color: rgba(186, 195, 207, 0); }
+    .gedit-document-panel row:hover {
+      background-color: rgba(186, 195, 207, 0.15); }
+    .gedit-document-panel row:active {
+      color: #ffffff;
+      background-color: #5294E2; }
+      .gedit-document-panel row:active button {
+        color: #ffffff; }
+    .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
+      color: #ffffff;
+      background-color: #5294E2; }
+    .gedit-document-panel row:hover:not(:selected) button:active {
+      color: #BAC3CF; }
 
 .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
   background-color: #e7eaee;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index d7f1930..2ef92da 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -937,12 +937,12 @@ paned.titlebar separator {
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
   border-radius: 0; }
 
-paned.titlebar > headerbar:first-child {
-  border-top-right-radius: 0; }
-
-paned.titlebar > headerbar:last-child {
+paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
+paned.titlebar > headerbar:first-child:dir(ltr) {
+  border-top-right-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2776,6 +2776,9 @@ modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:select
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
 
+.gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked {
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .nautilus-canvas-item {
   border-radius: 2px; }
 
@@ -2860,34 +2863,31 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: rgba(255, 255, 255, 0.9); }
 
 .gedit-document-panel row button {
+  min-width: 22px;
+  min-height: 22px;
+  padding: 0;
   color: transparent;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
-  box-shadow: none;
-  padding: 4px; }
+  box-shadow: none; }
   .gedit-document-panel row button image {
     color: inherit; }
 
-.gedit-document-panel .prelight-row button {
+.gedit-document-panel row:hover:not(:selected) button {
   color: #92959d; }
+  .gedit-document-panel row:hover:not(:selected) button:hover {
+    color: #ff4d4d; }
+  .gedit-document-panel row:hover:not(:selected) button:active {
+    color: #5c616c; }
 
-.gedit-document-panel row button:hover,
-.gedit-document-panel .prelight-row button:hover {
-  color: #ff4d4d; }
-
-.gedit-document-panel .prelight-row:selected button:hover {
+.gedit-document-panel row:hover:selected button:hover {
   color: #ff6666;
-  background-image: none;
-  background-color: transparent;
+  background: none;
   border: none;
   box-shadow: none; }
-  .gedit-document-panel .prelight-row:selected button:hover:active {
+  .gedit-document-panel row:hover:selected button:hover:active {
     color: #ffffff; }
 
-.gedit-document-panel .prelight-row button:active {
-  color: #5c616c; }
-
 .gedit-document-panel-dragged-row {
   border: 1px solid #dcdfe3;
   background-color: #d9dde0;
@@ -3456,29 +3456,20 @@ GtkListBox .h4 {
   .maximized .gedit-document-panel {
     background-color: #353945; }
   .gedit-document-panel row {
-    color: #BAC3CF; }
-  .gedit-document-panel row {
-    background-color: rgba(186, 195, 207, 0);
-    border: solid rgba(186, 195, 207, 0);
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel row:hover {
-    border: solid rgba(186, 195, 207, 0.15);
-    border-width: 3px 2px 3px 2px;
-    background-color: rgba(186, 195, 207, 0.15); }
-  .gedit-document-panel row:active {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-    .gedit-document-panel row:active button {
-      color: #ffffff; }
-  .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
-    color: #ffffff;
-    background-color: #5294E2;
-    border: solid #5294E2;
-    border-width: 3px 2px 3px 2px; }
-  .gedit-document-panel .prelight-row button:active {
-    color: #BAC3CF; }
+    color: #BAC3CF;
+    background-color: rgba(186, 195, 207, 0); }
+    .gedit-document-panel row:hover {
+      background-color: rgba(186, 195, 207, 0.15); }
+    .gedit-document-panel row:active {
+      color: #ffffff;
+      background-color: #5294E2; }
+      .gedit-document-panel row:active button {
+        color: #ffffff; }
+    .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover {
+      color: #ffffff;
+      background-color: #5294E2; }
+    .gedit-document-panel row:hover:not(:selected) button:active {
+      color: #BAC3CF; }
 
 .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
   background-color: #e7eaee;
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 5cc7d76..b180637 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -1,22 +1,14 @@
 //
 // Tab overrides
 //
-//GeditNotebook.notebook,
+.gedit-bottom-panel-paned notebook {
 //ScratchMainWindow .notebook,
 //EphyNotebook.notebook,
 //MidoriNotebook .notebook,
 //TerminalWindow .notebook,
 //PantheonTerminalPantheonTerminalWindow .notebook {
-//
-//  header.top tab {
-//    &:active {
-//      box-shadow: inset 0 1px $borders_color,
-//                  inset 0 -1px $borders_color,
-//                  inset 1px 0 $borders_color,
-//                  inset -1px 0 $borders_color;
-//    }
-//  }
-//}
+  > header.top > tabs > tab:checked { box-shadow: inset 0 -1px $borders_color; }
+}
 
 //TerminalWindow .notebook,
 //PantheonTerminalPantheonTerminalWindow .notebook {
@@ -220,32 +212,33 @@ $disk_space_free: darken($bg_color, 3%);
 .gedit-document-panel {
 
   row button {
+    min-width: 22px;
+    min-height: 22px;
+    padding: 0;
+
     color: transparent;
-    background-image: none;
-    background-color: transparent;
+    background: none;
     border: none;
     box-shadow: none;
-    padding: 4px;
-    & image { color: inherit; }
+
+    image { color: inherit; }
   }
-  .prelight-row button {
+
+  row:hover:not(:selected) button {
     color: mix($bg_color, $fg_color, 35%);
+
+    &:hover { color: lighten(red, 15%); }
+    &:active { color: $fg_color; }
   }
-  row button:hover,
-  .prelight-row button:hover {
-    color: lighten(red, 15%);
-  }
-  .prelight-row:selected button:hover {
+
+  row:hover:selected button:hover {
     color: lighten(red, 20%);
-    background-image: none;
-    background-color: transparent;
+    background: none;
     border: none;
     box-shadow: none;
+
     &:active { color: $selected_fg_color; }
   }
-  .prelight-row button:active {
-    color: $fg_color;
-  }
 }
 
 .gedit-document-panel-dragged-row {
@@ -275,10 +268,6 @@ $disk_space_free: darken($bg_color, 3%);
   padding: 2px;
 }
 
-//GeditFileBrowserWidget toolbar {
-//  border-bottom: 1px solid $borders_color;
-//}
-
 //
 // Epiphany
 //
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 54e7bbb..8c79b17 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1026,8 +1026,9 @@ paned.titlebar {
 
   > headerbar {
     &:not(:only-child):not(:first-child):not(:last-child) { border-radius: 0;}
+
+    ~ headerbar { border-top-left-radius: 0; }
     &:first-child { border-top-right-radius: 0; }
-    &:last-child { border-top-left-radius: 0; } 
   }
 }
 
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index 1e8177c..42d08a4 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -131,64 +131,29 @@
 
   .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
 
-  row { color: $dark_sidebar_fg; }
-
   row {
-    background-color: transparentize($dark_sidebar_fg, 1);
-    border: solid transparentize($dark_sidebar_fg, 1);
-    border-width: 3px 2px 3px 2px;
-  }
-  row:hover {
-    border: solid transparentize($dark_sidebar_fg, 0.85);
-    border-width: 3px 2px 3px 2px;
-    background-color: transparentize($dark_sidebar_fg, 0.85);
-  }
-  row:active {
-    color: $selected_fg_color;
-    background-color: $selected_bg_color;
-    border: solid $selected_bg_color;
-    border-width: 3px 2px 3px 2px;
-
-    button { color: $selected_fg_color; }
-  }
-  row:selected, row:selected:hover {
-    color: $selected_fg_color;
-    background-color: $selected_bg_color;
-    border: solid $selected_bg_color;
-    border-width: 3px 2px 3px 2px;
-  }
-  .prelight-row button:active {
     color: $dark_sidebar_fg;
+    background-color: transparentize($dark_sidebar_fg, 1);
+
+    &:hover {
+      background-color: transparentize($dark_sidebar_fg, 0.85);
+    }
+    &:active {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+
+      button { color: $selected_fg_color; }
+    }
+    &:selected, &:selected:hover {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+    }
+    &:hover:not(:selected) button:active {
+      color: $dark_sidebar_fg;
+    }
   }
 }
 
-//GeditFileBrowserWidget {
-//  background-color: $dark_sidebar_bg;
-//
-//  .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
-//
-//  scrollbar { @extend %dark_sidebar_scrollbar; }
-//
-//  .horizontal {
-//    background-color: transparent;
-//    border-color: darken($dark_sidebar_bg, 7%);
-//
-//    button { @extend %dark_sidebar_button; }
-//    combobox { color: $dark_sidebar_fg; }
-//  }
-//}
-
-//GeditWindow.background.csd GeditFileBrowserView.view {
-//
-//  background-color: transparent;
-//  color: $dark_sidebar_fg;
-//
-//  &.expander {
-//    color: $dark_sidebar_fg;
-//    &:hover { color: $selected_bg_color; }
-//  }
-//}
-
 %dark_sidebar_button {
   @include button(osd);