diff --git a/src/main/gtk-3.0/gtk-dark-blue.css b/src/main/gtk-3.0/gtk-dark-blue.css
index c92e4d05..84446a4f 100644
--- a/src/main/gtk-3.0/gtk-dark-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-blue.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-green.css b/src/main/gtk-3.0/gtk-dark-green.css
index 45b775dd..1e1e61c9 100644
--- a/src/main/gtk-3.0/gtk-dark-green.css
+++ b/src/main/gtk-3.0/gtk-dark-green.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-grey.css b/src/main/gtk-3.0/gtk-dark-grey.css
index fe2a97a0..c2496f1d 100644
--- a/src/main/gtk-3.0/gtk-dark-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-grey.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-orange.css b/src/main/gtk-3.0/gtk-dark-orange.css
index 388d0a56..b1456691 100644
--- a/src/main/gtk-3.0/gtk-dark-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-orange.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-pink.css b/src/main/gtk-3.0/gtk-dark-pink.css
index 440797fd..52eb89a3 100644
--- a/src/main/gtk-3.0/gtk-dark-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-pink.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-purple.css b/src/main/gtk-3.0/gtk-dark-purple.css
index 3e3252f8..29ee3cde 100644
--- a/src/main/gtk-3.0/gtk-dark-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-purple.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-red.css b/src/main/gtk-3.0/gtk-dark-red.css
index e9a9bfcc..0f0bcdb1 100644
--- a/src/main/gtk-3.0/gtk-dark-red.css
+++ b/src/main/gtk-3.0/gtk-dark-red.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-blue.css b/src/main/gtk-3.0/gtk-dark-solid-blue.css
index 950fc90a..6c4ae637 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-blue.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-green.css b/src/main/gtk-3.0/gtk-dark-solid-green.css
index cb6936f9..f7dcaf48 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-green.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-green.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-grey.css b/src/main/gtk-3.0/gtk-dark-solid-grey.css
index 888e0469..e16e70d8 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-grey.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-orange.css b/src/main/gtk-3.0/gtk-dark-solid-orange.css
index a5f5cbcb..218339f9 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-orange.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-pink.css b/src/main/gtk-3.0/gtk-dark-solid-pink.css
index f1321e80..1e738331 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-pink.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-purple.css b/src/main/gtk-3.0/gtk-dark-solid-purple.css
index 99c67a94..fce855e3 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-purple.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-red.css b/src/main/gtk-3.0/gtk-dark-solid-red.css
index 644db351..2badb090 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-red.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-red.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid-yellow.css b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
index 421f9795..1988cd48 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6361,6 +6380,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark-yellow.css b/src/main/gtk-3.0/gtk-dark-yellow.css
index 706e6c14..f6885373 100644
--- a/src/main/gtk-3.0/gtk-dark-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-yellow.css
@@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6356,6 +6375,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-blue.css b/src/main/gtk-3.0/gtk-light-blue.css
index 67156850..d4f8bea2 100644
--- a/src/main/gtk-3.0/gtk-light-blue.css
+++ b/src/main/gtk-3.0/gtk-light-blue.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-green.css b/src/main/gtk-3.0/gtk-light-green.css
index dd926105..915f83ca 100644
--- a/src/main/gtk-3.0/gtk-light-green.css
+++ b/src/main/gtk-3.0/gtk-light-green.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-grey.css b/src/main/gtk-3.0/gtk-light-grey.css
index c648ec86..cdfdc691 100644
--- a/src/main/gtk-3.0/gtk-light-grey.css
+++ b/src/main/gtk-3.0/gtk-light-grey.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-orange.css b/src/main/gtk-3.0/gtk-light-orange.css
index a3dc69c1..1238f181 100644
--- a/src/main/gtk-3.0/gtk-light-orange.css
+++ b/src/main/gtk-3.0/gtk-light-orange.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-pink.css b/src/main/gtk-3.0/gtk-light-pink.css
index fa072efa..4e12b25c 100644
--- a/src/main/gtk-3.0/gtk-light-pink.css
+++ b/src/main/gtk-3.0/gtk-light-pink.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-purple.css b/src/main/gtk-3.0/gtk-light-purple.css
index 576abe23..c5c23f78 100644
--- a/src/main/gtk-3.0/gtk-light-purple.css
+++ b/src/main/gtk-3.0/gtk-light-purple.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-red.css b/src/main/gtk-3.0/gtk-light-red.css
index 77541aa8..913fe3cd 100644
--- a/src/main/gtk-3.0/gtk-light-red.css
+++ b/src/main/gtk-3.0/gtk-light-red.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-blue.css b/src/main/gtk-3.0/gtk-light-solid-blue.css
index a9b693cf..89b2eba6 100644
--- a/src/main/gtk-3.0/gtk-light-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-light-solid-blue.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-green.css b/src/main/gtk-3.0/gtk-light-solid-green.css
index cc636e29..b53a755c 100644
--- a/src/main/gtk-3.0/gtk-light-solid-green.css
+++ b/src/main/gtk-3.0/gtk-light-solid-green.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-grey.css b/src/main/gtk-3.0/gtk-light-solid-grey.css
index 16eb4531..e69670f0 100644
--- a/src/main/gtk-3.0/gtk-light-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-light-solid-grey.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-orange.css b/src/main/gtk-3.0/gtk-light-solid-orange.css
index f3994905..45ce7ac9 100644
--- a/src/main/gtk-3.0/gtk-light-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-light-solid-orange.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-pink.css b/src/main/gtk-3.0/gtk-light-solid-pink.css
index 98ea2b4b..aaf7c0b9 100644
--- a/src/main/gtk-3.0/gtk-light-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-light-solid-pink.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-purple.css b/src/main/gtk-3.0/gtk-light-solid-purple.css
index 2e9a4029..c3f2f29e 100644
--- a/src/main/gtk-3.0/gtk-light-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-light-solid-purple.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-red.css b/src/main/gtk-3.0/gtk-light-solid-red.css
index 3f0a310e..b5d5cc63 100644
--- a/src/main/gtk-3.0/gtk-light-solid-red.css
+++ b/src/main/gtk-3.0/gtk-light-solid-red.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid-yellow.css b/src/main/gtk-3.0/gtk-light-solid-yellow.css
index 68fd5bd7..4d35f3c2 100644
--- a/src/main/gtk-3.0/gtk-light-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-solid-yellow.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6384,6 +6403,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-yellow.css b/src/main/gtk-3.0/gtk-light-yellow.css
index 7cb9725b..5a8b9a32 100644
--- a/src/main/gtk-3.0/gtk-light-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-yellow.css
@@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6379,6 +6398,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {