fixes

2 files changed, 25 insertions, 10 deletions

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;
+        }
       }
     }