diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index d4acbd59..d61becc6 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1052,6 +1052,11 @@ toolbar {
   border-width: 0 1px 1px;
   border-color: $divider;
   background-color: $base-alt;
+
+  .frame & {
+    border-width: 1px 0 0;
+    background-color: transparent;
+  }
 }
 
 searchbar > revealer > box,
@@ -1905,16 +1910,22 @@ notebook {
     border-radius: $modal-radius + $space-size;
   }
 
-  &.frame frame {
-    > border {
+  &.frame {
+    scrolledwindow.frame {
       border: none;
-      border-radius: $modal-radius;
     }
 
-    > list {
-      // @extend %circular_list;
+    frame {
+      > border {
+        border: none;
+        border-radius: $modal-radius;
+      }
 
-      row.activatable { border-radius: $corner-radius; }
+      > list {
+        // @extend %circular_list;
+
+        row.activatable { border-radius: $corner-radius; }
+      }
     }
   }
 
@@ -2407,7 +2418,7 @@ treeview.view {
     padding: 0;
     margin: 0;
 
-    &:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+    &:not(:disabled):not(:checked):not(:indeterminate) {
       background-color: $divider;
     }
 
@@ -2416,7 +2427,7 @@ treeview.view {
     }
   }
 
-  &:selected, &:selected:focus {
+  &, &:hover, &:selected {
     radio, check {
       &:checked, &:indeterminate {
         background-color: $assets-color;