add border to sidebars

7 files changed, 263 insertions, 233 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 5a4345f..75728f6 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -93,10 +93,6 @@ popover.background label.separator, headerbar .subtitle {
 assistant .sidebar {
   background-color: #404552;
   border-top: 1px solid #2b2e39; }
-  assistant .sidebar:dir(ltr) {
-    border-right: 1px solid #2b2e39; }
-  assistant .sidebar:dir(rtl) {
-    border-left: 1px solid #2b2e39; }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -245,7 +241,7 @@ button {
   outline-color: rgba(211, 218, 227, 0.3);
   border-color: #2b2e39;
   background-color: #444a58; }
-  button separator, button .sidebar separator, .sidebar button separator, button .sidebar .view separator, .sidebar .view button separator {
+  button separator, button .sidebar separator, .sidebar button separator {
     margin: 4px 1px; }
   button.flat, button.sidebar-button {
     border-color: transparent;
@@ -781,11 +777,11 @@ toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #383C4A; }
-  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator, toolbar .sidebar .view separator, .sidebar .view toolbar separator, .inline-toolbar .sidebar .view separator, .sidebar .view .inline-toolbar separator {
+  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator {
     background: none; }
-  toolbar.horizontal separator, .horizontal.inline-toolbar separator, toolbar.horizontal .sidebar .view separator, .sidebar .view toolbar.horizontal separator {
+  toolbar.horizontal separator, .horizontal.inline-toolbar separator {
     margin: 0 6px; }
-  toolbar.vertical separator, .vertical.inline-toolbar separator, toolbar.vertical .sidebar .view separator, .sidebar .view toolbar.vertical separator {
+  toolbar.vertical separator, .vertical.inline-toolbar separator {
     margin: 6px 0; }
   .osd toolbar, .osd .inline-toolbar, toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
@@ -933,10 +929,10 @@ headerbar {
     padding: 0;
     border: none;
     background: none; }
-  .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
+  .titlebar separator {
     background-color: rgba(38, 42, 51, 0.97); }
 
-paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+paned.titlebar separator {
   background-color: transparent; }
 
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
@@ -948,11 +944,11 @@ paned.titlebar > headerbar:first-child {
 paned.titlebar > headerbar:last-child {
   border-top-left-radius: 0; }
 
-headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
 
-.primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
+.primary-toolbar separator, headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
@@ -1413,12 +1409,8 @@ menu,
     padding: 4px 0px;
     border-radius: 2px;
     border: none; }
-  menu separator, menu .sidebar separator, .sidebar menu separator, menu .sidebar .view separator, .sidebar .view menu separator,
+  menu separator, menu .sidebar separator, .sidebar menu separator,
   .csd menu separator,
-  .csd menu .sidebar .view separator, .sidebar .view
-  .csd menu separator,
-  .menu separator,
-  .menu .sidebar .view separator, .sidebar .view
   .menu separator,
   .csd
   .menu separator {
@@ -1495,9 +1487,7 @@ popover.background {
   popover.background,
   popover.background {
     border: 1px solid #20222a; }
-  popover separator, popover .sidebar separator, .sidebar popover separator, popover .sidebar .view separator, .sidebar .view popover separator,
-  popover.background separator,
-  popover.background .sidebar .view separator, .sidebar .view
+  popover separator, popover .sidebar separator, .sidebar popover separator,
   popover.background separator {
     background-color: #383C4A; }
   popover > list,
@@ -2126,14 +2116,14 @@ printdialog paper {
 printdialog .dialog-action-box {
   margin: 12px; }
 
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
   border-radius: 0;
   border: 1px solid #2b2e39;
   padding: 0; }
-  frame border.flat,
+  frame > border.flat,
   .frame.flat {
     border-style: none; }
 
@@ -2223,7 +2213,7 @@ scrolledwindow junction, placessidebar junction {
   scrolledwindow junction:dir(rtl), placessidebar junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
 
-separator, .sidebar separator, .sidebar .view separator {
+separator, .sidebar separator {
   background-color: rgba(0, 0, 0, 0.1);
   min-width: 1px;
   min-height: 1px; }
@@ -2367,9 +2357,20 @@ messagedialog.csd .dialog-action-area button:only-child {
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(43, 46, 57, 0.5); }
 
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: #3c4150; }
+  stacksidebar.sidebar:dir(ltr) list,
+  stacksidebar.sidebar.left list,
+  stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
+    border-right: 1px solid #2b2e39;
+    border-left-style: none; }
+  stacksidebar.sidebar:dir(rtl) list,
+  stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.left {
+    border-left: 1px solid #2b2e39;
+    border-right-style: none; }
+  paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+    border-style: none; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2419,7 +2420,7 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
+paned > separator, .sidebar paned > separator {
   min-width: 1px;
   min-height: 1px;
   -gtk-icon-source: none;
@@ -2427,9 +2428,9 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
   background-color: transparent;
   background-image: linear-gradient(to top, #2b2e39);
   background-size: 1px 1px; }
-  paned > separator:selected, .sidebar paned > separator:selected, .sidebar .view paned > separator:selected {
+  paned > separator:selected, .sidebar paned > separator:selected {
     background-image: linear-gradient(to top, #5294E2); }
-  paned > separator.wide, .sidebar paned > separator.wide, .sidebar .view paned > separator.wide {
+  paned > separator.wide, .sidebar paned > separator.wide {
     margin: 0;
     padding: 0;
     min-width: 5px;
@@ -2437,26 +2438,26 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
     background-image: linear-gradient(to top, #2b2e39), linear-gradient(to top, #2b2e39);
     background-size: 1px 1px, 1px 1px; }
 
-paned.horizontal > separator, .sidebar paned.horizontal > separator, .sidebar .view paned.horizontal > separator {
+paned.horizontal > separator, .sidebar paned.horizontal > separator {
   background-repeat: repeat-y; }
-  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr), .sidebar .view paned.horizontal > separator:dir(ltr) {
+  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr) {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
     background-position: left; }
-  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl), .sidebar .view paned.horizontal > separator:dir(rtl) {
+  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl) {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
     background-position: right; }
-  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide, .sidebar .view paned.horizontal > separator.wide {
+  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide {
     background-repeat: repeat-y, repeat-y;
     background-position: left, right; }
 
-paned.vertical > separator, .sidebar paned.vertical > separator, .sidebar .view paned.vertical > separator {
+paned.vertical > separator, .sidebar paned.vertical > separator {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0;
   background-repeat: repeat-x;
   background-position: top; }
-  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide, .sidebar .view paned.vertical > separator.wide {
+  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide {
     background-repeat: repeat-x, repeat-x;
     background-position: bottom, top; }
 
@@ -2762,7 +2763,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -3382,11 +3383,11 @@ GtkListBox .h4 {
   border-bottom-width: 0;
   font: bold; }
 
-.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
+.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator {
   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) {
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl) {
     margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index fd8bfff..b261d53 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -93,10 +93,6 @@ popover.background label.separator, headerbar .subtitle {
 assistant .sidebar {
   background-color: #ffffff;
   border-top: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(ltr) {
-    border-right: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(rtl) {
-    border-left: 1px solid #dcdfe3; }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -244,7 +240,7 @@ button {
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #cfd6e6;
   background-color: #fbfbfc; }
-  button separator, button .sidebar separator, .sidebar button separator, button .sidebar .view separator, .sidebar .view button separator {
+  button separator, button .sidebar separator, .sidebar button separator {
     margin: 4px 1px; }
   button.flat, button.sidebar-button {
     border-color: transparent;
@@ -780,11 +776,11 @@ toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #F5F6F7; }
-  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator, toolbar .sidebar .view separator, .sidebar .view toolbar separator, .inline-toolbar .sidebar .view separator, .sidebar .view .inline-toolbar separator {
+  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator {
     background: none; }
-  toolbar.horizontal separator, .horizontal.inline-toolbar separator, toolbar.horizontal .sidebar .view separator, .sidebar .view toolbar.horizontal separator {
+  toolbar.horizontal separator, .horizontal.inline-toolbar separator {
     margin: 0 6px; }
-  toolbar.vertical separator, .vertical.inline-toolbar separator, toolbar.vertical .sidebar .view separator, .sidebar .view toolbar.vertical separator {
+  toolbar.vertical separator, .vertical.inline-toolbar separator {
     margin: 6px 0; }
   .osd toolbar, .osd .inline-toolbar, toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
@@ -932,10 +928,10 @@ headerbar {
     padding: 0;
     border: none;
     background: none; }
-  .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
+  .titlebar separator {
     background-color: rgba(38, 42, 51, 0.97); }
 
-paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+paned.titlebar separator {
   background-color: transparent; }
 
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
@@ -947,11 +943,11 @@ paned.titlebar > headerbar:first-child {
 paned.titlebar > headerbar:last-child {
   border-top-left-radius: 0; }
 
-headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
 
-.primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
+.primary-toolbar separator, headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
@@ -1412,12 +1408,8 @@ menu,
     padding: 4px 0px;
     border-radius: 2px;
     border: none; }
-  menu separator, menu .sidebar separator, .sidebar menu separator, menu .sidebar .view separator, .sidebar .view menu separator,
+  menu separator, menu .sidebar separator, .sidebar menu separator,
   .csd menu separator,
-  .csd menu .sidebar .view separator, .sidebar .view
-  .csd menu separator,
-  .menu separator,
-  .menu .sidebar .view separator, .sidebar .view
   .menu separator,
   .csd
   .menu separator {
@@ -1494,9 +1486,7 @@ popover.background {
   popover.background,
   popover.background {
     border: 1px solid #cdd2d7; }
-  popover separator, popover .sidebar separator, .sidebar popover separator, popover .sidebar .view separator, .sidebar .view popover separator,
-  popover.background separator,
-  popover.background .sidebar .view separator, .sidebar .view
+  popover separator, popover .sidebar separator, .sidebar popover separator,
   popover.background separator {
     background-color: #ffffff; }
   popover > list,
@@ -2125,14 +2115,14 @@ printdialog paper {
 printdialog .dialog-action-box {
   margin: 12px; }
 
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3;
   padding: 0; }
-  frame border.flat,
+  frame > border.flat,
   .frame.flat {
     border-style: none; }
 
@@ -2222,7 +2212,7 @@ scrolledwindow junction, placessidebar junction {
   scrolledwindow junction:dir(rtl), placessidebar junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
 
-separator, .sidebar separator, .sidebar .view separator {
+separator, .sidebar separator {
   background-color: rgba(0, 0, 0, 0.1);
   min-width: 1px;
   min-height: 1px; }
@@ -2366,9 +2356,20 @@ messagedialog.csd .dialog-action-area button:only-child {
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
 
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: #fbfbfc; }
+  stacksidebar.sidebar:dir(ltr) list,
+  stacksidebar.sidebar.left list,
+  stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
+    border-right: 1px solid #dcdfe3;
+    border-left-style: none; }
+  stacksidebar.sidebar:dir(rtl) list,
+  stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.left {
+    border-left: 1px solid #dcdfe3;
+    border-right-style: none; }
+  paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+    border-style: none; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2418,7 +2419,7 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
+paned > separator, .sidebar paned > separator {
   min-width: 1px;
   min-height: 1px;
   -gtk-icon-source: none;
@@ -2426,9 +2427,9 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
   background-color: transparent;
   background-image: linear-gradient(to top, #dcdfe3);
   background-size: 1px 1px; }
-  paned > separator:selected, .sidebar paned > separator:selected, .sidebar .view paned > separator:selected {
+  paned > separator:selected, .sidebar paned > separator:selected {
     background-image: linear-gradient(to top, #5294E2); }
-  paned > separator.wide, .sidebar paned > separator.wide, .sidebar .view paned > separator.wide {
+  paned > separator.wide, .sidebar paned > separator.wide {
     margin: 0;
     padding: 0;
     min-width: 5px;
@@ -2436,26 +2437,26 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
     background-image: linear-gradient(to top, #dcdfe3), linear-gradient(to top, #dcdfe3);
     background-size: 1px 1px, 1px 1px; }
 
-paned.horizontal > separator, .sidebar paned.horizontal > separator, .sidebar .view paned.horizontal > separator {
+paned.horizontal > separator, .sidebar paned.horizontal > separator {
   background-repeat: repeat-y; }
-  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr), .sidebar .view paned.horizontal > separator:dir(ltr) {
+  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr) {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
     background-position: left; }
-  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl), .sidebar .view paned.horizontal > separator:dir(rtl) {
+  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl) {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
     background-position: right; }
-  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide, .sidebar .view paned.horizontal > separator.wide {
+  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide {
     background-repeat: repeat-y, repeat-y;
     background-position: left, right; }
 
-paned.vertical > separator, .sidebar paned.vertical > separator, .sidebar .view paned.vertical > separator {
+paned.vertical > separator, .sidebar paned.vertical > separator {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0;
   background-repeat: repeat-x;
   background-position: top; }
-  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide, .sidebar .view paned.vertical > separator.wide {
+  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide {
     background-repeat: repeat-x, repeat-x;
     background-position: bottom, top; }
 
@@ -2761,7 +2762,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -3381,11 +3382,11 @@ GtkListBox .h4 {
   border-bottom-width: 0;
   font: bold; }
 
-.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
+.nautilus-window paned > separator, .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl) {
     margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
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 2ee3949..f0a17a2 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -93,10 +93,6 @@ popover.background label.separator, headerbar .subtitle {
 assistant .sidebar {
   background-color: #404552;
   border-top: 1px solid #2b2e39; }
-  assistant .sidebar:dir(ltr) {
-    border-right: 1px solid #2b2e39; }
-  assistant .sidebar:dir(rtl) {
-    border-left: 1px solid #2b2e39; }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -245,7 +241,7 @@ button {
   outline-color: rgba(211, 218, 227, 0.3);
   border-color: #2b2e39;
   background-color: #444a58; }
-  button separator, button .sidebar separator, .sidebar button separator, button .sidebar .view separator, .sidebar .view button separator {
+  button separator, button .sidebar separator, .sidebar button separator {
     margin: 4px 1px; }
   button.flat, button.sidebar-button {
     border-color: transparent;
@@ -781,11 +777,11 @@ toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #383C4A; }
-  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator, toolbar .sidebar .view separator, .sidebar .view toolbar separator, .inline-toolbar .sidebar .view separator, .sidebar .view .inline-toolbar separator {
+  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator {
     background: none; }
-  toolbar.horizontal separator, .horizontal.inline-toolbar separator, toolbar.horizontal .sidebar .view separator, .sidebar .view toolbar.horizontal separator {
+  toolbar.horizontal separator, .horizontal.inline-toolbar separator {
     margin: 0 6px; }
-  toolbar.vertical separator, .vertical.inline-toolbar separator, toolbar.vertical .sidebar .view separator, .sidebar .view toolbar.vertical separator {
+  toolbar.vertical separator, .vertical.inline-toolbar separator {
     margin: 6px 0; }
   .osd toolbar, .osd .inline-toolbar, toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
@@ -933,10 +929,10 @@ headerbar {
     padding: 0;
     border: none;
     background: none; }
-  .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
+  .titlebar separator {
     background-color: #262a33; }
 
-paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+paned.titlebar separator {
   background-color: transparent; }
 
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
@@ -948,11 +944,11 @@ paned.titlebar > headerbar:first-child {
 paned.titlebar > headerbar:last-child {
   border-top-left-radius: 0; }
 
-headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
 
-.primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
+.primary-toolbar separator, headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
@@ -1413,12 +1409,8 @@ menu,
     padding: 4px 0px;
     border-radius: 2px;
     border: none; }
-  menu separator, menu .sidebar separator, .sidebar menu separator, menu .sidebar .view separator, .sidebar .view menu separator,
+  menu separator, menu .sidebar separator, .sidebar menu separator,
   .csd menu separator,
-  .csd menu .sidebar .view separator, .sidebar .view
-  .csd menu separator,
-  .menu separator,
-  .menu .sidebar .view separator, .sidebar .view
   .menu separator,
   .csd
   .menu separator {
@@ -1495,9 +1487,7 @@ popover.background {
   popover.background,
   popover.background {
     border: 1px solid #20222a; }
-  popover separator, popover .sidebar separator, .sidebar popover separator, popover .sidebar .view separator, .sidebar .view popover separator,
-  popover.background separator,
-  popover.background .sidebar .view separator, .sidebar .view
+  popover separator, popover .sidebar separator, .sidebar popover separator,
   popover.background separator {
     background-color: #383C4A; }
   popover > list,
@@ -2126,14 +2116,14 @@ printdialog paper {
 printdialog .dialog-action-box {
   margin: 12px; }
 
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
   border-radius: 0;
   border: 1px solid #2b2e39;
   padding: 0; }
-  frame border.flat,
+  frame > border.flat,
   .frame.flat {
     border-style: none; }
 
@@ -2223,7 +2213,7 @@ scrolledwindow junction, placessidebar junction {
   scrolledwindow junction:dir(rtl), placessidebar junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
 
-separator, .sidebar separator, .sidebar .view separator {
+separator, .sidebar separator {
   background-color: rgba(0, 0, 0, 0.1);
   min-width: 1px;
   min-height: 1px; }
@@ -2367,9 +2357,20 @@ messagedialog.csd .dialog-action-area button:only-child {
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(43, 46, 57, 0.5); }
 
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: #3c4150; }
+  stacksidebar.sidebar:dir(ltr) list,
+  stacksidebar.sidebar.left list,
+  stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
+    border-right: 1px solid #2b2e39;
+    border-left-style: none; }
+  stacksidebar.sidebar:dir(rtl) list,
+  stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.left {
+    border-left: 1px solid #2b2e39;
+    border-right-style: none; }
+  paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+    border-style: none; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2419,7 +2420,7 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
+paned > separator, .sidebar paned > separator {
   min-width: 1px;
   min-height: 1px;
   -gtk-icon-source: none;
@@ -2427,9 +2428,9 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
   background-color: transparent;
   background-image: linear-gradient(to top, #2b2e39);
   background-size: 1px 1px; }
-  paned > separator:selected, .sidebar paned > separator:selected, .sidebar .view paned > separator:selected {
+  paned > separator:selected, .sidebar paned > separator:selected {
     background-image: linear-gradient(to top, #5294E2); }
-  paned > separator.wide, .sidebar paned > separator.wide, .sidebar .view paned > separator.wide {
+  paned > separator.wide, .sidebar paned > separator.wide {
     margin: 0;
     padding: 0;
     min-width: 5px;
@@ -2437,26 +2438,26 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
     background-image: linear-gradient(to top, #2b2e39), linear-gradient(to top, #2b2e39);
     background-size: 1px 1px, 1px 1px; }
 
-paned.horizontal > separator, .sidebar paned.horizontal > separator, .sidebar .view paned.horizontal > separator {
+paned.horizontal > separator, .sidebar paned.horizontal > separator {
   background-repeat: repeat-y; }
-  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr), .sidebar .view paned.horizontal > separator:dir(ltr) {
+  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr) {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
     background-position: left; }
-  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl), .sidebar .view paned.horizontal > separator:dir(rtl) {
+  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl) {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
     background-position: right; }
-  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide, .sidebar .view paned.horizontal > separator.wide {
+  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide {
     background-repeat: repeat-y, repeat-y;
     background-position: left, right; }
 
-paned.vertical > separator, .sidebar paned.vertical > separator, .sidebar .view paned.vertical > separator {
+paned.vertical > separator, .sidebar paned.vertical > separator {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0;
   background-repeat: repeat-x;
   background-position: top; }
-  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide, .sidebar .view paned.vertical > separator.wide {
+  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide {
     background-repeat: repeat-x, repeat-x;
     background-position: bottom, top; }
 
@@ -2762,7 +2763,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -3382,11 +3383,11 @@ GtkListBox .h4 {
   border-bottom-width: 0;
   font: bold; }
 
-.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
+.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator {
   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) {
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl) {
     margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
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 310f2d4..27f82ba 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -93,10 +93,6 @@ popover.background label.separator, headerbar .subtitle {
 assistant .sidebar {
   background-color: #ffffff;
   border-top: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(ltr) {
-    border-right: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(rtl) {
-    border-left: 1px solid #dcdfe3; }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -244,7 +240,7 @@ button {
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #cfd6e6;
   background-color: #fbfbfc; }
-  button separator, button .sidebar separator, .sidebar button separator, button .sidebar .view separator, .sidebar .view button separator {
+  button separator, button .sidebar separator, .sidebar button separator {
     margin: 4px 1px; }
   button.flat, button.sidebar-button {
     border-color: transparent;
@@ -780,11 +776,11 @@ toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #F5F6F7; }
-  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator, toolbar .sidebar .view separator, .sidebar .view toolbar separator, .inline-toolbar .sidebar .view separator, .sidebar .view .inline-toolbar separator {
+  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator {
     background: none; }
-  toolbar.horizontal separator, .horizontal.inline-toolbar separator, toolbar.horizontal .sidebar .view separator, .sidebar .view toolbar.horizontal separator {
+  toolbar.horizontal separator, .horizontal.inline-toolbar separator {
     margin: 0 6px; }
-  toolbar.vertical separator, .vertical.inline-toolbar separator, toolbar.vertical .sidebar .view separator, .sidebar .view toolbar.vertical separator {
+  toolbar.vertical separator, .vertical.inline-toolbar separator {
     margin: 6px 0; }
   .osd toolbar, .osd .inline-toolbar, toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
@@ -932,10 +928,10 @@ headerbar {
     padding: 0;
     border: none;
     background: none; }
-  .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
+  .titlebar separator {
     background-color: #262a33; }
 
-paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+paned.titlebar separator {
   background-color: transparent; }
 
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
@@ -947,11 +943,11 @@ paned.titlebar > headerbar:first-child {
 paned.titlebar > headerbar:last-child {
   border-top-left-radius: 0; }
 
-headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
 
-.primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
+.primary-toolbar separator, headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
@@ -1412,12 +1408,8 @@ menu,
     padding: 4px 0px;
     border-radius: 2px;
     border: none; }
-  menu separator, menu .sidebar separator, .sidebar menu separator, menu .sidebar .view separator, .sidebar .view menu separator,
+  menu separator, menu .sidebar separator, .sidebar menu separator,
   .csd menu separator,
-  .csd menu .sidebar .view separator, .sidebar .view
-  .csd menu separator,
-  .menu separator,
-  .menu .sidebar .view separator, .sidebar .view
   .menu separator,
   .csd
   .menu separator {
@@ -1494,9 +1486,7 @@ popover.background {
   popover.background,
   popover.background {
     border: 1px solid #cdd2d7; }
-  popover separator, popover .sidebar separator, .sidebar popover separator, popover .sidebar .view separator, .sidebar .view popover separator,
-  popover.background separator,
-  popover.background .sidebar .view separator, .sidebar .view
+  popover separator, popover .sidebar separator, .sidebar popover separator,
   popover.background separator {
     background-color: #ffffff; }
   popover > list,
@@ -2125,14 +2115,14 @@ printdialog paper {
 printdialog .dialog-action-box {
   margin: 12px; }
 
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3;
   padding: 0; }
-  frame border.flat,
+  frame > border.flat,
   .frame.flat {
     border-style: none; }
 
@@ -2222,7 +2212,7 @@ scrolledwindow junction, placessidebar junction {
   scrolledwindow junction:dir(rtl), placessidebar junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
 
-separator, .sidebar separator, .sidebar .view separator {
+separator, .sidebar separator {
   background-color: rgba(0, 0, 0, 0.1);
   min-width: 1px;
   min-height: 1px; }
@@ -2366,9 +2356,20 @@ messagedialog.csd .dialog-action-area button:only-child {
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
 
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: #fbfbfc; }
+  stacksidebar.sidebar:dir(ltr) list,
+  stacksidebar.sidebar.left list,
+  stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
+    border-right: 1px solid #dcdfe3;
+    border-left-style: none; }
+  stacksidebar.sidebar:dir(rtl) list,
+  stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.left {
+    border-left: 1px solid #dcdfe3;
+    border-right-style: none; }
+  paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+    border-style: none; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2418,7 +2419,7 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
+paned > separator, .sidebar paned > separator {
   min-width: 1px;
   min-height: 1px;
   -gtk-icon-source: none;
@@ -2426,9 +2427,9 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
   background-color: transparent;
   background-image: linear-gradient(to top, #dcdfe3);
   background-size: 1px 1px; }
-  paned > separator:selected, .sidebar paned > separator:selected, .sidebar .view paned > separator:selected {
+  paned > separator:selected, .sidebar paned > separator:selected {
     background-image: linear-gradient(to top, #5294E2); }
-  paned > separator.wide, .sidebar paned > separator.wide, .sidebar .view paned > separator.wide {
+  paned > separator.wide, .sidebar paned > separator.wide {
     margin: 0;
     padding: 0;
     min-width: 5px;
@@ -2436,26 +2437,26 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
     background-image: linear-gradient(to top, #dcdfe3), linear-gradient(to top, #dcdfe3);
     background-size: 1px 1px, 1px 1px; }
 
-paned.horizontal > separator, .sidebar paned.horizontal > separator, .sidebar .view paned.horizontal > separator {
+paned.horizontal > separator, .sidebar paned.horizontal > separator {
   background-repeat: repeat-y; }
-  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr), .sidebar .view paned.horizontal > separator:dir(ltr) {
+  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr) {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
     background-position: left; }
-  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl), .sidebar .view paned.horizontal > separator:dir(rtl) {
+  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl) {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
     background-position: right; }
-  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide, .sidebar .view paned.horizontal > separator.wide {
+  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide {
     background-repeat: repeat-y, repeat-y;
     background-position: left, right; }
 
-paned.vertical > separator, .sidebar paned.vertical > separator, .sidebar .view paned.vertical > separator {
+paned.vertical > separator, .sidebar paned.vertical > separator {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0;
   background-repeat: repeat-x;
   background-position: top; }
-  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide, .sidebar .view paned.vertical > separator.wide {
+  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide {
     background-repeat: repeat-x, repeat-x;
     background-position: bottom, top; }
 
@@ -2761,7 +2762,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -3381,11 +3382,11 @@ GtkListBox .h4 {
   border-bottom-width: 0;
   font: bold; }
 
-.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
+.nautilus-window paned > separator, .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl) {
     margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 6a5ad0d..759f996 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -93,10 +93,6 @@ popover.background label.separator, headerbar .subtitle {
 assistant .sidebar {
   background-color: #ffffff;
   border-top: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(ltr) {
-    border-right: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(rtl) {
-    border-left: 1px solid #dcdfe3; }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -244,7 +240,7 @@ button {
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #cfd6e6;
   background-color: #fbfbfc; }
-  button separator, button .sidebar separator, .sidebar button separator, button .sidebar .view separator, .sidebar .view button separator {
+  button separator, button .sidebar separator, .sidebar button separator {
     margin: 4px 1px; }
   button.flat, button.sidebar-button {
     border-color: transparent;
@@ -780,11 +776,11 @@ toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #F5F6F7; }
-  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator, toolbar .sidebar .view separator, .sidebar .view toolbar separator, .inline-toolbar .sidebar .view separator, .sidebar .view .inline-toolbar separator {
+  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator {
     background: none; }
-  toolbar.horizontal separator, .horizontal.inline-toolbar separator, toolbar.horizontal .sidebar .view separator, .sidebar .view toolbar.horizontal separator {
+  toolbar.horizontal separator, .horizontal.inline-toolbar separator {
     margin: 0 6px; }
-  toolbar.vertical separator, .vertical.inline-toolbar separator, toolbar.vertical .sidebar .view separator, .sidebar .view toolbar.vertical separator {
+  toolbar.vertical separator, .vertical.inline-toolbar separator {
     margin: 6px 0; }
   .osd toolbar, .osd .inline-toolbar, toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
@@ -932,10 +928,10 @@ headerbar {
     padding: 0;
     border: none;
     background: none; }
-  .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
+  .titlebar separator {
     background-color: #d4d5db; }
 
-paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+paned.titlebar separator {
   background-color: transparent; }
 
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
@@ -947,11 +943,11 @@ paned.titlebar > headerbar:first-child {
 paned.titlebar > headerbar:last-child {
   border-top-left-radius: 0; }
 
-headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
 
-.primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
+.primary-toolbar separator, headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
@@ -1416,12 +1412,8 @@ menu,
     padding: 4px 0px;
     border-radius: 2px;
     border: none; }
-  menu separator, menu .sidebar separator, .sidebar menu separator, menu .sidebar .view separator, .sidebar .view menu separator,
+  menu separator, menu .sidebar separator, .sidebar menu separator,
   .csd menu separator,
-  .csd menu .sidebar .view separator, .sidebar .view
-  .csd menu separator,
-  .menu separator,
-  .menu .sidebar .view separator, .sidebar .view
   .menu separator,
   .csd
   .menu separator {
@@ -1498,9 +1490,7 @@ popover.background {
   popover.background,
   popover.background {
     border: 1px solid #cdd2d7; }
-  popover separator, popover .sidebar separator, .sidebar popover separator, popover .sidebar .view separator, .sidebar .view popover separator,
-  popover.background separator,
-  popover.background .sidebar .view separator, .sidebar .view
+  popover separator, popover .sidebar separator, .sidebar popover separator,
   popover.background separator {
     background-color: #ffffff; }
   popover > list,
@@ -2129,14 +2119,14 @@ printdialog paper {
 printdialog .dialog-action-box {
   margin: 12px; }
 
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3;
   padding: 0; }
-  frame border.flat,
+  frame > border.flat,
   .frame.flat {
     border-style: none; }
 
@@ -2226,7 +2216,7 @@ scrolledwindow junction, placessidebar junction {
   scrolledwindow junction:dir(rtl), placessidebar junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
 
-separator, .sidebar separator, .sidebar .view separator {
+separator, .sidebar separator {
   background-color: rgba(0, 0, 0, 0.1);
   min-width: 1px;
   min-height: 1px; }
@@ -2370,9 +2360,20 @@ messagedialog.csd .dialog-action-area button:only-child {
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
 
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: #fbfbfc; }
+  stacksidebar.sidebar:dir(ltr) list,
+  stacksidebar.sidebar.left list,
+  stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
+    border-right: 1px solid #dcdfe3;
+    border-left-style: none; }
+  stacksidebar.sidebar:dir(rtl) list,
+  stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.left {
+    border-left: 1px solid #dcdfe3;
+    border-right-style: none; }
+  paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+    border-style: none; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2422,7 +2423,7 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
+paned > separator, .sidebar paned > separator {
   min-width: 1px;
   min-height: 1px;
   -gtk-icon-source: none;
@@ -2430,9 +2431,9 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
   background-color: transparent;
   background-image: linear-gradient(to top, #dcdfe3);
   background-size: 1px 1px; }
-  paned > separator:selected, .sidebar paned > separator:selected, .sidebar .view paned > separator:selected {
+  paned > separator:selected, .sidebar paned > separator:selected {
     background-image: linear-gradient(to top, #5294E2); }
-  paned > separator.wide, .sidebar paned > separator.wide, .sidebar .view paned > separator.wide {
+  paned > separator.wide, .sidebar paned > separator.wide {
     margin: 0;
     padding: 0;
     min-width: 5px;
@@ -2440,26 +2441,26 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
     background-image: linear-gradient(to top, #dcdfe3), linear-gradient(to top, #dcdfe3);
     background-size: 1px 1px, 1px 1px; }
 
-paned.horizontal > separator, .sidebar paned.horizontal > separator, .sidebar .view paned.horizontal > separator {
+paned.horizontal > separator, .sidebar paned.horizontal > separator {
   background-repeat: repeat-y; }
-  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr), .sidebar .view paned.horizontal > separator:dir(ltr) {
+  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr) {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
     background-position: left; }
-  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl), .sidebar .view paned.horizontal > separator:dir(rtl) {
+  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl) {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
     background-position: right; }
-  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide, .sidebar .view paned.horizontal > separator.wide {
+  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide {
     background-repeat: repeat-y, repeat-y;
     background-position: left, right; }
 
-paned.vertical > separator, .sidebar paned.vertical > separator, .sidebar .view paned.vertical > separator {
+paned.vertical > separator, .sidebar paned.vertical > separator {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0;
   background-repeat: repeat-x;
   background-position: top; }
-  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide, .sidebar .view paned.vertical > separator.wide {
+  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide {
     background-repeat: repeat-x, repeat-x;
     background-position: bottom, top; }
 
@@ -2765,7 +2766,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -3385,11 +3386,11 @@ GtkListBox .h4 {
   border-bottom-width: 0;
   font: bold; }
 
-.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
+.nautilus-window paned > separator, .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl) {
     margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 9b6cb2e..53c6258 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -93,10 +93,6 @@ popover.background label.separator, headerbar .subtitle {
 assistant .sidebar {
   background-color: #ffffff;
   border-top: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(ltr) {
-    border-right: 1px solid #dcdfe3; }
-  assistant .sidebar:dir(rtl) {
-    border-left: 1px solid #dcdfe3; }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -244,7 +240,7 @@ button {
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #cfd6e6;
   background-color: #fbfbfc; }
-  button separator, button .sidebar separator, .sidebar button separator, button .sidebar .view separator, .sidebar .view button separator {
+  button separator, button .sidebar separator, .sidebar button separator {
     margin: 4px 1px; }
   button.flat, button.sidebar-button {
     border-color: transparent;
@@ -780,11 +776,11 @@ toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #F5F6F7; }
-  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator, toolbar .sidebar .view separator, .sidebar .view toolbar separator, .inline-toolbar .sidebar .view separator, .sidebar .view .inline-toolbar separator {
+  toolbar separator, .inline-toolbar separator, toolbar .sidebar separator, .sidebar toolbar separator {
     background: none; }
-  toolbar.horizontal separator, .horizontal.inline-toolbar separator, toolbar.horizontal .sidebar .view separator, .sidebar .view toolbar.horizontal separator {
+  toolbar.horizontal separator, .horizontal.inline-toolbar separator {
     margin: 0 6px; }
-  toolbar.vertical separator, .vertical.inline-toolbar separator, toolbar.vertical .sidebar .view separator, .sidebar .view toolbar.vertical separator {
+  toolbar.vertical separator, .vertical.inline-toolbar separator {
     margin: 6px 0; }
   .osd toolbar, .osd .inline-toolbar, toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
@@ -932,10 +928,10 @@ headerbar {
     padding: 0;
     border: none;
     background: none; }
-  .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
+  .titlebar separator {
     background-color: rgba(212, 213, 219, 0.95); }
 
-paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+paned.titlebar separator {
   background-color: transparent; }
 
 paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
@@ -947,11 +943,11 @@ paned.titlebar > headerbar:first-child {
 paned.titlebar > headerbar:last-child {
   border-top-left-radius: 0; }
 
-headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
 
-.primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
+.primary-toolbar separator, headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
@@ -1416,12 +1412,8 @@ menu,
     padding: 4px 0px;
     border-radius: 2px;
     border: none; }
-  menu separator, menu .sidebar separator, .sidebar menu separator, menu .sidebar .view separator, .sidebar .view menu separator,
+  menu separator, menu .sidebar separator, .sidebar menu separator,
   .csd menu separator,
-  .csd menu .sidebar .view separator, .sidebar .view
-  .csd menu separator,
-  .menu separator,
-  .menu .sidebar .view separator, .sidebar .view
   .menu separator,
   .csd
   .menu separator {
@@ -1498,9 +1490,7 @@ popover.background {
   popover.background,
   popover.background {
     border: 1px solid #cdd2d7; }
-  popover separator, popover .sidebar separator, .sidebar popover separator, popover .sidebar .view separator, .sidebar .view popover separator,
-  popover.background separator,
-  popover.background .sidebar .view separator, .sidebar .view
+  popover separator, popover .sidebar separator, .sidebar popover separator,
   popover.background separator {
     background-color: #ffffff; }
   popover > list,
@@ -2129,14 +2119,14 @@ printdialog paper {
 printdialog .dialog-action-box {
   margin: 12px; }
 
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3;
   padding: 0; }
-  frame border.flat,
+  frame > border.flat,
   .frame.flat {
     border-style: none; }
 
@@ -2226,7 +2216,7 @@ scrolledwindow junction, placessidebar junction {
   scrolledwindow junction:dir(rtl), placessidebar junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
 
-separator, .sidebar separator, .sidebar .view separator {
+separator, .sidebar separator {
   background-color: rgba(0, 0, 0, 0.1);
   min-width: 1px;
   min-height: 1px; }
@@ -2370,9 +2360,20 @@ messagedialog.csd .dialog-action-area button:only-child {
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(220, 223, 227, 0.5); }
 
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: #fbfbfc; }
+  stacksidebar.sidebar:dir(ltr) list,
+  stacksidebar.sidebar.left list,
+  stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
+    border-right: 1px solid #dcdfe3;
+    border-left-style: none; }
+  stacksidebar.sidebar:dir(rtl) list,
+  stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.left {
+    border-left: 1px solid #dcdfe3;
+    border-right-style: none; }
+  paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+    border-style: none; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2422,7 +2423,7 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
+paned > separator, .sidebar paned > separator {
   min-width: 1px;
   min-height: 1px;
   -gtk-icon-source: none;
@@ -2430,9 +2431,9 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
   background-color: transparent;
   background-image: linear-gradient(to top, #dcdfe3);
   background-size: 1px 1px; }
-  paned > separator:selected, .sidebar paned > separator:selected, .sidebar .view paned > separator:selected {
+  paned > separator:selected, .sidebar paned > separator:selected {
     background-image: linear-gradient(to top, #5294E2); }
-  paned > separator.wide, .sidebar paned > separator.wide, .sidebar .view paned > separator.wide {
+  paned > separator.wide, .sidebar paned > separator.wide {
     margin: 0;
     padding: 0;
     min-width: 5px;
@@ -2440,26 +2441,26 @@ paned > separator, .sidebar paned > separator, .sidebar .view paned > separator
     background-image: linear-gradient(to top, #dcdfe3), linear-gradient(to top, #dcdfe3);
     background-size: 1px 1px, 1px 1px; }
 
-paned.horizontal > separator, .sidebar paned.horizontal > separator, .sidebar .view paned.horizontal > separator {
+paned.horizontal > separator, .sidebar paned.horizontal > separator {
   background-repeat: repeat-y; }
-  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr), .sidebar .view paned.horizontal > separator:dir(ltr) {
+  paned.horizontal > separator:dir(ltr), .sidebar paned.horizontal > separator:dir(ltr) {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
     background-position: left; }
-  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl), .sidebar .view paned.horizontal > separator:dir(rtl) {
+  paned.horizontal > separator:dir(rtl), .sidebar paned.horizontal > separator:dir(rtl) {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
     background-position: right; }
-  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide, .sidebar .view paned.horizontal > separator.wide {
+  paned.horizontal > separator.wide, .sidebar paned.horizontal > separator.wide {
     background-repeat: repeat-y, repeat-y;
     background-position: left, right; }
 
-paned.vertical > separator, .sidebar paned.vertical > separator, .sidebar .view paned.vertical > separator {
+paned.vertical > separator, .sidebar paned.vertical > separator {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0;
   background-repeat: repeat-x;
   background-position: top; }
-  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide, .sidebar .view paned.vertical > separator.wide {
+  paned.vertical > separator.wide, .sidebar paned.vertical > separator.wide {
     background-repeat: repeat-x, repeat-x;
     background-position: bottom, top; }
 
@@ -2765,7 +2766,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -3385,11 +3386,11 @@ GtkListBox .h4 {
   border-bottom-width: 0;
   font: bold; }
 
-.nautilus-window paned > separator, .nautilus-window .sidebar paned > separator, .nautilus-window .sidebar .view paned > separator, .sidebar .view .nautilus-window paned > separator {
+.nautilus-window paned > separator, .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(ltr), .nautilus-window .sidebar 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) {
+  .nautilus-window paned > separator:dir(rtl), .nautilus-window .sidebar paned > separator:dir(rtl) {
     margin-right: -1px; }
 
 .nautilus-window.csd.background, .nautilus-window placessidebar list {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index c4170db..83782c7 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -147,8 +147,6 @@ assistant {
   .sidebar {
     background-color: $base_color;
     border-top: 1px solid $borders_color;
-    &:dir(ltr) { border-right: 1px solid $borders_color; }
-    &:dir(rtl) { border-left: 1px solid $borders_color; }
   }
 
   &.csd .sidebar { border-top-style: none; }
@@ -2241,7 +2239,7 @@ printdialog {
 //
 // Frames
 //
-frame border,
+frame > border,
 .frame {
   margin: 0;
   padding: 0;
@@ -2467,15 +2465,41 @@ filechooser {
 //
 // Sidebar
 //
-.sidebar, .sidebar .view {
-  border: none;
+.sidebar {
+  border-style: none;
   background-color: lighten($bg_color, 2%);
 
+  @at-root %sidebar_left,
+  &:dir(ltr),
+  &.left,
+  &.left:dir(rtl) {
+    border-right: 1px solid $borders_color;
+    border-left-style: none;
+  }
+
+  @at-root %sidebar_right,
+  &:dir(rtl),
+  &.left {
+    border-left: 1px solid $borders_color;
+    border-right-style: none;
+  }
+
   &:selected { @extend %selected_items; }
   separator { @extend separator; }
+
+  paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; }}
 }
 
 stacksidebar {
+  &.sidebar {
+    &:dir(ltr) list,
+    &.left list,
+    &.left:dir(rtl) list { @extend %sidebar_left; }
+
+    &:dir(rtl) list,
+    &.right list { @extend %sidebar_right; }
+  }
+
   row {
     padding: 10px 4px;