From fd5729baef61c2a5f4af9b4249d974118705d2f2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 5 Nov 2015 23:42:19 -0500
Subject: [PATCH] Adwaita: Fix up filechooser styling

Several details of sidebar and places view styling were lost
along the way. Bring back the circular buttons.
---
 gtk/theme/Adwaita/_common.scss           |  82 +++---
 gtk/theme/Adwaita/gtk-contained-dark.css | 329 +++++++++++++----------
 gtk/theme/Adwaita/gtk-contained.css      | 329 +++++++++++++----------
 3 files changed, 421 insertions(+), 319 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index dac1b0c4c9..a5060413cc 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2880,28 +2880,54 @@ GtkFileChooserDialog {
   }
 }
 
-$_placesidebar_icons_opacity: 0.7;
-
-placessidebar row {
-  // Needs overriding of the GtkListBoxRow padding
-  padding: 0px;
-  // Using margins/padding directly in the SidebarRow
-  // will make the animation of the new bookmark row jump
-  .sidebar-revealer {
-    padding: 4px 14px 4px 12px;
-  }
-  .sidebar-icon {
-    opacity: $_placesidebar_icons_opacity; // dim the device icons
-    &:dir(ltr) { padding-right: 8px; }
-    &:dir(rtl) { padding-left: 8px; }
-  }
-  .sidebar-label {
-    &:dir(ltr) { padding-right: 2px; }
-    &:dir(rtl) { padding-left: 2px; }
+stacksidebar {
+  & row {
+    padding: 10px 4px;
+    & > label {
+      padding-left: 6px;
+      padding-right: 6px;
+    }
+    &.needs-attention > label {
+      @extend %needs_attention;
+      background-size: 6px 6px, 0 0;
+    }
   }
 }
 
+/****************
+ * File chooser *
+ ****************/
+
+$_placesidebar_icons_opacity: 0.7;
+
 placessidebar {
+  row {
+    // Needs overriding of the GtkListBoxRow padding
+    padding: 0px;
+    // Using margins/padding directly in the SidebarRow
+    // will make the animation of the new bookmark row jump
+    & > revealer {
+      padding: 4px 14px 4px 12px;
+    }
+    & image.sidebar-icon {
+      opacity: $_placesidebar_icons_opacity; // dim the device icons
+      &:dir(ltr) { padding-right: 8px; }
+      &:dir(rtl) { padding-left: 8px; }
+    }
+    & label.sidebar-label {
+      &:dir(ltr) { padding-right: 2px; }
+      &:dir(rtl) { padding-left: 2px; }
+    }
+    @at-root button.sidebar-button {
+      padding: 5px;
+      @extend button.flat;
+      border-radius: 100%;
+      outline-radius: 100%;
+      &:not(:hover):not(:active) > image,
+      &:backdrop > image { opacity: $_placesidebar_icons_opacity };
+    }
+  }
+
   // in the sidebar case it makes no sense to click the selected row
   row:selected:active { box-shadow: none; }
 
@@ -2918,25 +2944,7 @@ placessidebar {
   }
 }
 
-stacksidebar {
-  row {
-    padding: 10px 4px;
-    > label {
-      padding-left: 6px;
-      padding-right: 6px;
-    }
-    &.needs-attention > label {
-      @extend %needs_attention;
-      background-size: 6px 6px, 0 0;
-    }
-  }
-}
-
-/****************
- * File chooser *
- ****************/
-
-GtkPlacesView {
+placesview {
   .server-list-button > image {
     transition: 200ms $ease-out-quad;
     -gtk-icon-transform: rotate(0turn);
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index fe41669905..4c05253199 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -338,7 +338,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  button.flat, headerbar button.titlebutton,
+  button.flat, button.sidebar-button, headerbar button.titlebutton,
   .titlebar button.titlebutton {
     border-color: transparent;
     background-color: transparent;
@@ -347,11 +347,11 @@ button, headerbar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    button.flat:hover, headerbar button.titlebutton:hover,
+    button.flat:hover, button.sidebar-button:hover, headerbar button.titlebutton:hover,
     .titlebar button.titlebutton:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      button.flat:hover:active, headerbar button.titlebutton:hover:active,
+      button.flat:hover:active, button.sidebar-button:hover:active, headerbar button.titlebutton:hover:active,
       .titlebar button.titlebutton:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   button:hover, headerbar button.titlebutton:hover,
@@ -376,7 +376,7 @@ button, headerbar button.titlebutton,
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1);
     transition-duration: 50ms; }
   button:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
     color: #949796;
     border-color: #1f2222;
@@ -385,14 +385,14 @@ button, headerbar button.titlebutton,
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     -gtk-image-effect: none; }
-    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, headerbar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
       color: #949796;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    button:backdrop:insensitive, button.flat:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
+    button:backdrop:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #5d6767;
       border-color: #1f2222;
@@ -401,11 +401,11 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
       .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, headerbar button.titlebutton:backdrop:insensitive:active,
-    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
+    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, button.sidebar-button:backdrop:insensitive:active, headerbar button.titlebutton:backdrop:insensitive:active,
+    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, button.sidebar-button:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #5d6767;
       border-color: #1f2222;
@@ -413,13 +413,13 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
       .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, button.sidebar-button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label, button.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
-  button.flat:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:insensitive, headerbar button.titlebutton:insensitive,
-  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
+  button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:insensitive, button.sidebar-button:insensitive, headerbar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
   .titlebar button.titlebutton:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -550,7 +550,7 @@ button, headerbar button.titlebutton,
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button.flat, .osd headerbar button.titlebutton, headerbar .osd button.titlebutton,
+    .osd button.flat, .osd button.sidebar-button, .osd headerbar button.titlebutton, headerbar .osd button.titlebutton,
     .osd .titlebar button.titlebutton,
     .titlebar .osd button.titlebutton {
       border-color: transparent;
@@ -562,7 +562,7 @@ button, headerbar button.titlebutton,
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd button.flat:hover, .osd headerbar button.titlebutton:hover, headerbar .osd button.titlebutton:hover,
+      .osd button.flat:hover, .osd button.sidebar-button:hover, .osd headerbar button.titlebutton:hover, headerbar .osd button.titlebutton:hover,
       .osd .titlebar button.titlebutton:hover,
       .titlebar .osd button.titlebutton:hover {
         color: white;
@@ -576,7 +576,7 @@ button, headerbar button.titlebutton,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:insensitive, .osd headerbar button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
+      .osd button.flat:insensitive, .osd button.sidebar-button:insensitive, .osd headerbar button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
         color: #878a89;
@@ -589,7 +589,7 @@ button, headerbar button.titlebutton,
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:backdrop, .osd headerbar button.titlebutton:backdrop, headerbar .osd button.titlebutton:backdrop,
+      .osd button.flat:backdrop, .osd button.sidebar-button:backdrop, .osd headerbar button.titlebutton:backdrop, headerbar .osd button.titlebutton:backdrop,
       .osd .titlebar button.titlebutton:backdrop,
       .titlebar .osd button.titlebutton:backdrop {
         border-color: transparent;
@@ -598,9 +598,9 @@ button, headerbar button.titlebutton,
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.flat:active, .osd headerbar button.titlebutton:active, headerbar .osd button.titlebutton:active,
+      .osd button.flat:active, .osd button.sidebar-button:active, .osd headerbar button.titlebutton:active, headerbar .osd button.titlebutton:active,
       .osd .titlebar button.titlebutton:active,
-      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd headerbar button.titlebutton:checked, headerbar .osd button.titlebutton:checked,
+      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd headerbar button.titlebutton:checked, headerbar .osd button.titlebutton:checked,
       .osd .titlebar button.titlebutton:checked,
       .titlebar .osd button.titlebutton:checked {
         color: white;
@@ -623,7 +623,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    button.suggested-action.flat, headerbar button.suggested-action.titlebutton,
+    button.suggested-action.flat, button.suggested-action.sidebar-button, headerbar button.suggested-action.titlebutton,
     .titlebar button.suggested-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -648,7 +648,7 @@ button, headerbar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
-    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
+    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
       color: #d3dfeb;
       border-color: #0b1e33;
@@ -656,14 +656,14 @@ button, headerbar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
-      .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
+      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
+      .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
         color: #d1dae3;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #184472);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
+      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, button.suggested-action.sidebar-button:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
         border-color: #1f2222;
@@ -672,11 +672,11 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
         button.suggested-action:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked,
+        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, button.suggested-action.sidebar-button:backdrop:insensitive:active, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked, button.suggested-action.sidebar-button:backdrop:insensitive:checked, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
           color: #6c88a7;
           border-color: #0b1e33;
@@ -684,13 +684,13 @@ button, headerbar button.titlebutton,
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           button.suggested-action:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label, button.suggested-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.suggested-action.flat:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
-    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, headerbar button.suggested-action.titlebutton:insensitive,
-    .titlebar button.suggested-action.titlebutton:insensitive, button.suggested-action.flat:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
+    button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, button.suggested-action.sidebar-button:insensitive, headerbar button.suggested-action.titlebutton:insensitive,
+    .titlebar button.suggested-action.titlebutton:insensitive, button.suggested-action.flat:backdrop:insensitive, button.suggested-action.sidebar-button:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
     .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -770,7 +770,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
-    button.destructive-action.flat, headerbar button.destructive-action.titlebutton,
+    button.destructive-action.flat, button.destructive-action.sidebar-button, headerbar button.destructive-action.titlebutton,
     .titlebar button.destructive-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -795,7 +795,7 @@ button, headerbar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
-    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
+    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
       color: #f7cfcf;
       border-color: #5e0707;
@@ -803,14 +803,14 @@ button, headerbar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
-      .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
+      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.sidebar-button:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
+      .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, button.destructive-action.sidebar-button:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
         color: #edcece;
         border-color: #5e0707;
         background-image: linear-gradient(to bottom, #a60c0c);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
+      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, button.destructive-action.sidebar-button:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
         border-color: #1f2222;
@@ -819,11 +819,11 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
         button.destructive-action:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked,
+        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, button.destructive-action.sidebar-button:backdrop:insensitive:active, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked, button.destructive-action.sidebar-button:backdrop:insensitive:checked, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
           color: #c46565;
           border-color: #5e0707;
@@ -831,13 +831,13 @@ button, headerbar button.titlebutton,
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           button.destructive-action:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label, button.destructive-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.destructive-action.flat:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
-    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, headerbar button.destructive-action.titlebutton:insensitive,
-    .titlebar button.destructive-action.titlebutton:insensitive, button.destructive-action.flat:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
+    button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, button.destructive-action.sidebar-button:insensitive, headerbar button.destructive-action.titlebutton:insensitive,
+    .titlebar button.destructive-action.titlebutton:insensitive, button.destructive-action.flat:backdrop:insensitive, button.destructive-action.sidebar-button:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
     .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -1059,11 +1059,16 @@ button, headerbar button.titlebutton,
       color: inherit; }
 
 toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat,
-.inline-toolbar.location-bar toolbutton > button.flat, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
+.inline-toolbar.location-bar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, searchbar.inline-toolbar toolbutton > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton > button.sidebar-button, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar toolbutton:backdrop > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop > button.titlebutton,
@@ -1076,13 +1081,18 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
 
 .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
 .titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
-.inline-toolbar.location-bar toolbutton:first-child > button.flat, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
+.inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:first-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar toolbutton:backdrop:first-child > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:first-child > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop:first-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:first-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:first-child > button.titlebutton,
@@ -1091,13 +1101,18 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
 .titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
-.inline-toolbar.location-bar toolbutton:last-child > button.flat, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
+.inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:last-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar toolbutton:backdrop:last-child > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:last-child > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop:last-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:last-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:last-child > button.titlebutton,
@@ -1107,13 +1122,18 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-right-style: solid; }
 .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
 .titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
-.inline-toolbar.location-bar toolbutton:only-child > button.flat, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
+.inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:only-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar toolbutton:backdrop:only-child > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:only-child > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop:only-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:only-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:only-child > button.titlebutton,
@@ -1148,25 +1168,29 @@ modelbutton.flat,
 .titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, menu arrow,
 .menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
 notebook tab .titlebar button.titlebutton,
-.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
+.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
 .app-notification .titlebar button.titlebutton,
 .titlebar .app-notification button.titlebutton,
 .app-notification.frame button.flat,
+.app-notification.frame button.sidebar-button,
 .app-notification.frame headerbar button.titlebutton,
-headerbar .app-notification.frame button.titlebutton, .app-notification button.flat:backdrop, .app-notification headerbar button.titlebutton:backdrop, headerbar .app-notification button.titlebutton:backdrop, .app-notification button.flat:insensitive, .app-notification headerbar button.titlebutton:insensitive, headerbar .app-notification button.titlebutton:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification headerbar button.titlebutton:backdrop:insensitive, headerbar .app-notification button.titlebutton:backdrop:insensitive,
+headerbar .app-notification.frame button.titlebutton, .app-notification button.flat:backdrop, .app-notification button.sidebar-button:backdrop, .app-notification headerbar button.titlebutton:backdrop, headerbar .app-notification button.titlebutton:backdrop, .app-notification button.flat:insensitive, .app-notification button.sidebar-button:insensitive, .app-notification headerbar button.titlebutton:insensitive, headerbar .app-notification button.titlebutton:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification button.sidebar-button:backdrop:insensitive, .app-notification headerbar button.titlebutton:backdrop:insensitive, headerbar .app-notification button.titlebutton:backdrop:insensitive,
 .app-notification .titlebar button.titlebutton:backdrop:insensitive,
 .titlebar .app-notification button.titlebutton:backdrop:insensitive,
 .app-notification.frame button.flat:backdrop,
+.app-notification.frame button.sidebar-button:backdrop,
 .app-notification.frame headerbar button.titlebutton:backdrop,
 headerbar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame .titlebar button.titlebutton:backdrop,
 .titlebar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame button.flat:insensitive,
+.app-notification.frame button.sidebar-button:insensitive,
 .app-notification.frame headerbar button.titlebutton:insensitive,
 headerbar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame .titlebar button.titlebutton:insensitive,
 .titlebar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame button.flat:backdrop:insensitive,
+.app-notification.frame button.sidebar-button:backdrop:insensitive,
 .app-notification.frame headerbar button.titlebutton:backdrop:insensitive,
 headerbar .app-notification.frame button.titlebutton:backdrop:insensitive, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
   border-color: transparent;
@@ -1577,9 +1601,10 @@ headerbar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode button.flat,
+      .titlebar.selection-mode button.flat, .titlebar.selection-mode button.sidebar-button,
       .titlebar.selection-mode button.titlebutton,
       headerbar.selection-mode button.flat,
+      headerbar.selection-mode button.sidebar-button,
       headerbar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
@@ -1606,10 +1631,11 @@ headerbar {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop,
+      .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
       headerbar.selection-mode button:backdrop,
       headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
         color: #d3dfeb;
         border-color: #0b1e33;
@@ -1619,24 +1645,27 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
         -gtk-image-effect: none;
         border-color: #0f2b48; }
-        .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active,
-        .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked,
+        .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode button.sidebar-button:backdrop:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked, .titlebar.selection-mode button.sidebar-button:backdrop:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:checked,
         headerbar.selection-mode button:backdrop:active,
         headerbar.selection-mode button:backdrop:checked,
         headerbar.selection-mode button.flat:backdrop:active,
+        headerbar.selection-mode button.sidebar-button:backdrop:active,
         headerbar.selection-mode button.titlebutton:backdrop:active,
         headerbar.selection-mode button.flat:backdrop:checked,
+        headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
           color: #d1dae3;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-        .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive,
+        .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
         headerbar.selection-mode button:backdrop:insensitive,
         headerbar.selection-mode button.flat:backdrop:insensitive,
+        headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive {
           color: #6f91b4;
           border-color: #0b1e33;
@@ -1645,51 +1674,59 @@ headerbar {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button:backdrop:insensitive > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive > .label,
+          headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
-        .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active,
-        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked,
+        .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
         headerbar.selection-mode button:backdrop:insensitive:active,
         headerbar.selection-mode button:backdrop:insensitive:checked,
         headerbar.selection-mode button.flat:backdrop:insensitive:active,
+        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
         headerbar.selection-mode button.flat:backdrop:insensitive:checked,
+        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
           color: #6c88a7;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button:backdrop:insensitive:active > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button:backdrop:insensitive:checked > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode button.flat:backdrop,
-      .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive,
-      .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop,
+      .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
+      .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
+      .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop, .titlebar.selection-mode button.sidebar-button:insensitive:backdrop,
       .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
       headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop,
       headerbar.selection-mode button.flat:insensitive,
+      headerbar.selection-mode button.sidebar-button:insensitive,
       headerbar.selection-mode button.titlebutton:insensitive,
       headerbar.selection-mode button.flat:insensitive:backdrop,
+      headerbar.selection-mode button.sidebar-button:insensitive:backdrop,
       headerbar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
@@ -2060,10 +2097,11 @@ popover {
   popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  popover button.flat, popover headerbar button.titlebutton, headerbar popover button.titlebutton,
+  popover button.flat, popover button.sidebar-button, popover headerbar button.titlebutton, headerbar popover button.titlebutton,
   popover .titlebar button.titlebutton,
   .titlebar popover button.titlebutton,
   popover button.flat:hover,
+  popover button.sidebar-button:hover,
   popover headerbar button.titlebutton:hover,
   headerbar popover button.titlebutton:hover,
   popover .titlebar button.titlebutton:hover,
@@ -2517,7 +2555,7 @@ switch {
 check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check button.flat, check headerbar button.titlebutton, headerbar check button.titlebutton,
+  check button.flat, check button.sidebar-button, check headerbar button.titlebutton, headerbar check button.titlebutton,
   check .titlebar button.titlebutton,
   .titlebar check button.titlebutton {
     icon-shadow: none; }
@@ -2525,7 +2563,7 @@ check {
 check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:hover button.flat, check:hover headerbar button.titlebutton, headerbar check:hover button.titlebutton,
+  check:hover button.flat, check:hover button.sidebar-button, check:hover headerbar button.titlebutton, headerbar check:hover button.titlebutton,
   check:hover .titlebar button.titlebutton,
   .titlebar check:hover button.titlebutton {
     icon-shadow: none; }
@@ -2533,7 +2571,7 @@ check:hover {
 check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:active button.flat, check:active headerbar button.titlebutton, headerbar check:active button.titlebutton,
+  check:active button.flat, check:active button.sidebar-button, check:active headerbar button.titlebutton, headerbar check:active button.titlebutton,
   check:active .titlebar button.titlebutton,
   .titlebar check:active button.titlebutton {
     icon-shadow: none; }
@@ -2541,7 +2579,7 @@ check:active {
 check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:insensitive button.flat, check:insensitive headerbar button.titlebutton, headerbar check:insensitive button.titlebutton,
+  check:insensitive button.flat, check:insensitive button.sidebar-button, check:insensitive headerbar button.titlebutton, headerbar check:insensitive button.titlebutton,
   check:insensitive .titlebar button.titlebutton,
   .titlebar check:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2549,7 +2587,7 @@ check:insensitive {
 check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  check:backdrop button.flat, check:backdrop headerbar button.titlebutton, headerbar check:backdrop button.titlebutton,
+  check:backdrop button.flat, check:backdrop button.sidebar-button, check:backdrop headerbar button.titlebutton, headerbar check:backdrop button.titlebutton,
   check:backdrop .titlebar button.titlebutton,
   .titlebar check:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2557,7 +2595,7 @@ check:backdrop {
 check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  check:backdrop:insensitive button.flat, check:backdrop:insensitive headerbar button.titlebutton, headerbar check:backdrop:insensitive button.titlebutton,
+  check:backdrop:insensitive button.flat, check:backdrop:insensitive button.sidebar-button, check:backdrop:insensitive headerbar button.titlebutton, headerbar check:backdrop:insensitive button.titlebutton,
   check:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2565,7 +2603,7 @@ check:backdrop:insensitive {
 check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent button.flat, check:inconsistent headerbar button.titlebutton, headerbar check:inconsistent button.titlebutton,
+  check:inconsistent button.flat, check:inconsistent button.sidebar-button, check:inconsistent headerbar button.titlebutton, headerbar check:inconsistent button.titlebutton,
   check:inconsistent .titlebar button.titlebutton,
   .titlebar check:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2573,7 +2611,7 @@ check:inconsistent {
 check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent:hover button.flat, check:inconsistent:hover headerbar button.titlebutton, headerbar check:inconsistent:hover button.titlebutton,
+  check:inconsistent:hover button.flat, check:inconsistent:hover button.sidebar-button, check:inconsistent:hover headerbar button.titlebutton, headerbar check:inconsistent:hover button.titlebutton,
   check:inconsistent:hover .titlebar button.titlebutton,
   .titlebar check:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2581,7 +2619,7 @@ check:inconsistent:hover {
 check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent:selected button.flat, check:inconsistent:selected headerbar button.titlebutton, headerbar check:inconsistent:selected button.titlebutton,
+  check:inconsistent:selected button.flat, check:inconsistent:selected button.sidebar-button, check:inconsistent:selected headerbar button.titlebutton, headerbar check:inconsistent:selected button.titlebutton,
   check:inconsistent:selected .titlebar button.titlebutton,
   .titlebar check:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2589,7 +2627,7 @@ check:inconsistent:selected {
 check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop headerbar button.titlebutton, headerbar check:inconsistent:backdrop button.titlebutton,
+  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop button.sidebar-button, check:inconsistent:backdrop headerbar button.titlebutton, headerbar check:inconsistent:backdrop button.titlebutton,
   check:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2597,7 +2635,7 @@ check:inconsistent:backdrop {
 check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive headerbar button.titlebutton, headerbar check:inconsistent:insensitive button.titlebutton,
+  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive button.sidebar-button, check:inconsistent:insensitive headerbar button.titlebutton, headerbar check:inconsistent:insensitive button.titlebutton,
   check:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2605,7 +2643,7 @@ check:inconsistent:insensitive {
 check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar check:inconsistent:insensitive:backdrop button.titlebutton,
+  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop button.sidebar-button, check:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar check:inconsistent:insensitive:backdrop button.titlebutton,
   check:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2613,7 +2651,7 @@ check:inconsistent:insensitive:backdrop {
 check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked button.flat, check:checked headerbar button.titlebutton, headerbar check:checked button.titlebutton,
+  check:checked button.flat, check:checked button.sidebar-button, check:checked headerbar button.titlebutton, headerbar check:checked button.titlebutton,
   check:checked .titlebar button.titlebutton,
   .titlebar check:checked button.titlebutton {
     icon-shadow: none; }
@@ -2621,7 +2659,7 @@ check:checked {
 check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked:insensitive button.flat, check:checked:insensitive headerbar button.titlebutton, headerbar check:checked:insensitive button.titlebutton,
+  check:checked:insensitive button.flat, check:checked:insensitive button.sidebar-button, check:checked:insensitive headerbar button.titlebutton, headerbar check:checked:insensitive button.titlebutton,
   check:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2629,7 +2667,7 @@ check:checked:insensitive {
 check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked:hover button.flat, check:checked:hover headerbar button.titlebutton, headerbar check:checked:hover button.titlebutton,
+  check:checked:hover button.flat, check:checked:hover button.sidebar-button, check:checked:hover headerbar button.titlebutton, headerbar check:checked:hover button.titlebutton,
   check:checked:hover .titlebar button.titlebutton,
   .titlebar check:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2637,7 +2675,7 @@ check:checked:hover {
 check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked:active button.flat, check:checked:active headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
+  check:checked:active button.flat, check:checked:active button.sidebar-button, check:checked:active headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
   check:checked:active .titlebar button.titlebutton,
   .titlebar check:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2645,7 +2683,7 @@ check:checked:active {
 check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  check:backdrop:checked button.flat, check:backdrop:checked headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
+  check:backdrop:checked button.flat, check:backdrop:checked button.sidebar-button, check:backdrop:checked headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
   check:backdrop:checked .titlebar button.titlebutton,
   .titlebar check:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2653,7 +2691,7 @@ check:backdrop:checked {
 check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive headerbar button.titlebutton, headerbar check:backdrop:checked:insensitive button.titlebutton,
+  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive button.sidebar-button, check:backdrop:checked:insensitive headerbar button.titlebutton, headerbar check:backdrop:checked:insensitive button.titlebutton,
   check:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2674,7 +2712,7 @@ menu menuitem.check {
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio button.flat, radio headerbar button.titlebutton, headerbar radio button.titlebutton,
+  radio button.flat, radio button.sidebar-button, radio headerbar button.titlebutton, headerbar radio button.titlebutton,
   radio .titlebar button.titlebutton,
   .titlebar radio button.titlebutton {
     icon-shadow: none; }
@@ -2682,7 +2720,7 @@ radio {
 radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:hover button.flat, radio:hover headerbar button.titlebutton, headerbar radio:hover button.titlebutton,
+  radio:hover button.flat, radio:hover button.sidebar-button, radio:hover headerbar button.titlebutton, headerbar radio:hover button.titlebutton,
   radio:hover .titlebar button.titlebutton,
   .titlebar radio:hover button.titlebutton {
     icon-shadow: none; }
@@ -2690,7 +2728,7 @@ radio:hover {
 radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:active button.flat, radio:active headerbar button.titlebutton, headerbar radio:active button.titlebutton,
+  radio:active button.flat, radio:active button.sidebar-button, radio:active headerbar button.titlebutton, headerbar radio:active button.titlebutton,
   radio:active .titlebar button.titlebutton,
   .titlebar radio:active button.titlebutton {
     icon-shadow: none; }
@@ -2698,7 +2736,7 @@ radio:active {
 radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:insensitive button.flat, radio:insensitive headerbar button.titlebutton, headerbar radio:insensitive button.titlebutton,
+  radio:insensitive button.flat, radio:insensitive button.sidebar-button, radio:insensitive headerbar button.titlebutton, headerbar radio:insensitive button.titlebutton,
   radio:insensitive .titlebar button.titlebutton,
   .titlebar radio:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2706,7 +2744,7 @@ radio:insensitive {
 radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  radio:backdrop button.flat, radio:backdrop headerbar button.titlebutton, headerbar radio:backdrop button.titlebutton,
+  radio:backdrop button.flat, radio:backdrop button.sidebar-button, radio:backdrop headerbar button.titlebutton, headerbar radio:backdrop button.titlebutton,
   radio:backdrop .titlebar button.titlebutton,
   .titlebar radio:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2714,7 +2752,7 @@ radio:backdrop {
 radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive headerbar button.titlebutton, headerbar radio:backdrop:insensitive button.titlebutton,
+  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive button.sidebar-button, radio:backdrop:insensitive headerbar button.titlebutton, headerbar radio:backdrop:insensitive button.titlebutton,
   radio:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2722,7 +2760,7 @@ radio:backdrop:insensitive {
 radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent button.flat, radio:inconsistent headerbar button.titlebutton, headerbar radio:inconsistent button.titlebutton,
+  radio:inconsistent button.flat, radio:inconsistent button.sidebar-button, radio:inconsistent headerbar button.titlebutton, headerbar radio:inconsistent button.titlebutton,
   radio:inconsistent .titlebar button.titlebutton,
   .titlebar radio:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2730,7 +2768,7 @@ radio:inconsistent {
 radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent:hover button.flat, radio:inconsistent:hover headerbar button.titlebutton, headerbar radio:inconsistent:hover button.titlebutton,
+  radio:inconsistent:hover button.flat, radio:inconsistent:hover button.sidebar-button, radio:inconsistent:hover headerbar button.titlebutton, headerbar radio:inconsistent:hover button.titlebutton,
   radio:inconsistent:hover .titlebar button.titlebutton,
   .titlebar radio:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2738,7 +2776,7 @@ radio:inconsistent:hover {
 radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent:selected button.flat, radio:inconsistent:selected headerbar button.titlebutton, headerbar radio:inconsistent:selected button.titlebutton,
+  radio:inconsistent:selected button.flat, radio:inconsistent:selected button.sidebar-button, radio:inconsistent:selected headerbar button.titlebutton, headerbar radio:inconsistent:selected button.titlebutton,
   radio:inconsistent:selected .titlebar button.titlebutton,
   .titlebar radio:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2746,7 +2784,7 @@ radio:inconsistent:selected {
 radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:backdrop button.titlebutton,
+  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop button.sidebar-button, radio:inconsistent:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:backdrop button.titlebutton,
   radio:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2754,7 +2792,7 @@ radio:inconsistent:backdrop {
 radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive headerbar button.titlebutton, headerbar radio:inconsistent:insensitive button.titlebutton,
+  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive button.sidebar-button, radio:inconsistent:insensitive headerbar button.titlebutton, headerbar radio:inconsistent:insensitive button.titlebutton,
   radio:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2762,7 +2800,7 @@ radio:inconsistent:insensitive {
 radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:insensitive:backdrop button.titlebutton,
+  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop button.sidebar-button, radio:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:insensitive:backdrop button.titlebutton,
   radio:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2770,7 +2808,7 @@ radio:inconsistent:insensitive:backdrop {
 radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked button.flat, radio:checked headerbar button.titlebutton, headerbar radio:checked button.titlebutton,
+  radio:checked button.flat, radio:checked button.sidebar-button, radio:checked headerbar button.titlebutton, headerbar radio:checked button.titlebutton,
   radio:checked .titlebar button.titlebutton,
   .titlebar radio:checked button.titlebutton {
     icon-shadow: none; }
@@ -2778,7 +2816,7 @@ radio:checked {
 radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked:insensitive button.flat, radio:checked:insensitive headerbar button.titlebutton, headerbar radio:checked:insensitive button.titlebutton,
+  radio:checked:insensitive button.flat, radio:checked:insensitive button.sidebar-button, radio:checked:insensitive headerbar button.titlebutton, headerbar radio:checked:insensitive button.titlebutton,
   radio:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2786,7 +2824,7 @@ radio:checked:insensitive {
 radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked:hover button.flat, radio:checked:hover headerbar button.titlebutton, headerbar radio:checked:hover button.titlebutton,
+  radio:checked:hover button.flat, radio:checked:hover button.sidebar-button, radio:checked:hover headerbar button.titlebutton, headerbar radio:checked:hover button.titlebutton,
   radio:checked:hover .titlebar button.titlebutton,
   .titlebar radio:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2794,7 +2832,7 @@ radio:checked:hover {
 radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked:active button.flat, radio:checked:active headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
+  radio:checked:active button.flat, radio:checked:active button.sidebar-button, radio:checked:active headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
   radio:checked:active .titlebar button.titlebutton,
   .titlebar radio:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2802,7 +2840,7 @@ radio:checked:active {
 radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  radio:backdrop:checked button.flat, radio:backdrop:checked headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
+  radio:backdrop:checked button.flat, radio:backdrop:checked button.sidebar-button, radio:backdrop:checked headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
   radio:backdrop:checked .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2810,7 +2848,7 @@ radio:backdrop:checked {
 radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive headerbar button.titlebutton, headerbar radio:backdrop:checked:insensitive button.titlebutton,
+  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive button.sidebar-button, radio:backdrop:checked:insensitive headerbar button.titlebutton, headerbar radio:backdrop:checked:insensitive button.titlebutton,
   radio:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -3667,7 +3705,7 @@ row:selected .titlebar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  row:selected button.flat, row:selected headerbar button.titlebutton, headerbar row:selected button.titlebutton,
+  row:selected button.flat, row:selected button.sidebar-button, row:selected headerbar button.titlebutton, headerbar row:selected button.titlebutton,
   row:selected .titlebar button.titlebutton,
   .titlebar row:selected button.titlebutton {
     border-color: transparent;
@@ -3693,7 +3731,7 @@ row:selected .titlebar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-  row:selected button:backdrop, row:selected button.flat:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
+  row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
     color: #949796;
@@ -3702,16 +3740,16 @@ row:selected .titlebar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    row:selected button:backdrop:active, row:selected button:backdrop:checked, row:selected button.flat:backdrop:active, row:selected headerbar button.titlebutton:backdrop:active, headerbar row:selected button.titlebutton:backdrop:active,
+    row:selected button:backdrop:active, row:selected button:backdrop:checked, row:selected button.flat:backdrop:active, row:selected button.sidebar-button:backdrop:active, row:selected headerbar button.titlebutton:backdrop:active, headerbar row:selected button.titlebutton:backdrop:active,
     row:selected .titlebar button.titlebutton:backdrop:active,
-    .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
+    .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
       color: #949796;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, headerbar row:selected button.titlebutton:backdrop:insensitive,
+    row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected button.sidebar-button:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, headerbar row:selected button.titlebutton:backdrop:insensitive,
     row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar row:selected button.titlebutton:backdrop:insensitive {
       color: #5d6767;
@@ -3721,13 +3759,13 @@ row:selected .titlebar button.titlebutton,
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       row:selected button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label,
-      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
+      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
       row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-      row:selected button:backdrop:insensitive:active, row:selected button:backdrop:insensitive:checked, row:selected button.flat:backdrop:insensitive:active, row:selected headerbar button.titlebutton:backdrop:insensitive:active, headerbar row:selected button.titlebutton:backdrop:insensitive:active,
+      row:selected button:backdrop:insensitive:active, row:selected button:backdrop:insensitive:checked, row:selected button.flat:backdrop:insensitive:active, row:selected button.sidebar-button:backdrop:insensitive:active, row:selected headerbar button.titlebutton:backdrop:insensitive:active, headerbar row:selected button.titlebutton:backdrop:insensitive:active,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:active,
-      .titlebar row:selected button.titlebutton:backdrop:insensitive:active, row:selected button.flat:backdrop:insensitive:checked, row:selected headerbar button.titlebutton:backdrop:insensitive:checked, headerbar row:selected button.titlebutton:backdrop:insensitive:checked,
+      .titlebar row:selected button.titlebutton:backdrop:insensitive:active, row:selected button.flat:backdrop:insensitive:checked, row:selected button.sidebar-button:backdrop:insensitive:checked, row:selected headerbar button.titlebutton:backdrop:insensitive:checked, headerbar row:selected button.titlebutton:backdrop:insensitive:checked,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #5d6767;
@@ -3736,13 +3774,13 @@ row:selected .titlebar button.titlebutton,
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         row:selected button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, row:selected button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
+        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-        .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected button.flat:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:checked > .label,
+        .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected button.flat:backdrop:insensitive:checked > .label, row:selected button.sidebar-button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
         .titlebar row:selected button.titlebutton:backdrop:insensitive:checked > .label {
           color: inherit; }
-  row:selected button.flat:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
+  row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
     border-color: transparent;
@@ -3803,10 +3841,11 @@ row {
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification button.flat, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
+    .app-notification button.flat, .app-notification button.sidebar-button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
     .app-notification .titlebar button.titlebutton,
     .titlebar .app-notification button.titlebutton,
     .app-notification.frame button.flat,
+    .app-notification.frame button.sidebar-button,
     .app-notification.frame headerbar button.titlebutton,
     headerbar .app-notification.frame button.titlebutton,
     .app-notification.frame .titlebar button.titlebutton,
@@ -4091,28 +4130,6 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #333636; }
 
-placessidebar row {
-  padding: 0px; }
-  placessidebar row .sidebar-revealer {
-    padding: 4px 14px 4px 12px; }
-  placessidebar row .sidebar-icon {
-    opacity: 0.7; }
-    placessidebar row .sidebar-icon:dir(ltr) {
-      padding-right: 8px; }
-    placessidebar row .sidebar-icon:dir(rtl) {
-      padding-left: 8px; }
-  placessidebar row .sidebar-label:dir(ltr) {
-    padding-right: 2px; }
-  placessidebar row .sidebar-label:dir(rtl) {
-    padding-left: 2px; }
-
-placessidebar row:selected:active {
-  box-shadow: none; }
-placessidebar row.sidebar-placeholder-row {
-  border: solid 1px #215d9c; }
-placessidebar row.sidebar-new-bookmark-row {
-  color: #215d9c; }
-
 stacksidebar row {
   padding: 10px 4px; }
   stacksidebar row > label {
@@ -4124,13 +4141,43 @@ stacksidebar row {
 /****************
  * File chooser *
  ****************/
-GtkPlacesView .server-list-button > image {
+placessidebar row {
+  padding: 0px; }
+  placessidebar row > revealer {
+    padding: 4px 14px 4px 12px; }
+  placessidebar row image.sidebar-icon {
+    opacity: 0.7; }
+    placessidebar row image.sidebar-icon:dir(ltr) {
+      padding-right: 8px; }
+    placessidebar row image.sidebar-icon:dir(rtl) {
+      padding-left: 8px; }
+  placessidebar row label.sidebar-label:dir(ltr) {
+    padding-right: 2px; }
+  placessidebar row label.sidebar-label:dir(rtl) {
+    padding-left: 2px; }
+  button.sidebar-button, headerbar button.sidebar-button.titlebutton,
+  .titlebar button.sidebar-button.titlebutton {
+    padding: 5px;
+    border-radius: 100%;
+    outline-radius: 100%; }
+    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
+    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
+    .titlebar button.sidebar-button.titlebutton:backdrop > image {
+      opacity: 0.7; }
+placessidebar row:selected:active {
+  box-shadow: none; }
+placessidebar row.sidebar-placeholder-row {
+  border: solid 1px #215d9c; }
+placessidebar row.sidebar-new-bookmark-row {
+  color: #215d9c; }
+
+placesview .server-list-button > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(0turn); }
-GtkPlacesView .server-list-button:checked > image {
+placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
-GtkPlacesView row.activatable:hover {
+placesview row.activatable:hover {
   background-color: transparent; }
 
 /*********
@@ -4419,7 +4466,7 @@ colorswatch {
   .content-view:backdrop {
     background-color: #282c2c; }
 
-.osd .scale-popup button.flat, .osd .scale-popup headerbar button.titlebutton, headerbar .osd .scale-popup button.titlebutton,
+.osd .scale-popup button.flat, .osd .scale-popup button.sidebar-button, .osd .scale-popup headerbar button.titlebutton, headerbar .osd .scale-popup button.titlebutton,
 .osd .scale-popup .titlebar button.titlebutton,
 .titlebar .osd .scale-popup button.titlebutton {
   padding: 6px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index fb4a8f57f9..71d25209d4 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -338,7 +338,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  button.flat, headerbar button.titlebutton,
+  button.flat, button.sidebar-button, headerbar button.titlebutton,
   .titlebar button.titlebutton {
     border-color: transparent;
     background-color: transparent;
@@ -347,11 +347,11 @@ button, headerbar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    button.flat:hover, headerbar button.titlebutton:hover,
+    button.flat:hover, button.sidebar-button:hover, headerbar button.titlebutton:hover,
     .titlebar button.titlebutton:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      button.flat:hover:active, headerbar button.titlebutton:hover:active,
+      button.flat:hover:active, button.sidebar-button:hover:active, headerbar button.titlebutton:hover:active,
       .titlebar button.titlebutton:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   button:hover, headerbar button.titlebutton:hover,
@@ -376,7 +376,7 @@ button, headerbar button.titlebutton,
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white;
     transition-duration: 50ms; }
   button:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
     color: #8e9192;
     border-color: darkgray;
@@ -385,14 +385,14 @@ button, headerbar button.titlebutton,
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, headerbar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
       color: #8e9192;
       border-color: darkgray;
       background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    button:backdrop:insensitive, button.flat:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
+    button:backdrop:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
       border-color: darkgray;
@@ -401,11 +401,11 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
       .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, headerbar button.titlebutton:backdrop:insensitive:active,
-    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
+    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, button.sidebar-button:backdrop:insensitive:active, headerbar button.titlebutton:backdrop:insensitive:active,
+    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, button.sidebar-button:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #c7c7c7;
       border-color: darkgray;
@@ -413,13 +413,13 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
       .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, button.sidebar-button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label, button.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
-  button.flat:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:insensitive, headerbar button.titlebutton:insensitive,
-  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
+  button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:insensitive, button.sidebar-button:insensitive, headerbar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
   .titlebar button.titlebutton:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -550,7 +550,7 @@ button, headerbar button.titlebutton,
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button.flat, .osd headerbar button.titlebutton, headerbar .osd button.titlebutton,
+    .osd button.flat, .osd button.sidebar-button, .osd headerbar button.titlebutton, headerbar .osd button.titlebutton,
     .osd .titlebar button.titlebutton,
     .titlebar .osd button.titlebutton {
       border-color: transparent;
@@ -562,7 +562,7 @@ button, headerbar button.titlebutton,
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd button.flat:hover, .osd headerbar button.titlebutton:hover, headerbar .osd button.titlebutton:hover,
+      .osd button.flat:hover, .osd button.sidebar-button:hover, .osd headerbar button.titlebutton:hover, headerbar .osd button.titlebutton:hover,
       .osd .titlebar button.titlebutton:hover,
       .titlebar .osd button.titlebutton:hover {
         color: white;
@@ -576,7 +576,7 @@ button, headerbar button.titlebutton,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:insensitive, .osd headerbar button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
+      .osd button.flat:insensitive, .osd button.sidebar-button:insensitive, .osd headerbar button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
         color: #878a89;
@@ -589,7 +589,7 @@ button, headerbar button.titlebutton,
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:backdrop, .osd headerbar button.titlebutton:backdrop, headerbar .osd button.titlebutton:backdrop,
+      .osd button.flat:backdrop, .osd button.sidebar-button:backdrop, .osd headerbar button.titlebutton:backdrop, headerbar .osd button.titlebutton:backdrop,
       .osd .titlebar button.titlebutton:backdrop,
       .titlebar .osd button.titlebutton:backdrop {
         border-color: transparent;
@@ -598,9 +598,9 @@ button, headerbar button.titlebutton,
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.flat:active, .osd headerbar button.titlebutton:active, headerbar .osd button.titlebutton:active,
+      .osd button.flat:active, .osd button.sidebar-button:active, .osd headerbar button.titlebutton:active, headerbar .osd button.titlebutton:active,
       .osd .titlebar button.titlebutton:active,
-      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd headerbar button.titlebutton:checked, headerbar .osd button.titlebutton:checked,
+      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd headerbar button.titlebutton:checked, headerbar .osd button.titlebutton:checked,
       .osd .titlebar button.titlebutton:checked,
       .titlebar .osd button.titlebutton:checked {
         color: white;
@@ -623,7 +623,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.suggested-action.flat, headerbar button.suggested-action.titlebutton,
+    button.suggested-action.flat, button.suggested-action.sidebar-button, headerbar button.suggested-action.titlebutton,
     .titlebar button.suggested-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -648,7 +648,7 @@ button, headerbar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
+    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
       color: #dbe9f7;
       border-color: #4a90d9;
@@ -656,14 +656,14 @@ button, headerbar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
-      .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
+      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
+      .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
         color: #d4e4f4;
         border-color: #2a76c6;
         background-image: linear-gradient(to bottom, #2a76c6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
+      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, button.suggested-action.sidebar-button:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
         border-color: darkgray;
@@ -672,11 +672,11 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
         button.suggested-action:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked,
+        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, button.suggested-action.sidebar-button:backdrop:insensitive:active, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked, button.suggested-action.sidebar-button:backdrop:insensitive:checked, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
           color: #8db9e8;
           border-color: #5094db;
@@ -684,13 +684,13 @@ button, headerbar button.titlebutton,
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           button.suggested-action:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label, button.suggested-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.suggested-action.flat:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
-    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, headerbar button.suggested-action.titlebutton:insensitive,
-    .titlebar button.suggested-action.titlebutton:insensitive, button.suggested-action.flat:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
+    button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, button.suggested-action.sidebar-button:insensitive, headerbar button.suggested-action.titlebutton:insensitive,
+    .titlebar button.suggested-action.titlebutton:insensitive, button.suggested-action.flat:backdrop:insensitive, button.suggested-action.sidebar-button:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
     .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -770,7 +770,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.destructive-action.flat, headerbar button.destructive-action.titlebutton,
+    button.destructive-action.flat, button.destructive-action.sidebar-button, headerbar button.destructive-action.titlebutton,
     .titlebar button.destructive-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -795,7 +795,7 @@ button, headerbar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
+    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
       color: #fcd4d4;
       border-color: #ef2929;
@@ -803,14 +803,14 @@ button, headerbar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
-      .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
+      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.sidebar-button:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
+      .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, button.destructive-action.sidebar-button:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
         color: #f7cfcf;
         border-color: #d51010;
         background-image: linear-gradient(to bottom, #d51010);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
+      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, button.destructive-action.sidebar-button:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
         border-color: darkgray;
@@ -819,11 +819,11 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
         button.destructive-action:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked,
+        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, button.destructive-action.sidebar-button:backdrop:insensitive:active, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked, button.destructive-action.sidebar-button:backdrop:insensitive:checked, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
           color: #f57979;
           border-color: #ef3131;
@@ -831,13 +831,13 @@ button, headerbar button.titlebutton,
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           button.destructive-action:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label, button.destructive-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.destructive-action.flat:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
-    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, headerbar button.destructive-action.titlebutton:insensitive,
-    .titlebar button.destructive-action.titlebutton:insensitive, button.destructive-action.flat:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
+    button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, button.destructive-action.sidebar-button:insensitive, headerbar button.destructive-action.titlebutton:insensitive,
+    .titlebar button.destructive-action.titlebutton:insensitive, button.destructive-action.flat:backdrop:insensitive, button.destructive-action.sidebar-button:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
     .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -1059,11 +1059,16 @@ button, headerbar button.titlebutton,
       color: inherit; }
 
 toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat,
-.inline-toolbar.location-bar toolbutton > button.flat, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
+.inline-toolbar.location-bar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, searchbar.inline-toolbar toolbutton > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton > button.sidebar-button, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar toolbutton:backdrop > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop > button.titlebutton,
@@ -1076,13 +1081,18 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
 
 .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
 .titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
-.inline-toolbar.location-bar toolbutton:first-child > button.flat, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
+.inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:first-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar toolbutton:backdrop:first-child > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:first-child > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop:first-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop:first-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:first-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:first-child > button.titlebutton,
@@ -1091,13 +1101,18 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
 .titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
-.inline-toolbar.location-bar toolbutton:last-child > button.flat, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
+.inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:last-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar toolbutton:backdrop:last-child > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:last-child > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop:last-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop:last-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:last-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:last-child > button.titlebutton,
@@ -1107,13 +1122,18 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-right-style: solid; }
 .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
 .titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
-.inline-toolbar.location-bar toolbutton:only-child > button.flat, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
+.inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:only-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar toolbutton:backdrop:only-child > button.flat,
 searchbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:only-child > button.flat,
+toolbar.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
+.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
+searchbar.inline-toolbar toolbutton:backdrop:only-child > button.sidebar-button,
+.inline-toolbar.location-bar toolbutton:backdrop:only-child > button.sidebar-button,
 .inline-toolbar headerbar toolbutton:backdrop:only-child > button.titlebutton,
 headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:backdrop:only-child > button.titlebutton,
@@ -1148,25 +1168,29 @@ modelbutton.flat,
 .titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, menu arrow,
 .menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
 notebook tab .titlebar button.titlebutton,
-.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
+.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
 .app-notification .titlebar button.titlebutton,
 .titlebar .app-notification button.titlebutton,
 .app-notification.frame button.flat,
+.app-notification.frame button.sidebar-button,
 .app-notification.frame headerbar button.titlebutton,
-headerbar .app-notification.frame button.titlebutton, .app-notification button.flat:backdrop, .app-notification headerbar button.titlebutton:backdrop, headerbar .app-notification button.titlebutton:backdrop, .app-notification button.flat:insensitive, .app-notification headerbar button.titlebutton:insensitive, headerbar .app-notification button.titlebutton:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification headerbar button.titlebutton:backdrop:insensitive, headerbar .app-notification button.titlebutton:backdrop:insensitive,
+headerbar .app-notification.frame button.titlebutton, .app-notification button.flat:backdrop, .app-notification button.sidebar-button:backdrop, .app-notification headerbar button.titlebutton:backdrop, headerbar .app-notification button.titlebutton:backdrop, .app-notification button.flat:insensitive, .app-notification button.sidebar-button:insensitive, .app-notification headerbar button.titlebutton:insensitive, headerbar .app-notification button.titlebutton:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification button.sidebar-button:backdrop:insensitive, .app-notification headerbar button.titlebutton:backdrop:insensitive, headerbar .app-notification button.titlebutton:backdrop:insensitive,
 .app-notification .titlebar button.titlebutton:backdrop:insensitive,
 .titlebar .app-notification button.titlebutton:backdrop:insensitive,
 .app-notification.frame button.flat:backdrop,
+.app-notification.frame button.sidebar-button:backdrop,
 .app-notification.frame headerbar button.titlebutton:backdrop,
 headerbar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame .titlebar button.titlebutton:backdrop,
 .titlebar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame button.flat:insensitive,
+.app-notification.frame button.sidebar-button:insensitive,
 .app-notification.frame headerbar button.titlebutton:insensitive,
 headerbar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame .titlebar button.titlebutton:insensitive,
 .titlebar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame button.flat:backdrop:insensitive,
+.app-notification.frame button.sidebar-button:backdrop:insensitive,
 .app-notification.frame headerbar button.titlebutton:backdrop:insensitive,
 headerbar .app-notification.frame button.titlebutton:backdrop:insensitive, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
   border-color: transparent;
@@ -1577,9 +1601,10 @@ headerbar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
-      .titlebar.selection-mode button.flat,
+      .titlebar.selection-mode button.flat, .titlebar.selection-mode button.sidebar-button,
       .titlebar.selection-mode button.titlebutton,
       headerbar.selection-mode button.flat,
+      headerbar.selection-mode button.sidebar-button,
       headerbar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
@@ -1606,10 +1631,11 @@ headerbar {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec; }
-      .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop,
+      .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
       headerbar.selection-mode button:backdrop,
       headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
         color: #dbe9f7;
         border-color: #4a90d9;
@@ -1619,24 +1645,27 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
         -gtk-image-effect: none;
         border-color: #184472; }
-        .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active,
-        .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked,
+        .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode button.sidebar-button:backdrop:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked, .titlebar.selection-mode button.sidebar-button:backdrop:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:checked,
         headerbar.selection-mode button:backdrop:active,
         headerbar.selection-mode button:backdrop:checked,
         headerbar.selection-mode button.flat:backdrop:active,
+        headerbar.selection-mode button.sidebar-button:backdrop:active,
         headerbar.selection-mode button.titlebutton:backdrop:active,
         headerbar.selection-mode button.flat:backdrop:checked,
+        headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
           color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-        .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive,
+        .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
         headerbar.selection-mode button:backdrop:insensitive,
         headerbar.selection-mode button.flat:backdrop:insensitive,
+        headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive {
           color: #9bc2ea;
           border-color: #65a1df;
@@ -1645,51 +1674,59 @@ headerbar {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button:backdrop:insensitive > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive > .label,
+          headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
-        .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active,
-        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked,
+        .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
         headerbar.selection-mode button:backdrop:insensitive:active,
         headerbar.selection-mode button:backdrop:insensitive:checked,
         headerbar.selection-mode button.flat:backdrop:insensitive:active,
+        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
         headerbar.selection-mode button.flat:backdrop:insensitive:checked,
+        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
           color: #8db9e8;
           border-color: #5094db;
           background-image: linear-gradient(to bottom, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button:backdrop:insensitive:active > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button:backdrop:insensitive:checked > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode button.flat:backdrop,
-      .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive,
-      .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop,
+      .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
+      .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
+      .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop, .titlebar.selection-mode button.sidebar-button:insensitive:backdrop,
       .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
       headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop,
       headerbar.selection-mode button.flat:insensitive,
+      headerbar.selection-mode button.sidebar-button:insensitive,
       headerbar.selection-mode button.titlebutton:insensitive,
       headerbar.selection-mode button.flat:insensitive:backdrop,
+      headerbar.selection-mode button.sidebar-button:insensitive:backdrop,
       headerbar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
@@ -2066,10 +2103,11 @@ popover {
   popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  popover button.flat, popover headerbar button.titlebutton, headerbar popover button.titlebutton,
+  popover button.flat, popover button.sidebar-button, popover headerbar button.titlebutton, headerbar popover button.titlebutton,
   popover .titlebar button.titlebutton,
   .titlebar popover button.titlebutton,
   popover button.flat:hover,
+  popover button.sidebar-button:hover,
   popover headerbar button.titlebutton:hover,
   headerbar popover button.titlebutton:hover,
   popover .titlebar button.titlebutton:hover,
@@ -2535,7 +2573,7 @@ switch {
 check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check button.flat, check headerbar button.titlebutton, headerbar check button.titlebutton,
+  check button.flat, check button.sidebar-button, check headerbar button.titlebutton, headerbar check button.titlebutton,
   check .titlebar button.titlebutton,
   .titlebar check button.titlebutton {
     icon-shadow: none; }
@@ -2547,7 +2585,7 @@ row:selected check {
 check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:hover button.flat, check:hover headerbar button.titlebutton, headerbar check:hover button.titlebutton,
+  check:hover button.flat, check:hover button.sidebar-button, check:hover headerbar button.titlebutton, headerbar check:hover button.titlebutton,
   check:hover .titlebar button.titlebutton,
   .titlebar check:hover button.titlebutton {
     icon-shadow: none; }
@@ -2559,7 +2597,7 @@ row:selected check:hover {
 check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:active button.flat, check:active headerbar button.titlebutton, headerbar check:active button.titlebutton,
+  check:active button.flat, check:active button.sidebar-button, check:active headerbar button.titlebutton, headerbar check:active button.titlebutton,
   check:active .titlebar button.titlebutton,
   .titlebar check:active button.titlebutton {
     icon-shadow: none; }
@@ -2571,7 +2609,7 @@ row:selected check:active {
 check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:insensitive button.flat, check:insensitive headerbar button.titlebutton, headerbar check:insensitive button.titlebutton,
+  check:insensitive button.flat, check:insensitive button.sidebar-button, check:insensitive headerbar button.titlebutton, headerbar check:insensitive button.titlebutton,
   check:insensitive .titlebar button.titlebutton,
   .titlebar check:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2583,7 +2621,7 @@ row:selected check:insensitive {
 check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  check:backdrop button.flat, check:backdrop headerbar button.titlebutton, headerbar check:backdrop button.titlebutton,
+  check:backdrop button.flat, check:backdrop button.sidebar-button, check:backdrop headerbar button.titlebutton, headerbar check:backdrop button.titlebutton,
   check:backdrop .titlebar button.titlebutton,
   .titlebar check:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2595,7 +2633,7 @@ row:selected check:backdrop {
 check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  check:backdrop:insensitive button.flat, check:backdrop:insensitive headerbar button.titlebutton, headerbar check:backdrop:insensitive button.titlebutton,
+  check:backdrop:insensitive button.flat, check:backdrop:insensitive button.sidebar-button, check:backdrop:insensitive headerbar button.titlebutton, headerbar check:backdrop:insensitive button.titlebutton,
   check:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2607,7 +2645,7 @@ row:selected check:backdrop:insensitive {
 check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent button.flat, check:inconsistent headerbar button.titlebutton, headerbar check:inconsistent button.titlebutton,
+  check:inconsistent button.flat, check:inconsistent button.sidebar-button, check:inconsistent headerbar button.titlebutton, headerbar check:inconsistent button.titlebutton,
   check:inconsistent .titlebar button.titlebutton,
   .titlebar check:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2619,7 +2657,7 @@ row:selected check:inconsistent {
 check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent:hover button.flat, check:inconsistent:hover headerbar button.titlebutton, headerbar check:inconsistent:hover button.titlebutton,
+  check:inconsistent:hover button.flat, check:inconsistent:hover button.sidebar-button, check:inconsistent:hover headerbar button.titlebutton, headerbar check:inconsistent:hover button.titlebutton,
   check:inconsistent:hover .titlebar button.titlebutton,
   .titlebar check:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2631,7 +2669,7 @@ row:selected check:inconsistent:hover {
 check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent:selected button.flat, check:inconsistent:selected headerbar button.titlebutton, headerbar check:inconsistent:selected button.titlebutton,
+  check:inconsistent:selected button.flat, check:inconsistent:selected button.sidebar-button, check:inconsistent:selected headerbar button.titlebutton, headerbar check:inconsistent:selected button.titlebutton,
   check:inconsistent:selected .titlebar button.titlebutton,
   .titlebar check:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2643,7 +2681,7 @@ row:selected check:inconsistent:selected {
 check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop headerbar button.titlebutton, headerbar check:inconsistent:backdrop button.titlebutton,
+  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop button.sidebar-button, check:inconsistent:backdrop headerbar button.titlebutton, headerbar check:inconsistent:backdrop button.titlebutton,
   check:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2655,7 +2693,7 @@ row:selected check:inconsistent:backdrop {
 check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive headerbar button.titlebutton, headerbar check:inconsistent:insensitive button.titlebutton,
+  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive button.sidebar-button, check:inconsistent:insensitive headerbar button.titlebutton, headerbar check:inconsistent:insensitive button.titlebutton,
   check:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2667,7 +2705,7 @@ row:selected check:inconsistent:insensitive {
 check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar check:inconsistent:insensitive:backdrop button.titlebutton,
+  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop button.sidebar-button, check:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar check:inconsistent:insensitive:backdrop button.titlebutton,
   check:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2679,7 +2717,7 @@ row:selected check:inconsistent:insensitive:backdrop {
 check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked button.flat, check:checked headerbar button.titlebutton, headerbar check:checked button.titlebutton,
+  check:checked button.flat, check:checked button.sidebar-button, check:checked headerbar button.titlebutton, headerbar check:checked button.titlebutton,
   check:checked .titlebar button.titlebutton,
   .titlebar check:checked button.titlebutton {
     icon-shadow: none; }
@@ -2691,7 +2729,7 @@ row:selected check:checked {
 check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked:insensitive button.flat, check:checked:insensitive headerbar button.titlebutton, headerbar check:checked:insensitive button.titlebutton,
+  check:checked:insensitive button.flat, check:checked:insensitive button.sidebar-button, check:checked:insensitive headerbar button.titlebutton, headerbar check:checked:insensitive button.titlebutton,
   check:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2703,7 +2741,7 @@ row:selected check:checked:insensitive {
 check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked:hover button.flat, check:checked:hover headerbar button.titlebutton, headerbar check:checked:hover button.titlebutton,
+  check:checked:hover button.flat, check:checked:hover button.sidebar-button, check:checked:hover headerbar button.titlebutton, headerbar check:checked:hover button.titlebutton,
   check:checked:hover .titlebar button.titlebutton,
   .titlebar check:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2715,7 +2753,7 @@ row:selected check:checked:hover {
 check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked:active button.flat, check:checked:active headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
+  check:checked:active button.flat, check:checked:active button.sidebar-button, check:checked:active headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
   check:checked:active .titlebar button.titlebutton,
   .titlebar check:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2727,7 +2765,7 @@ row:selected check:checked:active {
 check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png"));
   icon-shadow: none; }
-  check:backdrop:checked button.flat, check:backdrop:checked headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
+  check:backdrop:checked button.flat, check:backdrop:checked button.sidebar-button, check:backdrop:checked headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
   check:backdrop:checked .titlebar button.titlebutton,
   .titlebar check:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2739,7 +2777,7 @@ row:selected check:backdrop:checked {
 check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive headerbar button.titlebutton, headerbar check:backdrop:checked:insensitive button.titlebutton,
+  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive button.sidebar-button, check:backdrop:checked:insensitive headerbar button.titlebutton, headerbar check:backdrop:checked:insensitive button.titlebutton,
   check:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2764,7 +2802,7 @@ menu menuitem.check {
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio button.flat, radio headerbar button.titlebutton, headerbar radio button.titlebutton,
+  radio button.flat, radio button.sidebar-button, radio headerbar button.titlebutton, headerbar radio button.titlebutton,
   radio .titlebar button.titlebutton,
   .titlebar radio button.titlebutton {
     icon-shadow: none; }
@@ -2776,7 +2814,7 @@ row:selected radio {
 radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:hover button.flat, radio:hover headerbar button.titlebutton, headerbar radio:hover button.titlebutton,
+  radio:hover button.flat, radio:hover button.sidebar-button, radio:hover headerbar button.titlebutton, headerbar radio:hover button.titlebutton,
   radio:hover .titlebar button.titlebutton,
   .titlebar radio:hover button.titlebutton {
     icon-shadow: none; }
@@ -2788,7 +2826,7 @@ row:selected radio:hover {
 radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:active button.flat, radio:active headerbar button.titlebutton, headerbar radio:active button.titlebutton,
+  radio:active button.flat, radio:active button.sidebar-button, radio:active headerbar button.titlebutton, headerbar radio:active button.titlebutton,
   radio:active .titlebar button.titlebutton,
   .titlebar radio:active button.titlebutton {
     icon-shadow: none; }
@@ -2800,7 +2838,7 @@ row:selected radio:active {
 radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:insensitive button.flat, radio:insensitive headerbar button.titlebutton, headerbar radio:insensitive button.titlebutton,
+  radio:insensitive button.flat, radio:insensitive button.sidebar-button, radio:insensitive headerbar button.titlebutton, headerbar radio:insensitive button.titlebutton,
   radio:insensitive .titlebar button.titlebutton,
   .titlebar radio:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2812,7 +2850,7 @@ row:selected radio:insensitive {
 radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  radio:backdrop button.flat, radio:backdrop headerbar button.titlebutton, headerbar radio:backdrop button.titlebutton,
+  radio:backdrop button.flat, radio:backdrop button.sidebar-button, radio:backdrop headerbar button.titlebutton, headerbar radio:backdrop button.titlebutton,
   radio:backdrop .titlebar button.titlebutton,
   .titlebar radio:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2824,7 +2862,7 @@ row:selected radio:backdrop {
 radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive headerbar button.titlebutton, headerbar radio:backdrop:insensitive button.titlebutton,
+  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive button.sidebar-button, radio:backdrop:insensitive headerbar button.titlebutton, headerbar radio:backdrop:insensitive button.titlebutton,
   radio:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2836,7 +2874,7 @@ row:selected radio:backdrop:insensitive {
 radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent button.flat, radio:inconsistent headerbar button.titlebutton, headerbar radio:inconsistent button.titlebutton,
+  radio:inconsistent button.flat, radio:inconsistent button.sidebar-button, radio:inconsistent headerbar button.titlebutton, headerbar radio:inconsistent button.titlebutton,
   radio:inconsistent .titlebar button.titlebutton,
   .titlebar radio:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2848,7 +2886,7 @@ row:selected radio:inconsistent {
 radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent:hover button.flat, radio:inconsistent:hover headerbar button.titlebutton, headerbar radio:inconsistent:hover button.titlebutton,
+  radio:inconsistent:hover button.flat, radio:inconsistent:hover button.sidebar-button, radio:inconsistent:hover headerbar button.titlebutton, headerbar radio:inconsistent:hover button.titlebutton,
   radio:inconsistent:hover .titlebar button.titlebutton,
   .titlebar radio:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2860,7 +2898,7 @@ row:selected radio:inconsistent:hover {
 radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent:selected button.flat, radio:inconsistent:selected headerbar button.titlebutton, headerbar radio:inconsistent:selected button.titlebutton,
+  radio:inconsistent:selected button.flat, radio:inconsistent:selected button.sidebar-button, radio:inconsistent:selected headerbar button.titlebutton, headerbar radio:inconsistent:selected button.titlebutton,
   radio:inconsistent:selected .titlebar button.titlebutton,
   .titlebar radio:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2872,7 +2910,7 @@ row:selected radio:inconsistent:selected {
 radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:backdrop button.titlebutton,
+  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop button.sidebar-button, radio:inconsistent:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:backdrop button.titlebutton,
   radio:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2884,7 +2922,7 @@ row:selected radio:inconsistent:backdrop {
 radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive headerbar button.titlebutton, headerbar radio:inconsistent:insensitive button.titlebutton,
+  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive button.sidebar-button, radio:inconsistent:insensitive headerbar button.titlebutton, headerbar radio:inconsistent:insensitive button.titlebutton,
   radio:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2896,7 +2934,7 @@ row:selected radio:inconsistent:insensitive {
 radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:insensitive:backdrop button.titlebutton,
+  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop button.sidebar-button, radio:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:insensitive:backdrop button.titlebutton,
   radio:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2908,7 +2946,7 @@ row:selected radio:inconsistent:insensitive:backdrop {
 radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked button.flat, radio:checked headerbar button.titlebutton, headerbar radio:checked button.titlebutton,
+  radio:checked button.flat, radio:checked button.sidebar-button, radio:checked headerbar button.titlebutton, headerbar radio:checked button.titlebutton,
   radio:checked .titlebar button.titlebutton,
   .titlebar radio:checked button.titlebutton {
     icon-shadow: none; }
@@ -2920,7 +2958,7 @@ row:selected radio:checked {
 radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked:insensitive button.flat, radio:checked:insensitive headerbar button.titlebutton, headerbar radio:checked:insensitive button.titlebutton,
+  radio:checked:insensitive button.flat, radio:checked:insensitive button.sidebar-button, radio:checked:insensitive headerbar button.titlebutton, headerbar radio:checked:insensitive button.titlebutton,
   radio:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2932,7 +2970,7 @@ row:selected radio:checked:insensitive {
 radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked:hover button.flat, radio:checked:hover headerbar button.titlebutton, headerbar radio:checked:hover button.titlebutton,
+  radio:checked:hover button.flat, radio:checked:hover button.sidebar-button, radio:checked:hover headerbar button.titlebutton, headerbar radio:checked:hover button.titlebutton,
   radio:checked:hover .titlebar button.titlebutton,
   .titlebar radio:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2944,7 +2982,7 @@ row:selected radio:checked:hover {
 radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked:active button.flat, radio:checked:active headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
+  radio:checked:active button.flat, radio:checked:active button.sidebar-button, radio:checked:active headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
   radio:checked:active .titlebar button.titlebutton,
   .titlebar radio:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2956,7 +2994,7 @@ row:selected radio:checked:active {
 radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png"));
   icon-shadow: none; }
-  radio:backdrop:checked button.flat, radio:backdrop:checked headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
+  radio:backdrop:checked button.flat, radio:backdrop:checked button.sidebar-button, radio:backdrop:checked headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
   radio:backdrop:checked .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2968,7 +3006,7 @@ row:selected radio:backdrop:checked {
 radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive headerbar button.titlebutton, headerbar radio:backdrop:checked:insensitive button.titlebutton,
+  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive button.sidebar-button, radio:backdrop:checked:insensitive headerbar button.titlebutton, headerbar radio:backdrop:checked:insensitive button.titlebutton,
   radio:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -3830,7 +3868,7 @@ row:selected .titlebar button.titlebutton,
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white;
   border-color: #184472; }
-  row:selected button.flat, row:selected headerbar button.titlebutton, headerbar row:selected button.titlebutton,
+  row:selected button.flat, row:selected button.sidebar-button, row:selected headerbar button.titlebutton, headerbar row:selected button.titlebutton,
   row:selected .titlebar button.titlebutton,
   .titlebar row:selected button.titlebutton {
     border-color: transparent;
@@ -3858,7 +3896,7 @@ row:selected .titlebar button.titlebutton,
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     border-color: #184472; }
-  row:selected button:backdrop, row:selected button.flat:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
+  row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
     color: #8e9192;
@@ -3868,9 +3906,9 @@ row:selected .titlebar button.titlebutton,
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    row:selected button:backdrop:active, row:selected button:backdrop:checked, row:selected button.flat:backdrop:active, row:selected headerbar button.titlebutton:backdrop:active, headerbar row:selected button.titlebutton:backdrop:active,
+    row:selected button:backdrop:active, row:selected button:backdrop:checked, row:selected button.flat:backdrop:active, row:selected button.sidebar-button:backdrop:active, row:selected headerbar button.titlebutton:backdrop:active, headerbar row:selected button.titlebutton:backdrop:active,
     row:selected .titlebar button.titlebutton:backdrop:active,
-    .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
+    .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
       color: #8e9192;
@@ -3878,7 +3916,7 @@ row:selected .titlebar button.titlebutton,
       background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-    row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, headerbar row:selected button.titlebutton:backdrop:insensitive,
+    row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected button.sidebar-button:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, headerbar row:selected button.titlebutton:backdrop:insensitive,
     row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar row:selected button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
@@ -3889,13 +3927,13 @@ row:selected .titlebar button.titlebutton,
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
       row:selected button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label,
-      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
+      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
       row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-      row:selected button:backdrop:insensitive:active, row:selected button:backdrop:insensitive:checked, row:selected button.flat:backdrop:insensitive:active, row:selected headerbar button.titlebutton:backdrop:insensitive:active, headerbar row:selected button.titlebutton:backdrop:insensitive:active,
+      row:selected button:backdrop:insensitive:active, row:selected button:backdrop:insensitive:checked, row:selected button.flat:backdrop:insensitive:active, row:selected button.sidebar-button:backdrop:insensitive:active, row:selected headerbar button.titlebutton:backdrop:insensitive:active, headerbar row:selected button.titlebutton:backdrop:insensitive:active,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:active,
-      .titlebar row:selected button.titlebutton:backdrop:insensitive:active, row:selected button.flat:backdrop:insensitive:checked, row:selected headerbar button.titlebutton:backdrop:insensitive:checked, headerbar row:selected button.titlebutton:backdrop:insensitive:checked,
+      .titlebar row:selected button.titlebutton:backdrop:insensitive:active, row:selected button.flat:backdrop:insensitive:checked, row:selected button.sidebar-button:backdrop:insensitive:checked, row:selected headerbar button.titlebutton:backdrop:insensitive:checked, headerbar row:selected button.titlebutton:backdrop:insensitive:checked,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #c7c7c7;
@@ -3905,13 +3943,13 @@ row:selected .titlebar button.titlebutton,
         border-color: #184472; }
         row:selected button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, row:selected button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
+        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-        .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected button.flat:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:checked > .label,
+        .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected button.flat:backdrop:insensitive:checked > .label, row:selected button.sidebar-button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
         .titlebar row:selected button.titlebutton:backdrop:insensitive:checked > .label {
           color: inherit; }
-  row:selected button.flat:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
+  row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
     border-color: transparent;
@@ -3973,10 +4011,11 @@ row {
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification button.flat, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
+    .app-notification button.flat, .app-notification button.sidebar-button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
     .app-notification .titlebar button.titlebutton,
     .titlebar .app-notification button.titlebutton,
     .app-notification.frame button.flat,
+    .app-notification.frame button.sidebar-button,
     .app-notification.frame headerbar button.titlebutton,
     headerbar .app-notification.frame button.titlebutton,
     .app-notification.frame .titlebar button.titlebutton,
@@ -4263,28 +4302,6 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #f6f6f6; }
 
-placessidebar row {
-  padding: 0px; }
-  placessidebar row .sidebar-revealer {
-    padding: 4px 14px 4px 12px; }
-  placessidebar row .sidebar-icon {
-    opacity: 0.7; }
-    placessidebar row .sidebar-icon:dir(ltr) {
-      padding-right: 8px; }
-    placessidebar row .sidebar-icon:dir(rtl) {
-      padding-left: 8px; }
-  placessidebar row .sidebar-label:dir(ltr) {
-    padding-right: 2px; }
-  placessidebar row .sidebar-label:dir(rtl) {
-    padding-left: 2px; }
-
-placessidebar row:selected:active {
-  box-shadow: none; }
-placessidebar row.sidebar-placeholder-row {
-  border: solid 1px #4a90d9; }
-placessidebar row.sidebar-new-bookmark-row {
-  color: #4a90d9; }
-
 stacksidebar row {
   padding: 10px 4px; }
   stacksidebar row > label {
@@ -4296,13 +4313,43 @@ stacksidebar row {
 /****************
  * File chooser *
  ****************/
-GtkPlacesView .server-list-button > image {
+placessidebar row {
+  padding: 0px; }
+  placessidebar row > revealer {
+    padding: 4px 14px 4px 12px; }
+  placessidebar row image.sidebar-icon {
+    opacity: 0.7; }
+    placessidebar row image.sidebar-icon:dir(ltr) {
+      padding-right: 8px; }
+    placessidebar row image.sidebar-icon:dir(rtl) {
+      padding-left: 8px; }
+  placessidebar row label.sidebar-label:dir(ltr) {
+    padding-right: 2px; }
+  placessidebar row label.sidebar-label:dir(rtl) {
+    padding-left: 2px; }
+  button.sidebar-button, headerbar button.sidebar-button.titlebutton,
+  .titlebar button.sidebar-button.titlebutton {
+    padding: 5px;
+    border-radius: 100%;
+    outline-radius: 100%; }
+    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
+    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
+    .titlebar button.sidebar-button.titlebutton:backdrop > image {
+      opacity: 0.7; }
+placessidebar row:selected:active {
+  box-shadow: none; }
+placessidebar row.sidebar-placeholder-row {
+  border: solid 1px #4a90d9; }
+placessidebar row.sidebar-new-bookmark-row {
+  color: #4a90d9; }
+
+placesview .server-list-button > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(0turn); }
-GtkPlacesView .server-list-button:checked > image {
+placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
-GtkPlacesView row.activatable:hover {
+placesview row.activatable:hover {
   background-color: transparent; }
 
 /*********
@@ -4591,7 +4638,7 @@ colorswatch {
   .content-view:backdrop {
     background-color: #dbdbdb; }
 
-.osd .scale-popup button.flat, .osd .scale-popup headerbar button.titlebutton, headerbar .osd .scale-popup button.titlebutton,
+.osd .scale-popup button.flat, .osd .scale-popup button.sidebar-button, .osd .scale-popup headerbar button.titlebutton, headerbar .osd .scale-popup button.titlebutton,
 .osd .scale-popup .titlebar button.titlebutton,
 .titlebar .osd .scale-popup button.titlebutton {
   padding: 6px;