updates

8 files changed, 714 insertions, 524 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index fea25da..f20918f 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -63,7 +63,7 @@ iconview {
   color: #D3DAE3;
   background-color: #404552; }
   iconview:selected, iconview:selected:focus {
-    border-radius: 3px; }
+    border-radius: 2px; }
 
 rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband {
@@ -158,8 +158,8 @@ entry {
     border-color: #2b2e39;
     background-color: #404552;
     background-image: linear-gradient(to bottom, #404552);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0; }
   entry:focus {
@@ -179,7 +179,7 @@ entry {
     background-color: #5294E2;
     color: #ffffff; }
   entry progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -421,13 +421,25 @@ button {
       background-color: rgba(68, 74, 88, 0.55); }
       button.destructive-action:disabled > label {
         color: inherit; }
+  button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   button.text-button {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button label:first-child {
-    padding-left: 8px; }
-  button.text-button.image-button label:last-child {
-    padding-right: 8px; }
+  button.text-button.image-button {
+    padding-left: 0;
+    padding-right: 0; }
+    button.text-button.image-button label:first-child {
+      padding-left: 12px;
+      padding-right: 0; }
+    button.text-button.image-button label:last-child {
+      padding-left: 0;
+      padding-right: 12px; }
+    button.text-button.image-button image {
+      padding-left: 6px;
+      padding-right: 6px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -724,6 +736,9 @@ button:link > label, button:visited > label {
 spinbutton button:active {
   color: #ffffff; }
 
+spinbutton:disabled {
+  color: rgba(211, 218, 227, 0.45); }
+
 spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
   padding-top: 0;
   padding-bottom: 0;
@@ -1258,12 +1273,6 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); }
 
-.path-bar button:first-child {
-  padding-left: 10px; }
-
-.path-bar button:last-child {
-  padding-right: 10px; }
-
 .path-bar button:only-child {
   padding-left: 10px;
   padding-right: 10px; }
@@ -1327,36 +1336,41 @@ treeview.view {
     border-radius: 3px;
     border-width: 0; }
   treeview.view header button {
+    min-height: 0;
+    min-width: 0;
+    padding: 3px 6px;
+    font-weight: bold;
     color: #b6bcc6;
     background-color: #404552;
-    font-weight: bold; }
+    background-image: none;
+    border-style: none solid none none;
+    border-radius: 0;
+    border-image: linear-gradient(to bottom, #404552 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, #404552 80%) 0 1 0 0/0 1px 0 0 stretch; }
     treeview.view header button:hover {
       color: #5294E2; }
     treeview.view header button:active {
       color: #D3DAE3; }
-    treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover {
-      transition: none;
-      color: #5294E2;
-      box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; }
-
-treeview.view header button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom, #404552 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, #404552 80%) 0 1 0 0/0 1px 0 0 stretch; }
-  treeview.view header button:active, treeview.view header button:hover {
-    background-color: #404552; }
-  treeview.view header button:active:hover {
-    color: #D3DAE3; }
-  treeview.view header button:disabled {
-    border-color: #383C4A;
-    background-image: none; }
-  treeview.view header button:last-child {
-    border-right-style: none;
-    border-image: none; }
+    treeview.view header button:active, treeview.view header button:hover {
+      background-color: #404552; }
+    treeview.view header button:active:hover {
+      color: #D3DAE3; }
+    treeview.view header button:disabled {
+      border-color: #383C4A;
+      background-image: none; }
+    treeview.view header button:last-child {
+      border-right-style: none;
+      border-image: none; }
+  treeview.view button.dnd, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd:active,
+  treeview.view header.button.dnd,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd:active {
+    padding: 0 6px;
+    transition: none;
+    color: #ffffff;
+    background-color: #5294E2;
+    border-radius: 0;
+    border-style: none; }
 
 menubar,
 .menubar {
@@ -2053,6 +2067,14 @@ levelbar block.empty {
   background-color: #404552;
   border-color: #404552; }
 
+printdialog paper {
+  border: 1px solid #2b2e39;
+  background: white;
+  padding: 0; }
+
+printdialog .dialog-action-box {
+  margin: 12px; }
+
 frame border,
 .frame {
   margin: 0;
@@ -2064,11 +2086,6 @@ frame border,
   .frame.flat {
     border-style: none; }
 
-paper {
-  border: 1px solid #2b2e39;
-  background: white;
-  padding: 0; }
-
 scrolledwindow viewport.frame, placessidebar viewport.frame {
   border-style: none; }
 
@@ -2297,9 +2314,12 @@ messagedialog.csd .dialog-action-area button:only-child {
   border-left-style: none;
   border-right-style: none; }
 
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(43, 46, 57, 0.5); }
+
 .sidebar, .sidebar .view {
   border: none;
-  background-color: #383C4A; }
+  background-color: #3c4150; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2313,9 +2333,10 @@ placessidebar list {
   background-color: transparent; }
 
 placessidebar row {
+  min-height: 30px;
   padding: 0px; }
   placessidebar row > revealer {
-    padding: 8px 10px; }
+    padding: 0 10px; }
   placessidebar row image.sidebar-icon:dir(ltr) {
     padding-right: 8px; }
   placessidebar row image.sidebar-icon:dir(rtl) {
@@ -2325,8 +2346,10 @@ placessidebar row {
   placessidebar row label.sidebar-label:dir(rtl) {
     padding-left: 2px; }
   button.sidebar-button {
-    min-width: 26px;
-    min-height: 26px;
+    min-width: 22px;
+    min-height: 22px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     padding: 0;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
@@ -2522,16 +2545,11 @@ button.color {
   .content-view:hover {
     -gtk-icon-effect: highlight; }
 
-.scale-popup button {
-  padding: 6px; }
-  .scale-popup button:hover {
-    color: #D3DAE3;
-    outline-color: rgba(211, 218, 227, 0.3);
-    border-color: #2b2e39;
-    background-color: #505666; }
-
-button.scale {
-  padding: 8px; }
+.scale-popup button:hover {
+  color: #D3DAE3;
+  outline-color: rgba(211, 218, 227, 0.3);
+  border-color: #2b2e39;
+  background-color: #505666; }
 
 .context-menu, popover.touch-selection,
 popover.background.touch-selection {
@@ -2552,12 +2570,14 @@ button.circular-button {
     padding: 0; }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+  padding: 3px 6px 4px 6px;
+  color: #D3DAE3;
   background-color: #404552;
   border: 1px solid #2b2e39;
-  border-radius: 2px;
-  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.15);
-  color: #D3DAE3;
-  padding: 3px 8px 3px 8px; }
+  border-radius: 2.5px;
+  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.15); }
 
 stackswitcher button.text-button {
   min-width: 80px; }
@@ -2567,7 +2587,8 @@ stackswitcher button.circular {
 
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black; }
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black; }
 
 decoration {
   border-radius: 3px 3px 0 0;
@@ -2576,15 +2597,16 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 8px 8px 0 transparent, 0 5px 5px 0 rgba(0, 0, 0, 0.35); }
+  .fullscreen decoration,
   .tiled decoration {
     border-radius: 0; }
   .popup decoration, decoration.popup {
     box-shadow: none;
     border-radius: 0; }
-  .ssd decoration, decoration.ssd {
+  .ssd decoration {
     border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); }
-    .ssd decoration.maximized, decoration.ssd.maximized {
+    .ssd decoration.maximized {
       border-radius: 0; }
   .csd.popup decoration {
     border-radius: 2px;
@@ -3418,21 +3440,17 @@ GtkListBox .h4 {
   font: bold; }
 
 .nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
-  background: rgba(53, 57, 69, 0.95); }
+  background: rgba(42, 45, 55, 0.95); }
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar paned > separator:dir(ltr), .nautilus-window .sidebar .view paned > separator:dir(ltr), .sidebar .view .nautilus-window paned > separator:dir(ltr) {
+    margin-left: -1px; }
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl), .nautilus-window .sidebar .view paned > separator:dir(rtl), .sidebar .view .nautilus-window paned > separator:dir(rtl) {
+    margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
   background-color: transparent; }
 
 .nautilus-window placessidebar.sidebar {
   background-color: rgba(53, 57, 69, 0.95); }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    margin-right: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    margin-left: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    border-right: 1px solid rgba(42, 45, 55, 0.95); }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    border-left: 1px solid rgba(42, 45, 55, 0.95); }
   .nautilus-window placessidebar.sidebar row.sidebar-placeholder-row {
     border: 1px solid #5294E2; }
   .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
@@ -3452,21 +3470,25 @@ GtkListBox .h4 {
 .nautilus-window.maximized placessidebar.sidebar {
   background-color: #353945; }
 
-.nautilus-window .sidebar-button.button {
+.nautilus-window button.sidebar-button {
   color: #BAC3CF; }
-  .nautilus-window .sidebar-button.button:hover {
+  .nautilus-window button.sidebar-button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.35);
     background-color: rgba(119, 127, 151, 0.45); }
-  .nautilus-window .sidebar-button.button:active {
+  .nautilus-window button.sidebar-button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
+    border-color: #2b2e39;
     background-color: #5294E2; }
-  .nautilus-window .sidebar-button.button:not(:hover):not(:active) > image {
+  .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #2b2e39; }
+
 .gedit-bottom-panel-paned {
   background-color: #404552; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 91c79e8..6f34d6d 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -63,7 +63,7 @@ iconview {
   color: #5c616c;
   background-color: #ffffff; }
   iconview:selected, iconview:selected:focus {
-    border-radius: 3px; }
+    border-radius: 2px; }
 
 rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband {
@@ -158,8 +158,8 @@ entry {
     border-color: #cfd6e6;
     background-color: #ffffff;
     background-image: linear-gradient(to bottom, #ffffff);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0; }
   entry:focus {
@@ -178,7 +178,7 @@ entry {
     background-color: #5294E2;
     color: #ffffff; }
   entry progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -420,13 +420,25 @@ button {
       background-color: rgba(251, 251, 252, 0.55); }
       button.destructive-action:disabled > label {
         color: inherit; }
+  button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   button.text-button {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button label:first-child {
-    padding-left: 8px; }
-  button.text-button.image-button label:last-child {
-    padding-right: 8px; }
+  button.text-button.image-button {
+    padding-left: 0;
+    padding-right: 0; }
+    button.text-button.image-button label:first-child {
+      padding-left: 12px;
+      padding-right: 0; }
+    button.text-button.image-button label:last-child {
+      padding-left: 0;
+      padding-right: 12px; }
+    button.text-button.image-button image {
+      padding-left: 6px;
+      padding-right: 6px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -723,6 +735,9 @@ button:link > label, button:visited > label {
 spinbutton button:active {
   color: #ffffff; }
 
+spinbutton:disabled {
+  color: rgba(92, 97, 108, 0.55); }
+
 spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
   padding-top: 0;
   padding-bottom: 0;
@@ -1257,12 +1272,6 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); }
 
-.path-bar button:first-child {
-  padding-left: 10px; }
-
-.path-bar button:last-child {
-  padding-right: 10px; }
-
 .path-bar button:only-child {
   padding-left: 10px;
   padding-right: 10px; }
@@ -1326,36 +1335,41 @@ treeview.view {
     border-radius: 3px;
     border-width: 0; }
   treeview.view header button {
+    min-height: 0;
+    min-width: 0;
+    padding: 3px 6px;
+    font-weight: bold;
     color: #7d8189;
     background-color: #ffffff;
-    font-weight: bold; }
+    background-image: none;
+    border-style: none solid none none;
+    border-radius: 0;
+    border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
     treeview.view header button:hover {
       color: #5294E2; }
     treeview.view header button:active {
       color: #5c616c; }
-    treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover {
-      transition: none;
-      color: #5294E2;
-      box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; }
-
-treeview.view header button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
-  treeview.view header button:active, treeview.view header button:hover {
-    background-color: #ffffff; }
-  treeview.view header button:active:hover {
-    color: #5c616c; }
-  treeview.view header button:disabled {
-    border-color: #F5F6F7;
-    background-image: none; }
-  treeview.view header button:last-child {
-    border-right-style: none;
-    border-image: none; }
+    treeview.view header button:active, treeview.view header button:hover {
+      background-color: #ffffff; }
+    treeview.view header button:active:hover {
+      color: #5c616c; }
+    treeview.view header button:disabled {
+      border-color: #F5F6F7;
+      background-image: none; }
+    treeview.view header button:last-child {
+      border-right-style: none;
+      border-image: none; }
+  treeview.view button.dnd, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd:active,
+  treeview.view header.button.dnd,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd:active {
+    padding: 0 6px;
+    transition: none;
+    color: #ffffff;
+    background-color: #5294E2;
+    border-radius: 0;
+    border-style: none; }
 
 menubar,
 .menubar {
@@ -2052,6 +2066,14 @@ levelbar block.empty {
   background-color: rgba(92, 97, 108, 0.2);
   border-color: rgba(92, 97, 108, 0.2); }
 
+printdialog paper {
+  border: 1px solid #dcdfe3;
+  background: white;
+  padding: 0; }
+
+printdialog .dialog-action-box {
+  margin: 12px; }
+
 frame border,
 .frame {
   margin: 0;
@@ -2063,11 +2085,6 @@ frame border,
   .frame.flat {
     border-style: none; }
 
-paper {
-  border: 1px solid #dcdfe3;
-  background: white;
-  padding: 0; }
-
 scrolledwindow viewport.frame, placessidebar viewport.frame {
   border-style: none; }
 
@@ -2296,9 +2313,12 @@ messagedialog.csd .dialog-action-area button:only-child {
   border-left-style: none;
   border-right-style: none; }
 
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
+
 .sidebar, .sidebar .view {
   border: none;
-  background-color: #F5F6F7; }
+  background-color: #fbfbfc; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2312,9 +2332,10 @@ placessidebar list {
   background-color: transparent; }
 
 placessidebar row {
+  min-height: 30px;
   padding: 0px; }
   placessidebar row > revealer {
-    padding: 8px 10px; }
+    padding: 0 10px; }
   placessidebar row image.sidebar-icon:dir(ltr) {
     padding-right: 8px; }
   placessidebar row image.sidebar-icon:dir(rtl) {
@@ -2324,8 +2345,10 @@ placessidebar row {
   placessidebar row label.sidebar-label:dir(rtl) {
     padding-left: 2px; }
   button.sidebar-button {
-    min-width: 26px;
-    min-height: 26px;
+    min-width: 22px;
+    min-height: 22px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     padding: 0;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
@@ -2521,16 +2544,11 @@ button.color {
   .content-view:hover {
     -gtk-icon-effect: highlight; }
 
-.scale-popup button {
-  padding: 6px; }
-  .scale-popup button:hover {
-    color: #5c616c;
-    outline-color: rgba(92, 97, 108, 0.3);
-    border-color: #cfd6e6;
-    background-color: white; }
-
-button.scale {
-  padding: 8px; }
+.scale-popup button:hover {
+  color: #5c616c;
+  outline-color: rgba(92, 97, 108, 0.3);
+  border-color: #cfd6e6;
+  background-color: white; }
 
 .context-menu, popover.touch-selection,
 popover.background.touch-selection {
@@ -2551,12 +2569,14 @@ button.circular-button {
     padding: 0; }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+  padding: 3px 6px 4px 6px;
+  color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #dcdfe3;
-  border-radius: 2px;
-  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05);
-  color: #5c616c;
-  padding: 3px 8px 3px 8px; }
+  border-radius: 2.5px;
+  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05); }
 
 stackswitcher button.text-button {
   min-width: 80px; }
@@ -2566,7 +2586,8 @@ stackswitcher button.circular {
 
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black; }
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black; }
 
 decoration {
   border-radius: 3px 3px 0 0;
@@ -2575,15 +2596,16 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 8px 8px 0 transparent, 0 5px 5px 0 rgba(0, 0, 0, 0.2); }
+  .fullscreen decoration,
   .tiled decoration {
     border-radius: 0; }
   .popup decoration, decoration.popup {
     box-shadow: none;
     border-radius: 0; }
-  .ssd decoration, decoration.ssd {
+  .ssd decoration {
     border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); }
-    .ssd decoration.maximized, decoration.ssd.maximized {
+    .ssd decoration.maximized {
       border-radius: 0; }
   .csd.popup decoration {
     border-radius: 2px;
@@ -3418,16 +3440,16 @@ GtkListBox .h4 {
 
 .nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
   background: rgba(53, 57, 69, 0.95); }
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar paned > separator:dir(ltr), .nautilus-window .sidebar .view paned > separator:dir(ltr), .sidebar .view .nautilus-window paned > separator:dir(ltr) {
+    margin-left: -1px; }
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl), .nautilus-window .sidebar .view paned > separator:dir(rtl), .sidebar .view .nautilus-window paned > separator:dir(rtl) {
+    margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
   background-color: transparent; }
 
 .nautilus-window placessidebar.sidebar {
   background-color: rgba(53, 57, 69, 0.95); }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    margin-right: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    margin-left: -1px; }
   .nautilus-window placessidebar.sidebar row.sidebar-placeholder-row {
     border: 1px solid #5294E2; }
   .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
@@ -3447,21 +3469,25 @@ GtkListBox .h4 {
 .nautilus-window.maximized placessidebar.sidebar {
   background-color: #353945; }
 
-.nautilus-window .sidebar-button.button {
+.nautilus-window button.sidebar-button {
   color: #BAC3CF; }
-  .nautilus-window .sidebar-button.button:hover {
+  .nautilus-window button.sidebar-button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.35);
     background-color: rgba(119, 127, 151, 0.45); }
-  .nautilus-window .sidebar-button.button:active {
+  .nautilus-window button.sidebar-button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
+    border-color: #5294E2;
     background-color: #5294E2; }
-  .nautilus-window .sidebar-button.button:not(:hover):not(:active) > image {
+  .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
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 943b320..6419887 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -63,7 +63,7 @@ iconview {
   color: #D3DAE3;
   background-color: #404552; }
   iconview:selected, iconview:selected:focus {
-    border-radius: 3px; }
+    border-radius: 2px; }
 
 rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband {
@@ -158,8 +158,8 @@ entry {
     border-color: #2b2e39;
     background-color: #404552;
     background-image: linear-gradient(to bottom, #404552);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0; }
   entry:focus {
@@ -179,7 +179,7 @@ entry {
     background-color: #5294E2;
     color: #ffffff; }
   entry progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -421,13 +421,25 @@ button {
       background-color: rgba(68, 74, 88, 0.55); }
       button.destructive-action:disabled > label {
         color: inherit; }
+  button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   button.text-button {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button label:first-child {
-    padding-left: 8px; }
-  button.text-button.image-button label:last-child {
-    padding-right: 8px; }
+  button.text-button.image-button {
+    padding-left: 0;
+    padding-right: 0; }
+    button.text-button.image-button label:first-child {
+      padding-left: 12px;
+      padding-right: 0; }
+    button.text-button.image-button label:last-child {
+      padding-left: 0;
+      padding-right: 12px; }
+    button.text-button.image-button image {
+      padding-left: 6px;
+      padding-right: 6px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -724,6 +736,9 @@ button:link > label, button:visited > label {
 spinbutton button:active {
   color: #ffffff; }
 
+spinbutton:disabled {
+  color: rgba(211, 218, 227, 0.45); }
+
 spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
   padding-top: 0;
   padding-bottom: 0;
@@ -1258,12 +1273,6 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); }
 
-.path-bar button:first-child {
-  padding-left: 10px; }
-
-.path-bar button:last-child {
-  padding-right: 10px; }
-
 .path-bar button:only-child {
   padding-left: 10px;
   padding-right: 10px; }
@@ -1327,36 +1336,41 @@ treeview.view {
     border-radius: 3px;
     border-width: 0; }
   treeview.view header button {
+    min-height: 0;
+    min-width: 0;
+    padding: 3px 6px;
+    font-weight: bold;
     color: #b6bcc6;
     background-color: #404552;
-    font-weight: bold; }
+    background-image: none;
+    border-style: none solid none none;
+    border-radius: 0;
+    border-image: linear-gradient(to bottom, #404552 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, #404552 80%) 0 1 0 0/0 1px 0 0 stretch; }
     treeview.view header button:hover {
       color: #5294E2; }
     treeview.view header button:active {
       color: #D3DAE3; }
-    treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover {
-      transition: none;
-      color: #5294E2;
-      box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; }
-
-treeview.view header button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom, #404552 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, #404552 80%) 0 1 0 0/0 1px 0 0 stretch; }
-  treeview.view header button:active, treeview.view header button:hover {
-    background-color: #404552; }
-  treeview.view header button:active:hover {
-    color: #D3DAE3; }
-  treeview.view header button:disabled {
-    border-color: #383C4A;
-    background-image: none; }
-  treeview.view header button:last-child {
-    border-right-style: none;
-    border-image: none; }
+    treeview.view header button:active, treeview.view header button:hover {
+      background-color: #404552; }
+    treeview.view header button:active:hover {
+      color: #D3DAE3; }
+    treeview.view header button:disabled {
+      border-color: #383C4A;
+      background-image: none; }
+    treeview.view header button:last-child {
+      border-right-style: none;
+      border-image: none; }
+  treeview.view button.dnd, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd:active,
+  treeview.view header.button.dnd,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd:active {
+    padding: 0 6px;
+    transition: none;
+    color: #ffffff;
+    background-color: #5294E2;
+    border-radius: 0;
+    border-style: none; }
 
 menubar,
 .menubar {
@@ -2053,6 +2067,14 @@ levelbar block.empty {
   background-color: #404552;
   border-color: #404552; }
 
+printdialog paper {
+  border: 1px solid #2b2e39;
+  background: white;
+  padding: 0; }
+
+printdialog .dialog-action-box {
+  margin: 12px; }
+
 frame border,
 .frame {
   margin: 0;
@@ -2064,11 +2086,6 @@ frame border,
   .frame.flat {
     border-style: none; }
 
-paper {
-  border: 1px solid #2b2e39;
-  background: white;
-  padding: 0; }
-
 scrolledwindow viewport.frame, placessidebar viewport.frame {
   border-style: none; }
 
@@ -2297,9 +2314,12 @@ messagedialog.csd .dialog-action-area button:only-child {
   border-left-style: none;
   border-right-style: none; }
 
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(43, 46, 57, 0.5); }
+
 .sidebar, .sidebar .view {
   border: none;
-  background-color: #383C4A; }
+  background-color: #3c4150; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2313,9 +2333,10 @@ placessidebar list {
   background-color: transparent; }
 
 placessidebar row {
+  min-height: 30px;
   padding: 0px; }
   placessidebar row > revealer {
-    padding: 8px 10px; }
+    padding: 0 10px; }
   placessidebar row image.sidebar-icon:dir(ltr) {
     padding-right: 8px; }
   placessidebar row image.sidebar-icon:dir(rtl) {
@@ -2325,8 +2346,10 @@ placessidebar row {
   placessidebar row label.sidebar-label:dir(rtl) {
     padding-left: 2px; }
   button.sidebar-button {
-    min-width: 26px;
-    min-height: 26px;
+    min-width: 22px;
+    min-height: 22px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     padding: 0;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
@@ -2522,16 +2545,11 @@ button.color {
   .content-view:hover {
     -gtk-icon-effect: highlight; }
 
-.scale-popup button {
-  padding: 6px; }
-  .scale-popup button:hover {
-    color: #D3DAE3;
-    outline-color: rgba(211, 218, 227, 0.3);
-    border-color: #2b2e39;
-    background-color: #505666; }
-
-button.scale {
-  padding: 8px; }
+.scale-popup button:hover {
+  color: #D3DAE3;
+  outline-color: rgba(211, 218, 227, 0.3);
+  border-color: #2b2e39;
+  background-color: #505666; }
 
 .context-menu, popover.touch-selection,
 popover.background.touch-selection {
@@ -2552,12 +2570,14 @@ button.circular-button {
     padding: 0; }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+  padding: 3px 6px 4px 6px;
+  color: #D3DAE3;
   background-color: #404552;
   border: 1px solid #2b2e39;
-  border-radius: 2px;
-  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.15);
-  color: #D3DAE3;
-  padding: 3px 8px 3px 8px; }
+  border-radius: 2.5px;
+  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.15); }
 
 stackswitcher button.text-button {
   min-width: 80px; }
@@ -2567,7 +2587,8 @@ stackswitcher button.circular {
 
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black; }
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black; }
 
 decoration {
   border-radius: 3px 3px 0 0;
@@ -2576,15 +2597,16 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 8px 8px 0 transparent, 0 5px 5px 0 rgba(0, 0, 0, 0.35); }
+  .fullscreen decoration,
   .tiled decoration {
     border-radius: 0; }
   .popup decoration, decoration.popup {
     box-shadow: none;
     border-radius: 0; }
-  .ssd decoration, decoration.ssd {
+  .ssd decoration {
     border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); }
-    .ssd decoration.maximized, decoration.ssd.maximized {
+    .ssd decoration.maximized {
       border-radius: 0; }
   .csd.popup decoration {
     border-radius: 2px;
@@ -3418,21 +3440,17 @@ GtkListBox .h4 {
   font: bold; }
 
 .nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
-  background: #353945; }
+  background: #2a2d37; }
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar paned > separator:dir(ltr), .nautilus-window .sidebar .view paned > separator:dir(ltr), .sidebar .view .nautilus-window paned > separator:dir(ltr) {
+    margin-left: -1px; }
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl), .nautilus-window .sidebar .view paned > separator:dir(rtl), .sidebar .view .nautilus-window paned > separator:dir(rtl) {
+    margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
   background-color: transparent; }
 
 .nautilus-window placessidebar.sidebar {
   background-color: #353945; }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    margin-right: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    margin-left: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    border-right: 1px solid #2a2d37; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    border-left: 1px solid #2a2d37; }
   .nautilus-window placessidebar.sidebar row.sidebar-placeholder-row {
     border: 1px solid #5294E2; }
   .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
@@ -3452,21 +3470,25 @@ GtkListBox .h4 {
 .nautilus-window.maximized placessidebar.sidebar {
   background-color: #353945; }
 
-.nautilus-window .sidebar-button.button {
+.nautilus-window button.sidebar-button {
   color: #BAC3CF; }
-  .nautilus-window .sidebar-button.button:hover {
+  .nautilus-window button.sidebar-button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.4);
     background-color: rgba(119, 127, 151, 0.5); }
-  .nautilus-window .sidebar-button.button:active {
+  .nautilus-window button.sidebar-button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
+    border-color: #2b2e39;
     background-color: #5294E2; }
-  .nautilus-window .sidebar-button.button:not(:hover):not(:active) > image {
+  .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #2b2e39; }
+
 .gedit-bottom-panel-paned {
   background-color: #404552; }
 
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 05e6165..89ee95c 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -63,7 +63,7 @@ iconview {
   color: #5c616c;
   background-color: #ffffff; }
   iconview:selected, iconview:selected:focus {
-    border-radius: 3px; }
+    border-radius: 2px; }
 
 rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband {
@@ -158,8 +158,8 @@ entry {
     border-color: #cfd6e6;
     background-color: #ffffff;
     background-image: linear-gradient(to bottom, #ffffff);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0; }
   entry:focus {
@@ -178,7 +178,7 @@ entry {
     background-color: #5294E2;
     color: #ffffff; }
   entry progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -420,13 +420,25 @@ button {
       background-color: rgba(251, 251, 252, 0.55); }
       button.destructive-action:disabled > label {
         color: inherit; }
+  button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   button.text-button {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button label:first-child {
-    padding-left: 8px; }
-  button.text-button.image-button label:last-child {
-    padding-right: 8px; }
+  button.text-button.image-button {
+    padding-left: 0;
+    padding-right: 0; }
+    button.text-button.image-button label:first-child {
+      padding-left: 12px;
+      padding-right: 0; }
+    button.text-button.image-button label:last-child {
+      padding-left: 0;
+      padding-right: 12px; }
+    button.text-button.image-button image {
+      padding-left: 6px;
+      padding-right: 6px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -723,6 +735,9 @@ button:link > label, button:visited > label {
 spinbutton button:active {
   color: #ffffff; }
 
+spinbutton:disabled {
+  color: rgba(92, 97, 108, 0.55); }
+
 spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
   padding-top: 0;
   padding-bottom: 0;
@@ -1257,12 +1272,6 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); }
 
-.path-bar button:first-child {
-  padding-left: 10px; }
-
-.path-bar button:last-child {
-  padding-right: 10px; }
-
 .path-bar button:only-child {
   padding-left: 10px;
   padding-right: 10px; }
@@ -1326,36 +1335,41 @@ treeview.view {
     border-radius: 3px;
     border-width: 0; }
   treeview.view header button {
+    min-height: 0;
+    min-width: 0;
+    padding: 3px 6px;
+    font-weight: bold;
     color: #7d8189;
     background-color: #ffffff;
-    font-weight: bold; }
+    background-image: none;
+    border-style: none solid none none;
+    border-radius: 0;
+    border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
     treeview.view header button:hover {
       color: #5294E2; }
     treeview.view header button:active {
       color: #5c616c; }
-    treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover {
-      transition: none;
-      color: #5294E2;
-      box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; }
-
-treeview.view header button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
-  treeview.view header button:active, treeview.view header button:hover {
-    background-color: #ffffff; }
-  treeview.view header button:active:hover {
-    color: #5c616c; }
-  treeview.view header button:disabled {
-    border-color: #F5F6F7;
-    background-image: none; }
-  treeview.view header button:last-child {
-    border-right-style: none;
-    border-image: none; }
+    treeview.view header button:active, treeview.view header button:hover {
+      background-color: #ffffff; }
+    treeview.view header button:active:hover {
+      color: #5c616c; }
+    treeview.view header button:disabled {
+      border-color: #F5F6F7;
+      background-image: none; }
+    treeview.view header button:last-child {
+      border-right-style: none;
+      border-image: none; }
+  treeview.view button.dnd, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd:active,
+  treeview.view header.button.dnd,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd:active {
+    padding: 0 6px;
+    transition: none;
+    color: #ffffff;
+    background-color: #5294E2;
+    border-radius: 0;
+    border-style: none; }
 
 menubar,
 .menubar {
@@ -2052,6 +2066,14 @@ levelbar block.empty {
   background-color: rgba(92, 97, 108, 0.2);
   border-color: rgba(92, 97, 108, 0.2); }
 
+printdialog paper {
+  border: 1px solid #dcdfe3;
+  background: white;
+  padding: 0; }
+
+printdialog .dialog-action-box {
+  margin: 12px; }
+
 frame border,
 .frame {
   margin: 0;
@@ -2063,11 +2085,6 @@ frame border,
   .frame.flat {
     border-style: none; }
 
-paper {
-  border: 1px solid #dcdfe3;
-  background: white;
-  padding: 0; }
-
 scrolledwindow viewport.frame, placessidebar viewport.frame {
   border-style: none; }
 
@@ -2296,9 +2313,12 @@ messagedialog.csd .dialog-action-area button:only-child {
   border-left-style: none;
   border-right-style: none; }
 
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
+
 .sidebar, .sidebar .view {
   border: none;
-  background-color: #F5F6F7; }
+  background-color: #fbfbfc; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2312,9 +2332,10 @@ placessidebar list {
   background-color: transparent; }
 
 placessidebar row {
+  min-height: 30px;
   padding: 0px; }
   placessidebar row > revealer {
-    padding: 8px 10px; }
+    padding: 0 10px; }
   placessidebar row image.sidebar-icon:dir(ltr) {
     padding-right: 8px; }
   placessidebar row image.sidebar-icon:dir(rtl) {
@@ -2324,8 +2345,10 @@ placessidebar row {
   placessidebar row label.sidebar-label:dir(rtl) {
     padding-left: 2px; }
   button.sidebar-button {
-    min-width: 26px;
-    min-height: 26px;
+    min-width: 22px;
+    min-height: 22px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     padding: 0;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
@@ -2521,16 +2544,11 @@ button.color {
   .content-view:hover {
     -gtk-icon-effect: highlight; }
 
-.scale-popup button {
-  padding: 6px; }
-  .scale-popup button:hover {
-    color: #5c616c;
-    outline-color: rgba(92, 97, 108, 0.3);
-    border-color: #cfd6e6;
-    background-color: white; }
-
-button.scale {
-  padding: 8px; }
+.scale-popup button:hover {
+  color: #5c616c;
+  outline-color: rgba(92, 97, 108, 0.3);
+  border-color: #cfd6e6;
+  background-color: white; }
 
 .context-menu, popover.touch-selection,
 popover.background.touch-selection {
@@ -2551,12 +2569,14 @@ button.circular-button {
     padding: 0; }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+  padding: 3px 6px 4px 6px;
+  color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #dcdfe3;
-  border-radius: 2px;
-  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05);
-  color: #5c616c;
-  padding: 3px 8px 3px 8px; }
+  border-radius: 2.5px;
+  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05); }
 
 stackswitcher button.text-button {
   min-width: 80px; }
@@ -2566,7 +2586,8 @@ stackswitcher button.circular {
 
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black; }
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black; }
 
 decoration {
   border-radius: 3px 3px 0 0;
@@ -2575,15 +2596,16 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 8px 8px 0 transparent, 0 5px 5px 0 rgba(0, 0, 0, 0.2); }
+  .fullscreen decoration,
   .tiled decoration {
     border-radius: 0; }
   .popup decoration, decoration.popup {
     box-shadow: none;
     border-radius: 0; }
-  .ssd decoration, decoration.ssd {
+  .ssd decoration {
     border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); }
-    .ssd decoration.maximized, decoration.ssd.maximized {
+    .ssd decoration.maximized {
       border-radius: 0; }
   .csd.popup decoration {
     border-radius: 2px;
@@ -3418,16 +3440,16 @@ GtkListBox .h4 {
 
 .nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
   background: #353945; }
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar paned > separator:dir(ltr), .nautilus-window .sidebar .view paned > separator:dir(ltr), .sidebar .view .nautilus-window paned > separator:dir(ltr) {
+    margin-left: -1px; }
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl), .nautilus-window .sidebar .view paned > separator:dir(rtl), .sidebar .view .nautilus-window paned > separator:dir(rtl) {
+    margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
   background-color: transparent; }
 
 .nautilus-window placessidebar.sidebar {
   background-color: #353945; }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    margin-right: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    margin-left: -1px; }
   .nautilus-window placessidebar.sidebar row.sidebar-placeholder-row {
     border: 1px solid #5294E2; }
   .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
@@ -3447,21 +3469,25 @@ GtkListBox .h4 {
 .nautilus-window.maximized placessidebar.sidebar {
   background-color: #353945; }
 
-.nautilus-window .sidebar-button.button {
+.nautilus-window button.sidebar-button {
   color: #BAC3CF; }
-  .nautilus-window .sidebar-button.button:hover {
+  .nautilus-window button.sidebar-button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.4);
     background-color: rgba(119, 127, 151, 0.5); }
-  .nautilus-window .sidebar-button.button:active {
+  .nautilus-window button.sidebar-button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
+    border-color: #5294E2;
     background-color: #5294E2; }
-  .nautilus-window .sidebar-button.button:not(:hover):not(:active) > image {
+  .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index dc743e6..49866e7 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -63,7 +63,7 @@ iconview {
   color: #5c616c;
   background-color: #ffffff; }
   iconview:selected, iconview:selected:focus {
-    border-radius: 3px; }
+    border-radius: 2px; }
 
 rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband {
@@ -158,8 +158,8 @@ entry {
     border-color: #cfd6e6;
     background-color: #ffffff;
     background-image: linear-gradient(to bottom, #ffffff);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0; }
   entry:focus {
@@ -178,7 +178,7 @@ entry {
     background-color: #5294E2;
     color: #ffffff; }
   entry progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -420,13 +420,25 @@ button {
       background-color: rgba(251, 251, 252, 0.55); }
       button.destructive-action:disabled > label {
         color: inherit; }
+  button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   button.text-button {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button label:first-child {
-    padding-left: 8px; }
-  button.text-button.image-button label:last-child {
-    padding-right: 8px; }
+  button.text-button.image-button {
+    padding-left: 0;
+    padding-right: 0; }
+    button.text-button.image-button label:first-child {
+      padding-left: 12px;
+      padding-right: 0; }
+    button.text-button.image-button label:last-child {
+      padding-left: 0;
+      padding-right: 12px; }
+    button.text-button.image-button image {
+      padding-left: 6px;
+      padding-right: 6px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -723,6 +735,9 @@ button:link > label, button:visited > label {
 spinbutton button:active {
   color: #ffffff; }
 
+spinbutton:disabled {
+  color: rgba(92, 97, 108, 0.55); }
+
 spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
   padding-top: 0;
   padding-bottom: 0;
@@ -1261,12 +1276,6 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); }
 
-.path-bar button:first-child {
-  padding-left: 10px; }
-
-.path-bar button:last-child {
-  padding-right: 10px; }
-
 .path-bar button:only-child {
   padding-left: 10px;
   padding-right: 10px; }
@@ -1330,36 +1339,41 @@ treeview.view {
     border-radius: 3px;
     border-width: 0; }
   treeview.view header button {
+    min-height: 0;
+    min-width: 0;
+    padding: 3px 6px;
+    font-weight: bold;
     color: #7d8189;
     background-color: #ffffff;
-    font-weight: bold; }
+    background-image: none;
+    border-style: none solid none none;
+    border-radius: 0;
+    border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
     treeview.view header button:hover {
       color: #5294E2; }
     treeview.view header button:active {
       color: #5c616c; }
-    treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover {
-      transition: none;
-      color: #5294E2;
-      box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; }
-
-treeview.view header button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
-  treeview.view header button:active, treeview.view header button:hover {
-    background-color: #ffffff; }
-  treeview.view header button:active:hover {
-    color: #5c616c; }
-  treeview.view header button:disabled {
-    border-color: #F5F6F7;
-    background-image: none; }
-  treeview.view header button:last-child {
-    border-right-style: none;
-    border-image: none; }
+    treeview.view header button:active, treeview.view header button:hover {
+      background-color: #ffffff; }
+    treeview.view header button:active:hover {
+      color: #5c616c; }
+    treeview.view header button:disabled {
+      border-color: #F5F6F7;
+      background-image: none; }
+    treeview.view header button:last-child {
+      border-right-style: none;
+      border-image: none; }
+  treeview.view button.dnd, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd:active,
+  treeview.view header.button.dnd,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd:active {
+    padding: 0 6px;
+    transition: none;
+    color: #ffffff;
+    background-color: #5294E2;
+    border-radius: 0;
+    border-style: none; }
 
 menubar,
 .menubar {
@@ -2056,6 +2070,14 @@ levelbar block.empty {
   background-color: rgba(92, 97, 108, 0.2);
   border-color: rgba(92, 97, 108, 0.2); }
 
+printdialog paper {
+  border: 1px solid #dcdfe3;
+  background: white;
+  padding: 0; }
+
+printdialog .dialog-action-box {
+  margin: 12px; }
+
 frame border,
 .frame {
   margin: 0;
@@ -2067,11 +2089,6 @@ frame border,
   .frame.flat {
     border-style: none; }
 
-paper {
-  border: 1px solid #dcdfe3;
-  background: white;
-  padding: 0; }
-
 scrolledwindow viewport.frame, placessidebar viewport.frame {
   border-style: none; }
 
@@ -2300,9 +2317,12 @@ messagedialog.csd .dialog-action-area button:only-child {
   border-left-style: none;
   border-right-style: none; }
 
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
+
 .sidebar, .sidebar .view {
   border: none;
-  background-color: #F5F6F7; }
+  background-color: #fbfbfc; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2316,9 +2336,10 @@ placessidebar list {
   background-color: transparent; }
 
 placessidebar row {
+  min-height: 30px;
   padding: 0px; }
   placessidebar row > revealer {
-    padding: 8px 10px; }
+    padding: 0 10px; }
   placessidebar row image.sidebar-icon:dir(ltr) {
     padding-right: 8px; }
   placessidebar row image.sidebar-icon:dir(rtl) {
@@ -2328,8 +2349,10 @@ placessidebar row {
   placessidebar row label.sidebar-label:dir(rtl) {
     padding-left: 2px; }
   button.sidebar-button {
-    min-width: 26px;
-    min-height: 26px;
+    min-width: 22px;
+    min-height: 22px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     padding: 0;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
@@ -2525,16 +2548,11 @@ button.color {
   .content-view:hover {
     -gtk-icon-effect: highlight; }
 
-.scale-popup button {
-  padding: 6px; }
-  .scale-popup button:hover {
-    color: #5c616c;
-    outline-color: rgba(92, 97, 108, 0.3);
-    border-color: #cfd6e6;
-    background-color: white; }
-
-button.scale {
-  padding: 8px; }
+.scale-popup button:hover {
+  color: #5c616c;
+  outline-color: rgba(92, 97, 108, 0.3);
+  border-color: #cfd6e6;
+  background-color: white; }
 
 .context-menu, popover.touch-selection,
 popover.background.touch-selection {
@@ -2555,12 +2573,14 @@ button.circular-button {
     padding: 0; }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+  padding: 3px 6px 4px 6px;
+  color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #dcdfe3;
-  border-radius: 2px;
-  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05);
-  color: #5c616c;
-  padding: 3px 8px 3px 8px; }
+  border-radius: 2.5px;
+  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05); }
 
 stackswitcher button.text-button {
   min-width: 80px; }
@@ -2570,7 +2590,8 @@ stackswitcher button.circular {
 
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black; }
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black; }
 
 decoration {
   border-radius: 4px 4px 0 0;
@@ -2579,15 +2600,16 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 transparent, 0 5px 5px 0 rgba(0, 0, 0, 0.2); }
+  .fullscreen decoration,
   .tiled decoration {
     border-radius: 0; }
   .popup decoration, decoration.popup {
     box-shadow: none;
     border-radius: 0; }
-  .ssd decoration, decoration.ssd {
+  .ssd decoration {
     border-radius: 4px 4px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); }
-    .ssd decoration.maximized, decoration.ssd.maximized {
+    .ssd decoration.maximized {
       border-radius: 0; }
   .csd.popup decoration {
     border-radius: 2px;
@@ -3422,16 +3444,16 @@ GtkListBox .h4 {
 
 .nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
   background: #353945; }
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar paned > separator:dir(ltr), .nautilus-window .sidebar .view paned > separator:dir(ltr), .sidebar .view .nautilus-window paned > separator:dir(ltr) {
+    margin-left: -1px; }
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl), .nautilus-window .sidebar .view paned > separator:dir(rtl), .sidebar .view .nautilus-window paned > separator:dir(rtl) {
+    margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
   background-color: transparent; }
 
 .nautilus-window placessidebar.sidebar {
   background-color: #353945; }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    margin-right: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    margin-left: -1px; }
   .nautilus-window placessidebar.sidebar row.sidebar-placeholder-row {
     border: 1px solid #5294E2; }
   .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
@@ -3451,21 +3473,25 @@ GtkListBox .h4 {
 .nautilus-window.maximized placessidebar.sidebar {
   background-color: #353945; }
 
-.nautilus-window .sidebar-button.button {
+.nautilus-window button.sidebar-button {
   color: #BAC3CF; }
-  .nautilus-window .sidebar-button.button:hover {
+  .nautilus-window button.sidebar-button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.4);
     background-color: rgba(119, 127, 151, 0.5); }
-  .nautilus-window .sidebar-button.button:active {
+  .nautilus-window button.sidebar-button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
+    border-color: #5294E2;
     background-color: #5294E2; }
-  .nautilus-window .sidebar-button.button:not(:hover):not(:active) > image {
+  .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 96e18c3..84e4ad4 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -63,7 +63,7 @@ iconview {
   color: #5c616c;
   background-color: #ffffff; }
   iconview:selected, iconview:selected:focus {
-    border-radius: 3px; }
+    border-radius: 2px; }
 
 rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband {
@@ -158,8 +158,8 @@ entry {
     border-color: #cfd6e6;
     background-color: #ffffff;
     background-image: linear-gradient(to bottom, #ffffff);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0; }
   entry:focus {
@@ -178,7 +178,7 @@ entry {
     background-color: #5294E2;
     color: #ffffff; }
   entry progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -420,13 +420,25 @@ button {
       background-color: rgba(251, 251, 252, 0.55); }
       button.destructive-action:disabled > label {
         color: inherit; }
+  button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   button.text-button {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button label:first-child {
-    padding-left: 8px; }
-  button.text-button.image-button label:last-child {
-    padding-right: 8px; }
+  button.text-button.image-button {
+    padding-left: 0;
+    padding-right: 0; }
+    button.text-button.image-button label:first-child {
+      padding-left: 12px;
+      padding-right: 0; }
+    button.text-button.image-button label:last-child {
+      padding-left: 0;
+      padding-right: 12px; }
+    button.text-button.image-button image {
+      padding-left: 6px;
+      padding-right: 6px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -723,6 +735,9 @@ button:link > label, button:visited > label {
 spinbutton button:active {
   color: #ffffff; }
 
+spinbutton:disabled {
+  color: rgba(92, 97, 108, 0.55); }
+
 spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
   padding-top: 0;
   padding-bottom: 0;
@@ -1261,12 +1276,6 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); }
 
-.path-bar button:first-child {
-  padding-left: 10px; }
-
-.path-bar button:last-child {
-  padding-right: 10px; }
-
 .path-bar button:only-child {
   padding-left: 10px;
   padding-right: 10px; }
@@ -1330,36 +1339,41 @@ treeview.view {
     border-radius: 3px;
     border-width: 0; }
   treeview.view header button {
+    min-height: 0;
+    min-width: 0;
+    padding: 3px 6px;
+    font-weight: bold;
     color: #7d8189;
     background-color: #ffffff;
-    font-weight: bold; }
+    background-image: none;
+    border-style: none solid none none;
+    border-radius: 0;
+    border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
     treeview.view header button:hover {
       color: #5294E2; }
     treeview.view header button:active {
       color: #5c616c; }
-    treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover {
-      transition: none;
-      color: #5294E2;
-      box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; }
-
-treeview.view header button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; }
-  treeview.view header button:active, treeview.view header button:hover {
-    background-color: #ffffff; }
-  treeview.view header button:active:hover {
-    color: #5c616c; }
-  treeview.view header button:disabled {
-    border-color: #F5F6F7;
-    background-image: none; }
-  treeview.view header button:last-child {
-    border-right-style: none;
-    border-image: none; }
+    treeview.view header button:active, treeview.view header button:hover {
+      background-color: #ffffff; }
+    treeview.view header button:active:hover {
+      color: #5c616c; }
+    treeview.view header button:disabled {
+      border-color: #F5F6F7;
+      background-image: none; }
+    treeview.view header button:last-child {
+      border-right-style: none;
+      border-image: none; }
+  treeview.view button.dnd, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd:active,
+  treeview.view header.button.dnd,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd:active {
+    padding: 0 6px;
+    transition: none;
+    color: #ffffff;
+    background-color: #5294E2;
+    border-radius: 0;
+    border-style: none; }
 
 menubar,
 .menubar {
@@ -2056,6 +2070,14 @@ levelbar block.empty {
   background-color: rgba(92, 97, 108, 0.2);
   border-color: rgba(92, 97, 108, 0.2); }
 
+printdialog paper {
+  border: 1px solid #dcdfe3;
+  background: white;
+  padding: 0; }
+
+printdialog .dialog-action-box {
+  margin: 12px; }
+
 frame border,
 .frame {
   margin: 0;
@@ -2067,11 +2089,6 @@ frame border,
   .frame.flat {
     border-style: none; }
 
-paper {
-  border: 1px solid #dcdfe3;
-  background: white;
-  padding: 0; }
-
 scrolledwindow viewport.frame, placessidebar viewport.frame {
   border-style: none; }
 
@@ -2300,9 +2317,12 @@ messagedialog.csd .dialog-action-area button:only-child {
   border-left-style: none;
   border-right-style: none; }
 
+filechooser #pathbarbox {
+  border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
+
 .sidebar, .sidebar .view {
   border: none;
-  background-color: #F5F6F7; }
+  background-color: #fbfbfc; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2316,9 +2336,10 @@ placessidebar list {
   background-color: transparent; }
 
 placessidebar row {
+  min-height: 30px;
   padding: 0px; }
   placessidebar row > revealer {
-    padding: 8px 10px; }
+    padding: 0 10px; }
   placessidebar row image.sidebar-icon:dir(ltr) {
     padding-right: 8px; }
   placessidebar row image.sidebar-icon:dir(rtl) {
@@ -2328,8 +2349,10 @@ placessidebar row {
   placessidebar row label.sidebar-label:dir(rtl) {
     padding-left: 2px; }
   button.sidebar-button {
-    min-width: 26px;
-    min-height: 26px;
+    min-width: 22px;
+    min-height: 22px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     padding: 0;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
@@ -2525,16 +2548,11 @@ button.color {
   .content-view:hover {
     -gtk-icon-effect: highlight; }
 
-.scale-popup button {
-  padding: 6px; }
-  .scale-popup button:hover {
-    color: #5c616c;
-    outline-color: rgba(92, 97, 108, 0.3);
-    border-color: #cfd6e6;
-    background-color: white; }
-
-button.scale {
-  padding: 8px; }
+.scale-popup button:hover {
+  color: #5c616c;
+  outline-color: rgba(92, 97, 108, 0.3);
+  border-color: #cfd6e6;
+  background-color: white; }
 
 .context-menu, popover.touch-selection,
 popover.background.touch-selection {
@@ -2555,12 +2573,14 @@ button.circular-button {
     padding: 0; }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+  padding: 3px 6px 4px 6px;
+  color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #dcdfe3;
-  border-radius: 2px;
-  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05);
-  color: #5c616c;
-  padding: 3px 8px 3px 8px; }
+  border-radius: 2.5px;
+  box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.05); }
 
 stackswitcher button.text-button {
   min-width: 80px; }
@@ -2570,7 +2590,8 @@ stackswitcher button.circular {
 
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black; }
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black; }
 
 decoration {
   border-radius: 4px 4px 0 0;
@@ -2579,15 +2600,16 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 transparent, 0 5px 5px 0 rgba(0, 0, 0, 0.2); }
+  .fullscreen decoration,
   .tiled decoration {
     border-radius: 0; }
   .popup decoration, decoration.popup {
     box-shadow: none;
     border-radius: 0; }
-  .ssd decoration, decoration.ssd {
+  .ssd decoration {
     border-radius: 4px 4px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); }
-    .ssd decoration.maximized, decoration.ssd.maximized {
+    .ssd decoration.maximized {
       border-radius: 0; }
   .csd.popup decoration {
     border-radius: 2px;
@@ -3422,16 +3444,16 @@ GtkListBox .h4 {
 
 .nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
   background: rgba(53, 57, 69, 0.95); }
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar paned > separator:dir(ltr), .nautilus-window .sidebar .view paned > separator:dir(ltr), .sidebar .view .nautilus-window paned > separator:dir(ltr) {
+    margin-left: -1px; }
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl), .nautilus-window .sidebar .view paned > separator:dir(rtl), .sidebar .view .nautilus-window paned > separator:dir(rtl) {
+    margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
   background-color: transparent; }
 
 .nautilus-window placessidebar.sidebar {
   background-color: rgba(53, 57, 69, 0.95); }
-  .nautilus-window placessidebar.sidebar:dir(ltr) {
-    margin-right: -1px; }
-  .nautilus-window placessidebar.sidebar:dir(rtl) {
-    margin-left: -1px; }
   .nautilus-window placessidebar.sidebar row.sidebar-placeholder-row {
     border: 1px solid #5294E2; }
   .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
@@ -3451,21 +3473,25 @@ GtkListBox .h4 {
 .nautilus-window.maximized placessidebar.sidebar {
   background-color: #353945; }
 
-.nautilus-window .sidebar-button.button {
+.nautilus-window button.sidebar-button {
   color: #BAC3CF; }
-  .nautilus-window .sidebar-button.button:hover {
+  .nautilus-window button.sidebar-button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.35);
     background-color: rgba(119, 127, 151, 0.45); }
-  .nautilus-window .sidebar-button.button:active {
+  .nautilus-window button.sidebar-button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
+    border-color: #5294E2;
     background-color: #5294E2; }
-  .nautilus-window .sidebar-button.button:not(:hover):not(:active) > image {
+  .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index af5935f..ee418a0 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -93,7 +93,7 @@ iconview {
 
   &:selected,
   &:selected:focus {
-    border-radius: 3px;
+    border-radius: 2px;
     @extend %selected_items;
   }
 }
@@ -216,8 +216,8 @@ entry {
 
   &.flat, &.flat:focus {
     @include entry(normal);
-    padding-left: 2px;
-    padding-right: 2px;
+    min-height: 0;
+    padding: 2px;
     border: none;
     border-radius: 0;
   }
@@ -236,7 +236,7 @@ entry {
   }
 
   progress {
-    margin: 2px 12px;
+    margin: 0 -6px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: $selected_bg_color;
@@ -421,6 +421,12 @@ button {
     }
   }
 
+  &.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0;
+  }
+
   &.text-button {
     padding-left: 16px;
     padding-right: 16px;
@@ -431,8 +437,24 @@ button {
     // to have the image-button padding, while the text side the text-button
     // one, so we're adding the missing padding to the label depending on
     // its position inside the button
-    label:first-child { padding-left: 8px; }
-    label:last-child { padding-right: 8px; }
+    padding-left: 0;
+    padding-right: 0;
+
+    label {
+      &:first-child {
+        padding-left: 12px;
+        padding-right: 0;
+      }
+      &:last-child {
+        padding-left: 0;
+        padding-right: 12px;
+      }
+    }
+
+    image {
+      padding-left: 6px;
+      padding-right: 6px;
+    }
   }
 
   .stack-switcher > & {
@@ -716,7 +738,9 @@ button:link, button:visited {
 // Spinbuttons
 //
 spinbutton {
+
   button:active { color: $selected_fg_color; }
+  &:disabled { color: $insensitive_fg_color; }
 
   &:not(.vertical) {
     button, entry {
@@ -1289,8 +1313,6 @@ headerbar {
 //
 .path-bar button {
 
-  &:first-child { padding-left: 10px; }
-  &:last-child { padding-right: 10px; }
   &:only-child {
     padding-left: 10px;
     padding-right: 10px;
@@ -1381,52 +1403,49 @@ treeview.view {
     button {
       $_column_header_color: mix($fg_color,$base_color,80%);
 
-      @extend %column_header_button;
+      min-height: 0;
+      min-width: 0;
+      padding: 3px 6px;
+      font-weight: bold;
 
       color: $_column_header_color;
       background-color: $base_color;
-      font-weight: bold;
-      &:hover {
-        color: $selected_bg_color;
-      }
-      &:active {
-        color: $fg_color;
+      background-image: none;
+      border-style: none solid none none;
+      border-radius: 0;
+      border-image: linear-gradient(to bottom,
+                                    $base_color 20%,
+                                    transparentize(if($variant == 'light', black, white), 0.89) 20%,
+                                    transparentize(if($variant == 'light', black, white), 0.89) 80%,
+                                    $base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch;
+
+      &:hover { color: $selected_bg_color; }
+      &:active { color: $fg_color; }
+
+      &:active, &:hover { background-color: $base_color; }
+      &:active:hover { color: $fg_color; }
+
+      &:disabled {
+        border-color: $bg_color;
+        background-image: none;
       }
-      &.dnd {
-        &, &:selected, &:hover {
-          transition: none;
-          color: $selected_bg_color;
-          box-shadow: inset 1px 1px 0 1px $selected_bg_color,
-                      inset -1px 0 0 1px $selected_bg_color,
-                      inset 1px 1px $base_color, inset -1px 0 $base_color;
-        }
+      &:last-child {
+        border-right-style: none;
+        border-image: none;
       }
     }
   }
-}
-
-%column_header_button {
-  min-height: 0;
-  min-width: 0;
-  padding: 3px 6px;
-  background-image: none;
-  border-style: none solid none none;
-  border-radius: 0;
-  border-image: linear-gradient(to bottom,
-                                $base_color 20%,
-                                transparentize(if($variant == 'light', black, white), 0.89) 20%,
-                                transparentize(if($variant == 'light', black, white), 0.89) 80%,
-                                $base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch;
 
-  &:active, &:hover { background-color: $base_color; }
-  &:active:hover { color: $fg_color; }
-  &:disabled {
-    border-color: $bg_color;
-    background-image: none;
-  }
-  &:last-child {
-    border-right-style: none;
-    border-image: none;
+  button.dnd,
+  header.button.dnd {
+    &, &:selected, &:hover, &:active {
+      padding: 0 6px;
+      transition: none;
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+      border-radius: 0;
+      border-style: none;
+    }
   }
 }
 
@@ -2161,6 +2180,19 @@ levelbar {
 }
 
 //
+// Print dialog
+//
+printdialog {
+  paper {
+    border: 1px solid $borders_color;
+    background: white;
+    padding: 0;
+  }
+
+  .dialog-action-box { margin: 12px; }
+}
+
+//
 // Frames
 //
 frame border,
@@ -2173,12 +2205,6 @@ frame border,
   padding: 0;
 }
 
-paper {
-  border: 1px solid $borders_color;
-  background: white;
-  padding: 0;
-}
-
 scrolledwindow {
   viewport.frame { // avoid double borders when viewport inside
                       // scrolled window
@@ -2386,11 +2412,18 @@ messagedialog { // Message Dialog styling
 }
 
 //
+// Filechooser
+//
+filechooser {
+  #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); }
+}
+
+//
 // Sidebar
 //
 .sidebar, .sidebar .view {
   border: none;
-  background-color: $bg_color;
+  background-color: lighten($bg_color, 2%);
 
   &:selected { @extend %selected_items; }
   separator { @extend separator; }
@@ -2418,11 +2451,12 @@ placessidebar {
 
   row {
     // Needs overriding of the GtkListBoxRow padding
+    min-height: 30px;
     padding: 0px;
     // Using margins/padding directly in the SidebarRow
     // will make the animation of the new bookmark row jump
     > revealer {
-      padding: 8px 10px;
+      padding: 0 10px;
     }
     image.sidebar-icon {
       &:dir(ltr) { padding-right: 8px; }
@@ -2433,12 +2467,15 @@ placessidebar {
       &:dir(rtl) { padding-left: 2px; }
     }
     @at-root button.sidebar-button {
-      min-width: 26px;
-      min-height: 26px;
+      min-width: 22px;
+      min-height: 22px;
+      margin-top: 2px;
+      margin-bottom: 2px;
       padding: 0;
       @extend button.flat;
       border-radius: 100%;
       -gtk-outline-radius: 100%;
+
       &:not(:hover):not(:active) > image { opacity: 0.5 };
     }
   }
@@ -2708,14 +2745,11 @@ button.color {
 }
 
 .scale-popup button { // +/- buttons on GtkVolumeButton popup
-  padding: 6px;
   &:hover {
     @include button(hover);
   }
 }
 
-button.scale { padding: 8px; }
-
 // Decouple the font of context menus from their entry/textview
 .context-menu { font: initial; }
 .monospace { font: Monospace; }
@@ -2735,12 +2769,16 @@ button.circular-button {
 }
 
 .keycap {
+  min-width: 16px;
+  min-height: 20px;
+
+  padding: 3px 6px 4px 6px;
+
+  color: $fg_color;
   background-color: $base_color;
   border: 1px solid $borders_color;
-  border-radius: 2px;
+  border-radius: 2.5px;
   box-shadow: inset 0px -2px 0px if($variant=='light', transparentize(black, 0.95), transparentize(black, 0.85));
-  color: $fg_color;
-  padding: 3px 8px 3px 8px;
 }
 
 stackswitcher button {
@@ -2753,7 +2791,8 @@ stackswitcher button {
 //
 *:drop(active):focus,
 *:drop(active) {
-  border: 1px solid black;
+  border-color: black;
+  box-shadow: inset 0 0 0 1px black;
 }
 
 //
@@ -2779,6 +2818,7 @@ decoration {
                 0 8px 8px 0 transparent,
                 0 5px 5px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2));
   }
+  .fullscreen &,
   .tiled & {
     border-radius: 0;
   }
@@ -2788,8 +2828,7 @@ decoration {
     border-radius: 0;
   }
   // server-side decorations as used by mutter
-  .ssd &,
-  &.ssd {
+  .ssd & {
     border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
     box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(black, 0.35), $_wm_border);
 
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 3734c75..ed3f0db 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -3,7 +3,12 @@
 //GtkFileChooserDialog,
 //NemoWindow,
 .nautilus-window {
-  paned > separator { background: $dark_sidebar_bg; }
+  paned > separator {
+    background: $dark_sidebar_border;
+
+    &:dir(ltr) { margin-left: -1px; }
+    &:dir(rtl) { margin-right: -1px; }
+  }
 }
 
 // Dark transparent sidebars
@@ -14,14 +19,6 @@
 
   placessidebar.sidebar {
 
-    &:dir(ltr) { margin-right: -1px; }
-    &:dir(rtl) { margin-left: -1px; }
-
-    @if $variant=='dark' {
-      &:dir(ltr) { border-right: 1px solid $dark_sidebar_border; }
-      &:dir(rtl) { border-left: 1px solid $dark_sidebar_border; }
-    }
-
     background-color: $dark_sidebar_bg;
 
     row.sidebar-placeholder-row { border: 1px solid $selected_bg_color; }
@@ -49,14 +46,20 @@
 
   &.maximized placessidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); }
 
-  .sidebar-button.button {
+  button.sidebar-button {
     color: $dark_sidebar_fg;
 
     &:hover { @include button(osd-hover); }
-    &:active { @include button(osd-active); }
+    &:active { @include button(active); }
 
     &:not(:hover):not(:active) > image { opacity: 0.5 };
   }
+
+  searchbar {
+    // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096
+    border-color: transparent;
+    box-shadow: inset 0 -1px $borders_color;
+  }
 }