fixes

8 files changed, 145 insertions, 58 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index ddc2c88..1b9f4c0 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1328,7 +1328,7 @@ headerbar entry, headerbar button, headerbar separator {
 .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
   padding-left: 10px; }
 
-.path-bar button.slider-button {
+.path-bar button.slider-button, .path-bar button:not(.image-button):not(.text-button) {
   padding-left: 1px;
   padding-right: 1px; }
 
@@ -2472,11 +2472,13 @@ placessidebar row {
   placessidebar row.sidebar-new-bookmark-row {
     color: #5294E2; }
   placessidebar row:drop(active):not(:disabled) {
-    color: #4e9a06;
     box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; }
+    placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image {
+      color: #4e9a06; }
     placessidebar row:drop(active):not(:disabled):selected {
-      color: #ffffff;
       background-color: #4e9a06; }
+      placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image {
+        color: #ffffff; }
 
 placesview .server-list-button > image {
   -gtk-icon-transform: rotate(0turn); }
@@ -2869,7 +2871,7 @@ textview text:selected:focus, .view text selection:focus, iconview text selectio
 textview text selection:focus,
 textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
   background-color: #5294E2; }
   row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected,
   textview text:selected, iconview text:selected:focus,
@@ -2877,7 +2879,7 @@ modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
   modelbutton.flat:active,
-  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3); }
     row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
@@ -3527,17 +3529,27 @@ GtkListBox .h4 {
 
 .nautilus-window placessidebar.sidebar {
   background-color: rgba(53, 57, 69, 0.95); }
-  .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row, .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row image {
-    color: #5294E2; }
   .nautilus-window placessidebar.sidebar row {
     border: none;
     color: #BAC3CF; }
-    .nautilus-window placessidebar.sidebar row:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) .sidebar-icon {
+    .nautilus-window placessidebar.sidebar row .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
     .nautilus-window placessidebar.sidebar row.has-open-popup, .nautilus-window placessidebar.sidebar row:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row:disabled, .nautilus-window placessidebar.sidebar row:disabled label, .nautilus-window placessidebar.sidebar row:disabled image {
       color: rgba(186, 195, 207, 0.4); }
+    .nautilus-window placessidebar.sidebar row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row:active:hover .sidebar-icon {
+      color: inherit; }
+    .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
+      color: #5294E2; }
+      .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row .sidebar-icon {
+        color: inherit; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) .sidebar-icon {
+      color: #4e9a06; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected {
+      background-color: #4e9a06; }
+      .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected .sidebar-icon {
+        color: #ffffff; }
   .nautilus-window placessidebar.sidebar separator {
     background-color: transparent; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index bdf2c26..91dad7f 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1327,7 +1327,7 @@ headerbar entry, headerbar button, headerbar separator {
 .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
   padding-left: 10px; }
 
-.path-bar button.slider-button {
+.path-bar button.slider-button, .path-bar button:not(.image-button):not(.text-button) {
   padding-left: 1px;
   padding-right: 1px; }
 
@@ -2471,11 +2471,13 @@ placessidebar row {
   placessidebar row.sidebar-new-bookmark-row {
     color: #5294E2; }
   placessidebar row:drop(active):not(:disabled) {
-    color: #4e9a06;
     box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; }
+    placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image {
+      color: #4e9a06; }
     placessidebar row:drop(active):not(:disabled):selected {
-      color: #ffffff;
       background-color: #4e9a06; }
+      placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image {
+        color: #ffffff; }
 
 placesview .server-list-button > image {
   -gtk-icon-transform: rotate(0turn); }
@@ -2868,7 +2870,7 @@ textview text:selected:focus, .view text selection:focus, iconview text selectio
 textview text selection:focus,
 textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
   background-color: #5294E2; }
   row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected,
   textview text:selected, iconview text:selected:focus,
@@ -2876,7 +2878,7 @@ modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
   modelbutton.flat:active,
-  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3); }
     row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
@@ -3526,17 +3528,27 @@ GtkListBox .h4 {
 
 .nautilus-window placessidebar.sidebar {
   background-color: rgba(53, 57, 69, 0.95); }
-  .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row, .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row image {
-    color: #5294E2; }
   .nautilus-window placessidebar.sidebar row {
     border: none;
     color: #BAC3CF; }
-    .nautilus-window placessidebar.sidebar row:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) .sidebar-icon {
+    .nautilus-window placessidebar.sidebar row .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
     .nautilus-window placessidebar.sidebar row.has-open-popup, .nautilus-window placessidebar.sidebar row:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row:disabled, .nautilus-window placessidebar.sidebar row:disabled label, .nautilus-window placessidebar.sidebar row:disabled image {
       color: rgba(186, 195, 207, 0.4); }
+    .nautilus-window placessidebar.sidebar row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row:active:hover .sidebar-icon {
+      color: inherit; }
+    .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
+      color: #5294E2; }
+      .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row .sidebar-icon {
+        color: inherit; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) .sidebar-icon {
+      color: #4e9a06; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected {
+      background-color: #4e9a06; }
+      .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected .sidebar-icon {
+        color: #ffffff; }
   .nautilus-window placessidebar.sidebar separator {
     background-color: transparent; }
 
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 6f99b87..c107aba 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1328,7 +1328,7 @@ headerbar entry, headerbar button, headerbar separator {
 .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
   padding-left: 10px; }
 
-.path-bar button.slider-button {
+.path-bar button.slider-button, .path-bar button:not(.image-button):not(.text-button) {
   padding-left: 1px;
   padding-right: 1px; }
 
@@ -2472,11 +2472,13 @@ placessidebar row {
   placessidebar row.sidebar-new-bookmark-row {
     color: #5294E2; }
   placessidebar row:drop(active):not(:disabled) {
-    color: #4e9a06;
     box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; }
+    placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image {
+      color: #4e9a06; }
     placessidebar row:drop(active):not(:disabled):selected {
-      color: #ffffff;
       background-color: #4e9a06; }
+      placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image {
+        color: #ffffff; }
 
 placesview .server-list-button > image {
   -gtk-icon-transform: rotate(0turn); }
@@ -2869,7 +2871,7 @@ textview text:selected:focus, .view text selection:focus, iconview text selectio
 textview text selection:focus,
 textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
   background-color: #5294E2; }
   row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected,
   textview text:selected, iconview text:selected:focus,
@@ -2877,7 +2879,7 @@ modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
   modelbutton.flat:active,
-  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3); }
     row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
@@ -3527,17 +3529,27 @@ GtkListBox .h4 {
 
 .nautilus-window placessidebar.sidebar {
   background-color: #353945; }
-  .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row, .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row image {
-    color: #5294E2; }
   .nautilus-window placessidebar.sidebar row {
     border: none;
     color: #BAC3CF; }
-    .nautilus-window placessidebar.sidebar row:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) .sidebar-icon {
+    .nautilus-window placessidebar.sidebar row .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
     .nautilus-window placessidebar.sidebar row.has-open-popup, .nautilus-window placessidebar.sidebar row:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row:disabled, .nautilus-window placessidebar.sidebar row:disabled label, .nautilus-window placessidebar.sidebar row:disabled image {
       color: rgba(186, 195, 207, 0.4); }
+    .nautilus-window placessidebar.sidebar row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row:active:hover .sidebar-icon {
+      color: inherit; }
+    .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
+      color: #5294E2; }
+      .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row .sidebar-icon {
+        color: inherit; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) .sidebar-icon {
+      color: #4e9a06; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected {
+      background-color: #4e9a06; }
+      .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected .sidebar-icon {
+        color: #ffffff; }
   .nautilus-window placessidebar.sidebar separator {
     background-color: transparent; }
 
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 388a371..895cf06 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1327,7 +1327,7 @@ headerbar entry, headerbar button, headerbar separator {
 .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
   padding-left: 10px; }
 
-.path-bar button.slider-button {
+.path-bar button.slider-button, .path-bar button:not(.image-button):not(.text-button) {
   padding-left: 1px;
   padding-right: 1px; }
 
@@ -2471,11 +2471,13 @@ placessidebar row {
   placessidebar row.sidebar-new-bookmark-row {
     color: #5294E2; }
   placessidebar row:drop(active):not(:disabled) {
-    color: #4e9a06;
     box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; }
+    placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image {
+      color: #4e9a06; }
     placessidebar row:drop(active):not(:disabled):selected {
-      color: #ffffff;
       background-color: #4e9a06; }
+      placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image {
+        color: #ffffff; }
 
 placesview .server-list-button > image {
   -gtk-icon-transform: rotate(0turn); }
@@ -2868,7 +2870,7 @@ textview text:selected:focus, .view text selection:focus, iconview text selectio
 textview text selection:focus,
 textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
   background-color: #5294E2; }
   row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected,
   textview text:selected, iconview text:selected:focus,
@@ -2876,7 +2878,7 @@ modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
   modelbutton.flat:active,
-  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3); }
     row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
@@ -3526,17 +3528,27 @@ GtkListBox .h4 {
 
 .nautilus-window placessidebar.sidebar {
   background-color: #353945; }
-  .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row, .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row image {
-    color: #5294E2; }
   .nautilus-window placessidebar.sidebar row {
     border: none;
     color: #BAC3CF; }
-    .nautilus-window placessidebar.sidebar row:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) .sidebar-icon {
+    .nautilus-window placessidebar.sidebar row .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
     .nautilus-window placessidebar.sidebar row.has-open-popup, .nautilus-window placessidebar.sidebar row:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row:disabled, .nautilus-window placessidebar.sidebar row:disabled label, .nautilus-window placessidebar.sidebar row:disabled image {
       color: rgba(186, 195, 207, 0.4); }
+    .nautilus-window placessidebar.sidebar row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row:active:hover .sidebar-icon {
+      color: inherit; }
+    .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
+      color: #5294E2; }
+      .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row .sidebar-icon {
+        color: inherit; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) .sidebar-icon {
+      color: #4e9a06; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected {
+      background-color: #4e9a06; }
+      .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected .sidebar-icon {
+        color: #ffffff; }
   .nautilus-window placessidebar.sidebar separator {
     background-color: transparent; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 8598659..77ea2b5 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1331,7 +1331,7 @@ headerbar entry, headerbar button, headerbar separator {
 .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
   padding-left: 10px; }
 
-.path-bar button.slider-button {
+.path-bar button.slider-button, .path-bar button:not(.image-button):not(.text-button) {
   padding-left: 1px;
   padding-right: 1px; }
 
@@ -2475,11 +2475,13 @@ placessidebar row {
   placessidebar row.sidebar-new-bookmark-row {
     color: #5294E2; }
   placessidebar row:drop(active):not(:disabled) {
-    color: #4e9a06;
     box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; }
+    placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image {
+      color: #4e9a06; }
     placessidebar row:drop(active):not(:disabled):selected {
-      color: #ffffff;
       background-color: #4e9a06; }
+      placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image {
+        color: #ffffff; }
 
 placesview .server-list-button > image {
   -gtk-icon-transform: rotate(0turn); }
@@ -2872,7 +2874,7 @@ textview text:selected:focus, .view text selection:focus, iconview text selectio
 textview text selection:focus,
 textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
   background-color: #5294E2; }
   row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected,
   textview text:selected, iconview text:selected:focus,
@@ -2880,7 +2882,7 @@ modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
   modelbutton.flat:active,
-  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3); }
     row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
@@ -3530,17 +3532,27 @@ GtkListBox .h4 {
 
 .nautilus-window placessidebar.sidebar {
   background-color: #353945; }
-  .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row, .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row image {
-    color: #5294E2; }
   .nautilus-window placessidebar.sidebar row {
     border: none;
     color: #BAC3CF; }
-    .nautilus-window placessidebar.sidebar row:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) .sidebar-icon {
+    .nautilus-window placessidebar.sidebar row .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
     .nautilus-window placessidebar.sidebar row.has-open-popup, .nautilus-window placessidebar.sidebar row:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row:disabled, .nautilus-window placessidebar.sidebar row:disabled label, .nautilus-window placessidebar.sidebar row:disabled image {
       color: rgba(186, 195, 207, 0.4); }
+    .nautilus-window placessidebar.sidebar row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row:active:hover .sidebar-icon {
+      color: inherit; }
+    .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
+      color: #5294E2; }
+      .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row .sidebar-icon {
+        color: inherit; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) .sidebar-icon {
+      color: #4e9a06; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected {
+      background-color: #4e9a06; }
+      .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected .sidebar-icon {
+        color: #ffffff; }
   .nautilus-window placessidebar.sidebar separator {
     background-color: transparent; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index d734bf2..50287f6 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1331,7 +1331,7 @@ headerbar entry, headerbar button, headerbar separator {
 .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
   padding-left: 10px; }
 
-.path-bar button.slider-button {
+.path-bar button.slider-button, .path-bar button:not(.image-button):not(.text-button) {
   padding-left: 1px;
   padding-right: 1px; }
 
@@ -2475,11 +2475,13 @@ placessidebar row {
   placessidebar row.sidebar-new-bookmark-row {
     color: #5294E2; }
   placessidebar row:drop(active):not(:disabled) {
-    color: #4e9a06;
     box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; }
+    placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image {
+      color: #4e9a06; }
     placessidebar row:drop(active):not(:disabled):selected {
-      color: #ffffff;
       background-color: #4e9a06; }
+      placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image {
+        color: #ffffff; }
 
 placesview .server-list-button > image {
   -gtk-icon-transform: rotate(0turn); }
@@ -2872,7 +2874,7 @@ textview text:selected:focus, .view text selection:focus, iconview text selectio
 textview text selection:focus,
 textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
   background-color: #5294E2; }
   row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected,
   textview text:selected, iconview text:selected:focus,
@@ -2880,7 +2882,7 @@ modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected,
   modelbutton.flat:active,
-  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
+  modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3); }
     row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
@@ -3530,17 +3532,27 @@ GtkListBox .h4 {
 
 .nautilus-window placessidebar.sidebar {
   background-color: rgba(53, 57, 69, 0.95); }
-  .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row, .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row image {
-    color: #5294E2; }
   .nautilus-window placessidebar.sidebar row {
     border: none;
     color: #BAC3CF; }
-    .nautilus-window placessidebar.sidebar row:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) .sidebar-icon {
+    .nautilus-window placessidebar.sidebar row .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
     .nautilus-window placessidebar.sidebar row.has-open-popup, .nautilus-window placessidebar.sidebar row:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row:disabled, .nautilus-window placessidebar.sidebar row:disabled label, .nautilus-window placessidebar.sidebar row:disabled image {
       color: rgba(186, 195, 207, 0.4); }
+    .nautilus-window placessidebar.sidebar row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row:active:hover .sidebar-icon {
+      color: inherit; }
+    .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row {
+      color: #5294E2; }
+      .nautilus-window placessidebar.sidebar row.sidebar-new-bookmark-row .sidebar-icon {
+        color: inherit; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled) .sidebar-icon {
+      color: #4e9a06; }
+    .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected {
+      background-color: #4e9a06; }
+      .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row:drop(active):not(:disabled):selected .sidebar-icon {
+        color: #ffffff; }
   .nautilus-window placessidebar.sidebar separator {
     background-color: transparent; }
 
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 4e406d7..ac425ad 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1368,7 +1368,8 @@ headerbar {
     label:first-child { padding-left: 10px; }
   }
 
-  &.slider-button {
+  &.slider-button,
+  &:not(.image-button):not(.text-button) {
     padding-left: 1px;
     padding-right: 1px;
   }
@@ -2609,12 +2610,13 @@ placessidebar {
     &.sidebar-new-bookmark-row { color: $selected_bg_color; }
 
     &:drop(active):not(:disabled) {
-      color: $drop_target_color;
+      &, label, image { color: $drop_target_color; }
+
       box-shadow: inset 0 1px $drop_target_color,
                   inset 0 -1px $drop_target_color;
 
       &:selected {
-        color: $selected_fg_color;
+        &, label, image { color: $selected_fg_color; }
         background-color: $drop_target_color;
       }
     }
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 5dd29cf..11722bf 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -21,26 +21,39 @@
 
     background-color: $dark_sidebar_bg;
 
-    row.sidebar-new-bookmark-row {
-      &, image { color: $selected_bg_color; }
-    }
-
     row {
       border: none;
       color: $dark_sidebar_fg;
 
-      &:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) {
-        .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); }
-      }
+      .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); }
 
       &.has-open-popup,
       &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); }
+
       &:disabled {
         &, label, image { color: transparentize($dark_sidebar_fg, 0.6); }
       }
 
+      &:selected.has-open-popup,
       &:selected, &:selected:hover, &:active:hover {
         @extend %selected_items;
+
+        .sidebar-icon { color: inherit; }
+      }
+
+      &.sidebar-new-bookmark-row {
+        color: $selected_bg_color;
+
+        .sidebar-icon { color: inherit; }
+      }
+
+      &:drop(active):not(:disabled) {
+        &, label, .sidebar-icon { color: $drop_target_color; }
+
+        &:selected {
+          &, label, .sidebar-icon { color: $selected_fg_color; }
+          background-color: $drop_target_color;
+        }
       }
     }