diff --git a/gtk/src/adw-gtk3/gtk-3.0/_apps.scss b/gtk/src/adw-gtk3/gtk-3.0/_apps.scss
index 0e24160..b017fb7 100644
--- a/gtk/src/adw-gtk3/gtk-3.0/_apps.scss
+++ b/gtk/src/adw-gtk3/gtk-3.0/_apps.scss
@@ -1149,7 +1149,7 @@ geary-conversation-viewer#conversation_viewer {
       background-color: transparent;
       &:hover { background-color: $titlebutton_normal_hover; }
       &:hover:active, &:active, &:hover:checked, &:checked  { background-color: $titlebutton_normal_active; }
-      &:backdrop { background: $titlebutton_backdrop; }
+      &:backdrop { background: transparent; }
       &:backdrop:hover { background: $titlebutton_backdrop_hover; }
     }
   }
@@ -1157,6 +1157,10 @@ geary-conversation-viewer#conversation_viewer {
   &:not(:first-child) > .titlebar {
     border-bottom: transparent;
     box-shadow: none;
+    &:backdrop {
+      background-image: none;
+      background-color: $headerbar_bg_color;
+    }
   }
 }
 
@@ -1164,6 +1168,22 @@ geary-conversation-viewer#conversation_viewer {
   background-color: $borders_color;
 }
 
+.geary-main-window .titlebar .image-button {
+  padding: 0 6px;
+}
+
+.geary-folder {
+  .sidebar.view {
+    &:selected {
+      background-color: $selected_color;
+      &:hover { background-color: $selected_hover_color; }
+    }
+    &:hover {
+      background-color: $hover_color;
+    }
+  }
+}
+
 // ************
 // * Inkscape *
 // ************
diff --git a/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss b/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss
index 25d4d2a..3f68fdf 100644
--- a/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss
+++ b/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss
@@ -678,15 +678,15 @@ tabbar {
     &:first-child { background-image: none; }
 
     &:hover {
-      background-color: $view_hover_color;
+      background-color: $hover_color;
       &, + tab { background-image: none; }
     }
 
     &:checked {
-      background-color: $view_selected_color;
+      background-color: $selected_color;
       &, + tab { background-image: none; }
 
-      &:hover { background-color: $view_selected_hover_color; }
+      &:hover { background-color: $selected_hover_color; }
     }
   }