diff --git a/Paper/gtk-3.20/_colors.scss b/Paper/gtk-3.20/_colors.scss
index 9385672..8e589a3 100644
--- a/Paper/gtk-3.20/_colors.scss
+++ b/Paper/gtk-3.20/_colors.scss
@@ -21,7 +21,7 @@ $selected_fg_color: #ffffff;
 $selected_bg_color: if($variant == 'light', lighten(#347D9F, 10%), darken(#9fb0b9,20%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 10%), darken($selected_bg_color, 30%));
 $borders_color: if($variant == 'light', darken($bg_color,20%), darken($bg_color,12%));
-$borders_edge: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
+$borders_edge: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.7));
 $link_color: blue;
 $link_visited_color:transparentize($link_color,0.5);
 $top_highlight: $borders_edge;
diff --git a/Paper/gtk-3.20/gtk-dark.css b/Paper/gtk-3.20/gtk-dark.css
index 298936b..d5ffd2c 100644
--- a/Paper/gtk-3.20/gtk-dark.css
+++ b/Paper/gtk-3.20/gtk-dark.css
@@ -61,7 +61,7 @@ read if you used those and something break with a version upgrade you're on your
 @define-color wm_title shade(#e4e6e7, 1.8);
 @define-color wm_unfocused_title #9a9fa2;
 @define-color wm_highlight transparent;
-@define-color wm_borders_edge rgba(255, 255, 255, 0.1);
+@define-color wm_borders_edge rgba(255, 255, 255, 0.3);
 @define-color wm_bg_a shade(#4F585C, 1.2);
 @define-color wm_bg_b #4F585C;
 @define-color wm_shadow alpha(black, 0.35);
@@ -2148,7 +2148,7 @@ messagedialog .titlebar {
   border-style: none;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
   messagedialog .titlebar:backdrop {
     background-color: #4F585C; }
 messagedialog.csd {
@@ -2537,7 +2537,7 @@ placesview > actionbar > revealer > box > label {
   border-style: solid solid none;
   border-color: #33393b;
   border-radius: 3px 3px 0 0;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
   .floating-bar.bottom.left {
     border-left-style: none;
     border-top-left-radius: 0; }
@@ -2839,7 +2839,7 @@ headerbar {
   border-radius: 4px 4px 0 0;
   background-color: #3B4245;
   color: rgba(255, 255, 255, 0.8);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
     background-color: #3B4245;
@@ -2868,7 +2868,7 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #262f33;
     background-color: #347D9F;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-color: #275f79;
@@ -2976,12 +2976,13 @@ headerbar {
     margin: 0;
     padding: 10px;
     text-shadow: none; }
-    .titlebar:not(headerbar) button.back-button, .titlebar:not(headerbar) button.suggested-action, .titlebar:not(headerbar) button.menu-button, .titlebar:not(headerbar) button.text-button, .titlebar:not(headerbar) button.image-button, .titlebar:not(headerbar) button.linked, .titlebar:not(headerbar) button.flat,
+    .titlebar:not(headerbar) button.back-button, .titlebar:not(headerbar) button.suggested-action, .titlebar:not(headerbar) button.menu-button, .titlebar:not(headerbar) button.text-button, .titlebar:not(headerbar) button.image-button, .titlebar:not(headerbar) button.titlebutton, .titlebar:not(headerbar) button.linked, .titlebar:not(headerbar) button.flat,
     headerbar button.back-button,
     headerbar button.suggested-action,
     headerbar button.menu-button,
     headerbar button.text-button,
     headerbar button.image-button,
+    headerbar button.titlebutton,
     headerbar button.linked,
     headerbar button.flat {
       background-color: transparent;
@@ -2994,24 +2995,44 @@ headerbar {
       padding: 10px;
       text-shadow: none;
       color: rgba(255, 255, 255, 0.8); }
-      .titlebar:not(headerbar) button.back-button:backdrop, .titlebar:not(headerbar) button.suggested-action:backdrop, .titlebar:not(headerbar) button.menu-button:backdrop, .titlebar:not(headerbar) button.text-button:backdrop, .titlebar:not(headerbar) button.image-button:backdrop, .titlebar:not(headerbar) button.linked:backdrop, .titlebar:not(headerbar) button.flat:backdrop,
+      .titlebar:not(headerbar) button.back-button:active, .titlebar:not(headerbar) button.back-button:checked, .titlebar:not(headerbar) button.suggested-action:active, .titlebar:not(headerbar) button.suggested-action:checked, .titlebar:not(headerbar) button.menu-button:active, .titlebar:not(headerbar) button.menu-button:checked, .titlebar:not(headerbar) button.text-button:active, .titlebar:not(headerbar) button.text-button:checked, .titlebar:not(headerbar) button.image-button:active, .titlebar:not(headerbar) button.image-button:checked, .titlebar:not(headerbar) button.titlebutton:active, .titlebar:not(headerbar) button.titlebutton:checked, .titlebar:not(headerbar) button.linked:active, .titlebar:not(headerbar) button.linked:checked, .titlebar:not(headerbar) button.flat:active, .titlebar:not(headerbar) button.flat:checked,
+      headerbar button.back-button:active,
+      headerbar button.back-button:checked,
+      headerbar button.suggested-action:active,
+      headerbar button.suggested-action:checked,
+      headerbar button.menu-button:active,
+      headerbar button.menu-button:checked,
+      headerbar button.text-button:active,
+      headerbar button.text-button:checked,
+      headerbar button.image-button:active,
+      headerbar button.image-button:checked,
+      headerbar button.titlebutton:active,
+      headerbar button.titlebutton:checked,
+      headerbar button.linked:active,
+      headerbar button.linked:checked,
+      headerbar button.flat:active,
+      headerbar button.flat:checked {
+        border-radius: 0px; }
+      .titlebar:not(headerbar) button.back-button:backdrop, .titlebar:not(headerbar) button.suggested-action:backdrop, .titlebar:not(headerbar) button.menu-button:backdrop, .titlebar:not(headerbar) button.text-button:backdrop, .titlebar:not(headerbar) button.image-button:backdrop, .titlebar:not(headerbar) button.titlebutton:backdrop, .titlebar:not(headerbar) button.linked:backdrop, .titlebar:not(headerbar) button.flat:backdrop,
       headerbar button.back-button:backdrop,
       headerbar button.suggested-action:backdrop,
       headerbar button.menu-button:backdrop,
       headerbar button.text-button:backdrop,
       headerbar button.image-button:backdrop,
+      headerbar button.titlebutton:backdrop,
       headerbar button.linked:backdrop,
       headerbar button.flat:backdrop {
         background-color: transparent;
         background-image: none;
         text-shadow: none;
         color: rgba(255, 255, 255, 0.3); }
-      .titlebar:not(headerbar) button.back-button:hover, .titlebar:not(headerbar) button.suggested-action:hover, .titlebar:not(headerbar) button.menu-button:hover, .titlebar:not(headerbar) button.text-button:hover, .titlebar:not(headerbar) button.image-button:hover, .titlebar:not(headerbar) button.linked:hover, .titlebar:not(headerbar) button.flat:hover,
+      .titlebar:not(headerbar) button.back-button:hover, .titlebar:not(headerbar) button.suggested-action:hover, .titlebar:not(headerbar) button.menu-button:hover, .titlebar:not(headerbar) button.text-button:hover, .titlebar:not(headerbar) button.image-button:hover, .titlebar:not(headerbar) button.titlebutton:hover, .titlebar:not(headerbar) button.linked:hover, .titlebar:not(headerbar) button.flat:hover,
       headerbar button.back-button:hover,
       headerbar button.suggested-action:hover,
       headerbar button.menu-button:hover,
       headerbar button.text-button:hover,
       headerbar button.image-button:hover,
+      headerbar button.titlebutton:hover,
       headerbar button.linked:hover,
       headerbar button.flat:hover {
         background-image: none;
@@ -3019,6 +3040,24 @@ headerbar {
         color: rgba(255, 255, 255, 0.8);
         box-shadow: none;
         text-shadow: none; }
+      .titlebar:not(headerbar) button.back-button.radio.text-button, .titlebar:not(headerbar) button.back-button.check.text-button, .titlebar:not(headerbar) button.suggested-action.radio.text-button, .titlebar:not(headerbar) button.suggested-action.check.text-button, .titlebar:not(headerbar) button.menu-button.radio.text-button, .titlebar:not(headerbar) button.menu-button.check.text-button, .titlebar:not(headerbar) button.text-button.radio.text-button, .titlebar:not(headerbar) button.text-button.check.text-button, .titlebar:not(headerbar) button.image-button.radio.text-button, .titlebar:not(headerbar) button.image-button.check.text-button, .titlebar:not(headerbar) button.titlebutton.radio.text-button, .titlebar:not(headerbar) button.titlebutton.check.text-button, .titlebar:not(headerbar) button.linked.radio.text-button, .titlebar:not(headerbar) button.linked.check.text-button, .titlebar:not(headerbar) button.flat.radio.text-button, .titlebar:not(headerbar) button.flat.check.text-button,
+      headerbar button.back-button.radio.text-button,
+      headerbar button.back-button.check.text-button,
+      headerbar button.suggested-action.radio.text-button,
+      headerbar button.suggested-action.check.text-button,
+      headerbar button.menu-button.radio.text-button,
+      headerbar button.menu-button.check.text-button,
+      headerbar button.text-button.radio.text-button,
+      headerbar button.text-button.check.text-button,
+      headerbar button.image-button.radio.text-button,
+      headerbar button.image-button.check.text-button,
+      headerbar button.titlebutton.radio.text-button,
+      headerbar button.titlebutton.check.text-button,
+      headerbar button.linked.radio.text-button,
+      headerbar button.linked.check.text-button,
+      headerbar button.flat.radio.text-button,
+      headerbar button.flat.check.text-button {
+        padding: 10px; }
     .titlebar:not(headerbar) button label,
     .titlebar:not(headerbar) button image,
     headerbar button label,
@@ -3085,35 +3124,6 @@ headerbar {
       headerbar button:disabled image,
       headerbar button:disabled:backdrop image {
         -gtk-icon-effect: dim; }
-    .titlebar:not(headerbar) button.titlebutton,
-    headerbar button.titlebutton {
-      background-color: transparent;
-      background-image: none;
-      border-radius: 50%;
-      border: none;
-      box-shadow: none;
-      -gtk-icon-shadow: none;
-      margin: 0;
-      padding: 1px;
-      text-shadow: none;
-      color: rgba(255, 255, 255, 0.8); }
-      .titlebar:not(headerbar) button.titlebutton:hover,
-      headerbar button.titlebutton:hover {
-        background-color: rgba(255, 255, 255, 0);
-        color: rgba(255, 255, 255, 0.8); }
-      .titlebar:not(headerbar) button.titlebutton:backdrop,
-      headerbar button.titlebutton:backdrop {
-        background-color: transparent;
-        color: rgba(255, 255, 255, 0.3); }
-      .titlebar:not(headerbar) button.titlebutton:active,
-      headerbar button.titlebutton:active {
-        background-color: rgba(255, 255, 255, 0.8);
-        color: #3B4245;
-        border-radius: 50%;
-        box-shadow: none; }
-        .titlebar:not(headerbar) button.titlebutton:active image,
-        headerbar button.titlebutton:active image {
-          color: #3B4245; }
     .titlebar:not(headerbar) button.menu-button .menu .menuitem label,
     headerbar button.menu-button .menu .menuitem label {
       color: #e4e6e7; }
@@ -4202,7 +4212,7 @@ progressbar .progressbar,
 progressbar progress, scale highlight {
   border: 1px solid #262f33;
   background-color: #667f8c;
-  box-shadow: inset 0px 1px rgba(255, 255, 255, 0.1);
+  box-shadow: inset 0px 1px rgba(255, 255, 255, 0.3);
   border-radius: 4px; }
   GtkProgressBar .progressbar:disabled,
   GtkProgressBar progress:disabled,
@@ -5446,7 +5456,7 @@ toolbar button {
   border-radius: 0px;
   border: none;
   box-shadow: none;
-  icon-shadow: none;
+  -gtk-icon-shadow: none;
   margin: 0;
   padding: 10px;
   text-shadow: none; }
@@ -5456,7 +5466,7 @@ toolbar button {
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     margin: 0;
     padding: 10px;
     text-shadow: none;
@@ -5474,7 +5484,7 @@ toolbar button {
       text-shadow: none; }
     toolbar button.suggested-action:disabled, toolbar button.text-button:disabled, toolbar button.menu-button:disabled, toolbar button.image-button:disabled, toolbar button.linked:disabled, toolbar button.flat:disabled {
       color: rgba(255, 255, 255, 0.3);
-      -gtk-image-effect: dim; }
+      -gtk-icon-effect: dim; }
   toolbar button label,
   toolbar button image {
     color: rgba(255, 255, 255, 0.8); }
@@ -5482,7 +5492,7 @@ toolbar button {
     toolbar button image:disabled,
     toolbar button image:backdrop {
       color: rgba(255, 255, 255, 0.3);
-      -gtk-image-effect: dim; }
+      -gtk-icon-effect: dim; }
   toolbar button:focus, toolbar button:hover {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.15);
@@ -5498,7 +5508,7 @@ toolbar button {
   toolbar button:active, toolbar button:checked {
     border-radius: 0px;
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.8);
     background-color: transparent;
     background-image: none;
@@ -5520,7 +5530,7 @@ toolbar button {
     toolbar button:disabled image,
     toolbar button:disabled image, toolbar button:disabled:backdrop image,
     toolbar button:disabled:backdrop image {
-      -gtk-image-effect: dim; }
+      -gtk-icon-effect: dim; }
   toolbar button.menu-button .menu .menuitem label {
     color: #e4e6e7; }
     toolbar button.menu-button .menu .menuitem label:disabled {
@@ -5570,7 +5580,7 @@ searchbar,
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     margin: 0;
     padding: 10px;
     text-shadow: none; }
@@ -5655,7 +5665,7 @@ searchbar,
       .inline-toolbar button image:disabled,
       .inline-toolbar button image:backdrop {
         color: #9a9fa2;
-        -gtk-image-effect: dim; }
+        -gtk-icon-effect: dim; }
   searchbar .entry,
   .search-bar .entry, .location-bar .entry,
   searchbar entry,
diff --git a/Paper/gtk-3.20/gtk.css b/Paper/gtk-3.20/gtk.css
index 1168167..7583984 100644
--- a/Paper/gtk-3.20/gtk.css
+++ b/Paper/gtk-3.20/gtk.css
@@ -2985,12 +2985,13 @@ headerbar {
     margin: 0;
     padding: 10px;
     text-shadow: none; }
-    .titlebar:not(headerbar) button.back-button, .titlebar:not(headerbar) button.suggested-action, .titlebar:not(headerbar) button.menu-button, .titlebar:not(headerbar) button.text-button, .titlebar:not(headerbar) button.image-button, .titlebar:not(headerbar) button.linked, .titlebar:not(headerbar) button.flat,
+    .titlebar:not(headerbar) button.back-button, .titlebar:not(headerbar) button.suggested-action, .titlebar:not(headerbar) button.menu-button, .titlebar:not(headerbar) button.text-button, .titlebar:not(headerbar) button.image-button, .titlebar:not(headerbar) button.titlebutton, .titlebar:not(headerbar) button.linked, .titlebar:not(headerbar) button.flat,
     headerbar button.back-button,
     headerbar button.suggested-action,
     headerbar button.menu-button,
     headerbar button.text-button,
     headerbar button.image-button,
+    headerbar button.titlebutton,
     headerbar button.linked,
     headerbar button.flat {
       background-color: transparent;
@@ -3003,24 +3004,44 @@ headerbar {
       padding: 10px;
       text-shadow: none;
       color: #ffffff; }
-      .titlebar:not(headerbar) button.back-button:backdrop, .titlebar:not(headerbar) button.suggested-action:backdrop, .titlebar:not(headerbar) button.menu-button:backdrop, .titlebar:not(headerbar) button.text-button:backdrop, .titlebar:not(headerbar) button.image-button:backdrop, .titlebar:not(headerbar) button.linked:backdrop, .titlebar:not(headerbar) button.flat:backdrop,
+      .titlebar:not(headerbar) button.back-button:active, .titlebar:not(headerbar) button.back-button:checked, .titlebar:not(headerbar) button.suggested-action:active, .titlebar:not(headerbar) button.suggested-action:checked, .titlebar:not(headerbar) button.menu-button:active, .titlebar:not(headerbar) button.menu-button:checked, .titlebar:not(headerbar) button.text-button:active, .titlebar:not(headerbar) button.text-button:checked, .titlebar:not(headerbar) button.image-button:active, .titlebar:not(headerbar) button.image-button:checked, .titlebar:not(headerbar) button.titlebutton:active, .titlebar:not(headerbar) button.titlebutton:checked, .titlebar:not(headerbar) button.linked:active, .titlebar:not(headerbar) button.linked:checked, .titlebar:not(headerbar) button.flat:active, .titlebar:not(headerbar) button.flat:checked,
+      headerbar button.back-button:active,
+      headerbar button.back-button:checked,
+      headerbar button.suggested-action:active,
+      headerbar button.suggested-action:checked,
+      headerbar button.menu-button:active,
+      headerbar button.menu-button:checked,
+      headerbar button.text-button:active,
+      headerbar button.text-button:checked,
+      headerbar button.image-button:active,
+      headerbar button.image-button:checked,
+      headerbar button.titlebutton:active,
+      headerbar button.titlebutton:checked,
+      headerbar button.linked:active,
+      headerbar button.linked:checked,
+      headerbar button.flat:active,
+      headerbar button.flat:checked {
+        border-radius: 0px; }
+      .titlebar:not(headerbar) button.back-button:backdrop, .titlebar:not(headerbar) button.suggested-action:backdrop, .titlebar:not(headerbar) button.menu-button:backdrop, .titlebar:not(headerbar) button.text-button:backdrop, .titlebar:not(headerbar) button.image-button:backdrop, .titlebar:not(headerbar) button.titlebutton:backdrop, .titlebar:not(headerbar) button.linked:backdrop, .titlebar:not(headerbar) button.flat:backdrop,
       headerbar button.back-button:backdrop,
       headerbar button.suggested-action:backdrop,
       headerbar button.menu-button:backdrop,
       headerbar button.text-button:backdrop,
       headerbar button.image-button:backdrop,
+      headerbar button.titlebutton:backdrop,
       headerbar button.linked:backdrop,
       headerbar button.flat:backdrop {
         background-color: transparent;
         background-image: none;
         text-shadow: none;
         color: rgba(255, 255, 255, 0.5); }
-      .titlebar:not(headerbar) button.back-button:hover, .titlebar:not(headerbar) button.suggested-action:hover, .titlebar:not(headerbar) button.menu-button:hover, .titlebar:not(headerbar) button.text-button:hover, .titlebar:not(headerbar) button.image-button:hover, .titlebar:not(headerbar) button.linked:hover, .titlebar:not(headerbar) button.flat:hover,
+      .titlebar:not(headerbar) button.back-button:hover, .titlebar:not(headerbar) button.suggested-action:hover, .titlebar:not(headerbar) button.menu-button:hover, .titlebar:not(headerbar) button.text-button:hover, .titlebar:not(headerbar) button.image-button:hover, .titlebar:not(headerbar) button.titlebutton:hover, .titlebar:not(headerbar) button.linked:hover, .titlebar:not(headerbar) button.flat:hover,
       headerbar button.back-button:hover,
       headerbar button.suggested-action:hover,
       headerbar button.menu-button:hover,
       headerbar button.text-button:hover,
       headerbar button.image-button:hover,
+      headerbar button.titlebutton:hover,
       headerbar button.linked:hover,
       headerbar button.flat:hover {
         background-image: none;
@@ -3028,6 +3049,24 @@ headerbar {
         color: white;
         box-shadow: none;
         text-shadow: none; }
+      .titlebar:not(headerbar) button.back-button.radio.text-button, .titlebar:not(headerbar) button.back-button.check.text-button, .titlebar:not(headerbar) button.suggested-action.radio.text-button, .titlebar:not(headerbar) button.suggested-action.check.text-button, .titlebar:not(headerbar) button.menu-button.radio.text-button, .titlebar:not(headerbar) button.menu-button.check.text-button, .titlebar:not(headerbar) button.text-button.radio.text-button, .titlebar:not(headerbar) button.text-button.check.text-button, .titlebar:not(headerbar) button.image-button.radio.text-button, .titlebar:not(headerbar) button.image-button.check.text-button, .titlebar:not(headerbar) button.titlebutton.radio.text-button, .titlebar:not(headerbar) button.titlebutton.check.text-button, .titlebar:not(headerbar) button.linked.radio.text-button, .titlebar:not(headerbar) button.linked.check.text-button, .titlebar:not(headerbar) button.flat.radio.text-button, .titlebar:not(headerbar) button.flat.check.text-button,
+      headerbar button.back-button.radio.text-button,
+      headerbar button.back-button.check.text-button,
+      headerbar button.suggested-action.radio.text-button,
+      headerbar button.suggested-action.check.text-button,
+      headerbar button.menu-button.radio.text-button,
+      headerbar button.menu-button.check.text-button,
+      headerbar button.text-button.radio.text-button,
+      headerbar button.text-button.check.text-button,
+      headerbar button.image-button.radio.text-button,
+      headerbar button.image-button.check.text-button,
+      headerbar button.titlebutton.radio.text-button,
+      headerbar button.titlebutton.check.text-button,
+      headerbar button.linked.radio.text-button,
+      headerbar button.linked.check.text-button,
+      headerbar button.flat.radio.text-button,
+      headerbar button.flat.check.text-button {
+        padding: 10px; }
     .titlebar:not(headerbar) button label,
     .titlebar:not(headerbar) button image,
     headerbar button label,
@@ -3094,35 +3133,6 @@ headerbar {
       headerbar button:disabled image,
       headerbar button:disabled:backdrop image {
         -gtk-icon-effect: dim; }
-    .titlebar:not(headerbar) button.titlebutton,
-    headerbar button.titlebutton {
-      background-color: transparent;
-      background-image: none;
-      border-radius: 50%;
-      border: none;
-      box-shadow: none;
-      -gtk-icon-shadow: none;
-      margin: 0;
-      padding: 1px;
-      text-shadow: none;
-      color: #ffffff; }
-      .titlebar:not(headerbar) button.titlebutton:hover,
-      headerbar button.titlebutton:hover {
-        background-color: rgba(255, 255, 255, 0.1);
-        color: white; }
-      .titlebar:not(headerbar) button.titlebutton:backdrop,
-      headerbar button.titlebutton:backdrop {
-        background-color: transparent;
-        color: rgba(255, 255, 255, 0.5); }
-      .titlebar:not(headerbar) button.titlebutton:active,
-      headerbar button.titlebutton:active {
-        background-color: #ffffff;
-        color: #636E73;
-        border-radius: 50%;
-        box-shadow: none; }
-        .titlebar:not(headerbar) button.titlebutton:active image,
-        headerbar button.titlebutton:active image {
-          color: #636E73; }
     .titlebar:not(headerbar) button.menu-button .menu .menuitem label,
     headerbar button.menu-button .menu .menuitem label {
       color: #444; }
@@ -5466,7 +5476,7 @@ toolbar button {
   border-radius: 0px;
   border: none;
   box-shadow: none;
-  icon-shadow: none;
+  -gtk-icon-shadow: none;
   margin: 0;
   padding: 10px;
   text-shadow: none; }
@@ -5476,7 +5486,7 @@ toolbar button {
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     margin: 0;
     padding: 10px;
     text-shadow: none;
@@ -5494,7 +5504,7 @@ toolbar button {
       text-shadow: none; }
     toolbar button.suggested-action:disabled, toolbar button.text-button:disabled, toolbar button.menu-button:disabled, toolbar button.image-button:disabled, toolbar button.linked:disabled, toolbar button.flat:disabled {
       color: rgba(255, 255, 255, 0.5);
-      -gtk-image-effect: dim; }
+      -gtk-icon-effect: dim; }
   toolbar button label,
   toolbar button image {
     color: #ffffff; }
@@ -5502,7 +5512,7 @@ toolbar button {
     toolbar button image:disabled,
     toolbar button image:backdrop {
       color: rgba(255, 255, 255, 0.5);
-      -gtk-image-effect: dim; }
+      -gtk-icon-effect: dim; }
   toolbar button:focus, toolbar button:hover {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.15);
@@ -5518,7 +5528,7 @@ toolbar button {
   toolbar button:active, toolbar button:checked {
     border-radius: 0px;
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     box-shadow: inset 0 -2px 0 0 #ffffff;
     background-color: transparent;
     background-image: none;
@@ -5540,7 +5550,7 @@ toolbar button {
     toolbar button:disabled image,
     toolbar button:disabled image, toolbar button:disabled:backdrop image,
     toolbar button:disabled:backdrop image {
-      -gtk-image-effect: dim; }
+      -gtk-icon-effect: dim; }
   toolbar button.menu-button .menu .menuitem label {
     color: #444; }
     toolbar button.menu-button .menu .menuitem label:disabled {
@@ -5590,7 +5600,7 @@ searchbar,
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     margin: 0;
     padding: 10px;
     text-shadow: none; }
@@ -5675,7 +5685,7 @@ searchbar,
       .inline-toolbar button image:disabled,
       .inline-toolbar button image:backdrop {
         color: #9e9e9e;
-        -gtk-image-effect: dim; }
+        -gtk-icon-effect: dim; }
   searchbar .entry,
   .search-bar .entry, .location-bar .entry,
   searchbar entry,
diff --git a/Paper/gtk-3.20/widgets/_header-bars.scss b/Paper/gtk-3.20/widgets/_header-bars.scss
index 2accda2..c8b8711 100644
--- a/Paper/gtk-3.20/widgets/_header-bars.scss
+++ b/Paper/gtk-3.20/widgets/_header-bars.scss
@@ -17,7 +17,7 @@ headerbar {
     background-color: $headerbar_bg_color;
     color: $backdrop_headerbar_fg_color;
 
-    box-shadow: inset 0 1px transparentize($top_highlight, 0.4);
+    box-shadow: inset 0 1px transparentize($top_highlight, 0.8);
 
     transition: $backdrop_transition;
   }
@@ -57,7 +57,7 @@ headerbar {
     &:backdrop {
       background-color: darken($selection_mode_headerbar_bg_color, 10%);
       background-image: none;
-      box-shadow: inset 0 1px transparentize($top_highlight, 0.4);
+      box-shadow: inset 0 1px transparentize($top_highlight, 0.8);
     }
 
     .subtitle:link { @extend *:link:selected; }
@@ -181,11 +181,13 @@ headerbar {
     padding: 10px;
     text-shadow: none;
 
+
     &.back-button,
     &.suggested-action,
     &.menu-button,
     &.text-button,
     &.image-button,
+    &.titlebutton,
     &.linked,
     &.flat {
       background-color: transparent;
@@ -199,6 +201,11 @@ headerbar {
       text-shadow: none;
       color: $headerbar_fg_color;
 
+      &:active,
+      &:checked {
+        border-radius: 0px;
+      }
+
       &:backdrop {
         background-color: transparent;
         background-image: none;
@@ -213,6 +220,13 @@ headerbar {
         box-shadow:none;
         text-shadow:none;
       }
+
+      &.radio,
+      &.check {
+        &.text-button {
+          padding: 10px;
+        }
+      }
     }
 
     label,
@@ -286,41 +300,6 @@ headerbar {
       }
     }
 
-    // Title Button
-    &.titlebutton {
-      background-color:transparent;
-      background-image: none;
-      border-radius:50%;
-      border: none;
-      box-shadow: none;
-      -gtk-icon-shadow: none;
-      margin: 0;
-      padding: 1px;
-      text-shadow: none;
-      color:$headerbar_fg_color;
-
-      &:hover {
-        background-color:transparentize($headerbar_fg_color, 0.9);
-        color:lighten($headerbar_fg_color, 10%);
-      }
-
-      &:backdrop {
-        background-color:transparent;
-        color:$backdrop_headerbar_fg_color;
-      }
-
-      &:active {
-        background-color:$headerbar_fg_color;
-        color:$headerbar_bg_color;
-        border-radius:50%;
-        box-shadow:none;
-
-        image {
-          color:$headerbar_bg_color;
-        }
-      }
-    }
-
     // Menu Button
     &.menu-button {
       .menu {
diff --git a/Paper/gtk-3.20/widgets/_toolbars.scss b/Paper/gtk-3.20/widgets/_toolbars.scss
index 4742718..2638861 100644
--- a/Paper/gtk-3.20/widgets/_toolbars.scss
+++ b/Paper/gtk-3.20/widgets/_toolbars.scss
@@ -25,7 +25,7 @@ toolbar {
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     margin: 0;
     padding: 10px;
     text-shadow: none;
@@ -41,7 +41,7 @@ toolbar {
       border-radius: 0px;
       border: none;
       box-shadow: none;
-      icon-shadow: none;
+      -gtk-icon-shadow: none;
       margin: 0;
       padding: 10px;
       text-shadow: none;
@@ -64,7 +64,7 @@ toolbar {
 
       &:disabled {
         color: $backdrop_headerbar_fg_color;
-        -gtk-image-effect: dim;
+        -gtk-icon-effect: dim;
       }
     }
 
@@ -75,7 +75,7 @@ toolbar {
       &:disabled,
       &:backdrop {
         color: $backdrop_headerbar_fg_color;
-        -gtk-image-effect: dim;
+        -gtk-icon-effect: dim;
       }
     }
 
@@ -103,7 +103,7 @@ toolbar {
       border-radius: 0px;
 
       text-shadow: none;
-      icon-shadow: none;
+      -gtk-icon-shadow: none;
       
       box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
 
@@ -136,7 +136,7 @@ toolbar {
 
       image,
       image {
-        -gtk-image-effect: dim;
+        -gtk-icon-effect: dim;
       }
     }
 
@@ -211,7 +211,7 @@ toolbar {
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     margin: 0;
     padding: 10px;
     text-shadow: none; 
@@ -274,7 +274,7 @@ toolbar {
       &:disabled,
       &:backdrop {
         color: $backdrop_fg_color;
-        -gtk-image-effect: dim;
+        -gtk-icon-effect: dim;
       }
     }
   }