diff --git a/Paper/gtk-3.18/_drawing.scss b/Paper/gtk-3.18/_drawing.scss
index 6b7073b..3c50d82 100644
--- a/Paper/gtk-3.18/_drawing.scss
+++ b/Paper/gtk-3.18/_drawing.scss
@@ -171,8 +171,8 @@
     icon-shadow: 0 1px $_shadow;
   }
   @else {
-    text-shadow: 0 1px $_shadow;
-    icon-shadow: 0 -1px $_shadow;
+    text-shadow: 0 1px transparentize(black, 0.8);
+    icon-shadow: 0 1px transparentize(black, 0.8);
   }
 }
 
@@ -259,7 +259,6 @@
     $_bg: if($c!=$bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
 
     GtkLabel, & { color: if($tc!=$fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); }
-    label, & { color: if($tc!=$fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); }
 
     border-color: if($c!=$bg_color, _border_color($c), $insensitive_borders_color);
     background-image: none;
@@ -276,7 +275,6 @@
     $_bc: if($c!=$bg_color, _border_color($c), $insensitive_borders_color);
 
     GtkLabel, & { color: if($c!=$bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); }
-    label, & { color: if($c!=$bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); }
 
     border-color: $_bc;
     background-image: none;
@@ -298,7 +296,6 @@
     $_bc: if($variant=='light',$c,_border_color($c));
 
     GtkLabel, & { color: if($tc!=$fg_color,mix($tc, $_bg, 80%), $backdrop_fg_color); }
-    label, & { color: if($tc!=$fg_color,mix($tc, $_bg, 80%), $backdrop_fg_color); }
 
     border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
     background-image: linear-gradient(to bottom, $_bg);
@@ -334,7 +331,6 @@
     $_bc: if($variant=='light', $_bg,_border_color($c));
 
     GtkLabel, & { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
-    label, & { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
 
     border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
     background-image: none;
@@ -353,7 +349,7 @@
                             darken($insensitive_bg_color, 5%));
     $_bc: if($variant=='light', $_bg,_border_color($c));
 
-    label { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
+    GtkLabel { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
 
     border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
     background-image: none;
@@ -369,8 +365,7 @@
 
   // OSD Button
   @else if $t==osd {
-    $_bg: if($c!=$bg_color, transparentize($c, 0.5),
-                            $osd_bg_color);
+    $_bg: if($c!=$bg_color, transparentize($c, 0.5), $osd_bg_color);
 
     color: $osd_fg_color;
     border-color: $osd_borders_color;
@@ -384,8 +379,7 @@
 
   // Hover OSD Button
   @else if $t==osd-hover {
-    $_bg: if($c!=$bg_color, transparentize($c, 0.3),
-                            lighten($osd_bg_color, 12%));
+    $_bg: if($c!=$bg_color, transparentize($c, 0.3), lighten($osd_bg_color, 12%));
 
     color: white;
     border-color: $osd_borders_color;
diff --git a/Paper/gtk-3.18/gtk-dark.css b/Paper/gtk-3.18/gtk-dark.css
index 2bfe599..31fe9bc 100644
--- a/Paper/gtk-3.18/gtk-dark.css
+++ b/Paper/gtk-3.18/gtk-dark.css
@@ -309,8 +309,8 @@ treeview.view:selected {
   outline-color: rgba(188, 193, 195, 0.3);
   border-color: #373e41;
   background-image: linear-gradient(to bottom, #4F585C, #434b4e);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.73176);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.73176);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .button.flat {
@@ -331,8 +331,8 @@ treeview.view:selected {
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #515b5f, #4a5357 60%, #464e51);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.68376);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.68376);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
     -gtk-image-effect: highlight; }
   .button:active,
@@ -341,8 +341,8 @@ treeview.view:selected {
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #3f4649, #4a5357);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.81176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05);
     transition-duration: 50ms; }
@@ -358,11 +358,6 @@ treeview.view:selected {
     .button:backdrop.flat GtkLabel,
     .button:backdrop.flat,
     .button:backdrop GtkLabel,
-    .button:backdrop {
-      color: #868d90; }
-    .button:backdrop.flat label,
-    .button:backdrop.flat,
-    .button:backdrop label,
     .button:backdrop {
       color: #868d90; }
     .button:backdrop.flat:active,
@@ -401,11 +396,6 @@ treeview.view:selected {
       .button:backdrop.flat:insensitive GtkLabel,
       .button:backdrop.flat:insensitive,
       .button:backdrop:insensitive GtkLabel,
-      .button:backdrop:insensitive {
-        color: #727f85; }
-      .button:backdrop.flat:insensitive label,
-      .button:backdrop.flat:insensitive,
-      .button:backdrop:insensitive label,
       .button:backdrop:insensitive {
         color: #727f85; }
       .button:backdrop.flat:insensitive:active,
@@ -416,10 +406,10 @@ treeview.view:selected {
         background-image: none;
         background-color: #4b5457;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
-        .button:backdrop.flat:insensitive:active label,
-        .button:backdrop.flat:insensitive:checked label,
-        .button:backdrop:insensitive:active label,
-        .button:backdrop:insensitive:checked label {
+        .button:backdrop.flat:insensitive:active GtkLabel,
+        .button:backdrop.flat:insensitive:checked GtkLabel,
+        .button:backdrop:insensitive:active GtkLabel,
+        .button:backdrop:insensitive:checked GtkLabel {
           color: #727f85; }
   .button.flat:backdrop,
   .button.flat:insensitive,
@@ -441,11 +431,6 @@ treeview.view:selected {
     .button:insensitive GtkLabel,
     .button:insensitive,
     .button:insensitive GtkLabel,
-    .button:insensitive {
-      color: #868d90; }
-    .button:insensitive label,
-    .button:insensitive,
-    .button:insensitive label,
     .button:insensitive {
       color: #868d90; }
     .button:insensitive:active,
@@ -466,15 +451,6 @@ treeview.view:selected {
       .button:insensitive:checked GtkLabel,
       .button:insensitive:checked {
         color: #868d90; }
-      .button:insensitive:active label,
-      .button:insensitive:active,
-      .button:insensitive:checked label,
-      .button:insensitive:checked,
-      .button:insensitive:active label,
-      .button:insensitive:active,
-      .button:insensitive:checked label,
-      .button:insensitive:checked {
-        color: #868d90; }
   .button.image-button {
     padding-left: 4px;
     padding-right: 4px; }
@@ -615,9 +591,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: none;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    box-shadow: none; }
     .app-notification .flat.button:hover, .app-notification button.flat:hover, .popover .background.touch-selection button.flat:hover, .popover .background.magnifier button.flat:hover, .osd
     .button.flat:hover {
       color: white;
@@ -664,8 +638,8 @@ row:selected
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #16242a;
   background-image: linear-gradient(to bottom, #426b7e, #395d6d);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.69882);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.69882);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .button.suggested-action.flat {
@@ -681,8 +655,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #16242a;
     background-image: linear-gradient(to bottom, #446e81, #3e6577 60%, #3b6071);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.65082);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.65082);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
   .button.suggested-action:active,
   .button.suggested-action:checked {
@@ -690,8 +664,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #16242a;
     background-image: linear-gradient(to bottom, #365767, #3e6577);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.77882);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.77882);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .button.suggested-action:backdrop,
@@ -704,11 +678,6 @@ row:selected
     .button.suggested-action:backdrop GtkLabel,
     .button.suggested-action:backdrop,
     .button.suggested-action.flat:backdrop GtkLabel,
-    .button.suggested-action.flat:backdrop {
-      color: #d9e1e5; }
-    .button.suggested-action:backdrop label,
-    .button.suggested-action:backdrop,
-    .button.suggested-action.flat:backdrop label,
     .button.suggested-action.flat:backdrop {
       color: #d9e1e5; }
     .button.suggested-action:backdrop:active,
@@ -747,11 +716,6 @@ row:selected
       .button.suggested-action:backdrop:insensitive GtkLabel,
       .button.suggested-action:backdrop:insensitive,
       .button.suggested-action.flat:backdrop:insensitive GtkLabel,
-      .button.suggested-action.flat:backdrop:insensitive {
-        color: #727f85; }
-      .button.suggested-action:backdrop:insensitive label,
-      .button.suggested-action:backdrop:insensitive,
-      .button.suggested-action.flat:backdrop:insensitive label,
       .button.suggested-action.flat:backdrop:insensitive {
         color: #727f85; }
       .button.suggested-action:backdrop:insensitive:active,
@@ -762,10 +726,10 @@ row:selected
         background-image: none;
         background-color: #3e5d6c;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
-        .button.suggested-action:backdrop:insensitive:active label,
-        .button.suggested-action:backdrop:insensitive:checked label,
-        .button.suggested-action.flat:backdrop:insensitive:active label,
-        .button.suggested-action.flat:backdrop:insensitive:checked label {
+        .button.suggested-action:backdrop:insensitive:active GtkLabel,
+        .button.suggested-action:backdrop:insensitive:checked GtkLabel,
+        .button.suggested-action.flat:backdrop:insensitive:active GtkLabel,
+        .button.suggested-action.flat:backdrop:insensitive:checked GtkLabel {
           color: #82969f; }
   .button.suggested-action.flat:backdrop,
   .button.suggested-action.flat:insensitive,
@@ -785,9 +749,6 @@ row:selected
     box-shadow: none;
     icon-shadow: none; }
     .button.suggested-action:insensitive GtkLabel,
-    .button.suggested-action:insensitive {
-      color: #868d90; }
-    .button.suggested-action:insensitive label,
     .button.suggested-action:insensitive {
       color: #868d90; }
     .button.suggested-action:insensitive:active,
@@ -802,11 +763,6 @@ row:selected
       .button.suggested-action:insensitive:checked GtkLabel,
       .button.suggested-action:insensitive:checked {
         color: #b2bec4; }
-      .button.suggested-action:insensitive:active label,
-      .button.suggested-action:insensitive:active,
-      .button.suggested-action:insensitive:checked label,
-      .button.suggested-action:insensitive:checked {
-        color: #b2bec4; }
   .osd
   .button.suggested-action {
     color: #A1A8AB;
@@ -864,8 +820,8 @@ row:selected
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #6f0e07;
   background-image: linear-gradient(to bottom, #e71d0e, #cf1a0c);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.61569);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.61569);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .button.destructive-action.flat {
@@ -881,8 +837,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #6f0e07;
     background-image: linear-gradient(to bottom, #ec1d0e, #de1b0d 60%, #d41a0d);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.56769);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.56769);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
   .button.destructive-action:active,
   .button.destructive-action:checked {
@@ -890,8 +846,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #6f0e07;
     background-image: linear-gradient(to bottom, #c6180c, #de1b0d);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.69569);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.69569);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .button.destructive-action:backdrop,
@@ -904,11 +860,6 @@ row:selected
     .button.destructive-action:backdrop GtkLabel,
     .button.destructive-action:backdrop,
     .button.destructive-action.flat:backdrop GtkLabel,
-    .button.destructive-action.flat:backdrop {
-      color: #fad2cf; }
-    .button.destructive-action:backdrop label,
-    .button.destructive-action:backdrop,
-    .button.destructive-action.flat:backdrop label,
     .button.destructive-action.flat:backdrop {
       color: #fad2cf; }
     .button.destructive-action:backdrop:active,
@@ -947,11 +898,6 @@ row:selected
       .button.destructive-action:backdrop:insensitive GtkLabel,
       .button.destructive-action:backdrop:insensitive,
       .button.destructive-action.flat:backdrop:insensitive GtkLabel,
-      .button.destructive-action.flat:backdrop:insensitive {
-        color: #727f85; }
-      .button.destructive-action:backdrop:insensitive label,
-      .button.destructive-action:backdrop:insensitive,
-      .button.destructive-action.flat:backdrop:insensitive label,
       .button.destructive-action.flat:backdrop:insensitive {
         color: #727f85; }
       .button.destructive-action:backdrop:insensitive:active,
@@ -962,10 +908,10 @@ row:selected
         background-image: none;
         background-color: #bd251a;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
-        .button.destructive-action:backdrop:insensitive:active label,
-        .button.destructive-action:backdrop:insensitive:checked label,
-        .button.destructive-action.flat:backdrop:insensitive:active label,
-        .button.destructive-action.flat:backdrop:insensitive:checked label {
+        .button.destructive-action:backdrop:insensitive:active GtkLabel,
+        .button.destructive-action:backdrop:insensitive:checked GtkLabel,
+        .button.destructive-action.flat:backdrop:insensitive:active GtkLabel,
+        .button.destructive-action.flat:backdrop:insensitive:checked GtkLabel {
           color: #d4716a; }
   .button.destructive-action.flat:backdrop,
   .button.destructive-action.flat:insensitive,
@@ -985,9 +931,6 @@ row:selected
     box-shadow: none;
     icon-shadow: none; }
     .button.destructive-action:insensitive GtkLabel,
-    .button.destructive-action:insensitive {
-      color: #868d90; }
-    .button.destructive-action:insensitive label,
     .button.destructive-action:insensitive {
       color: #868d90; }
     .button.destructive-action:insensitive:active,
@@ -1002,11 +945,6 @@ row:selected
       .button.destructive-action:insensitive:checked GtkLabel,
       .button.destructive-action:insensitive:checked {
         color: #e5a8a3; }
-      .button.destructive-action:insensitive:active label,
-      .button.destructive-action:insensitive:active,
-      .button.destructive-action:insensitive:checked label,
-      .button.destructive-action:insensitive:checked {
-        color: #e5a8a3; }
   .osd
   .button.destructive-action {
     color: #A1A8AB;
@@ -1063,11 +1001,11 @@ row:selected
 .button {
   outline-offset: -3px; }
   .stack-switcher >
-  .button > label {
+  .button > GtkLabel {
     padding-left: 6px;
     padding-right: 6px; }
   .stack-switcher >
-  .button > image {
+  .button > GtkImage {
     padding-left: 6px;
     padding-right: 6px;
     padding-top: 3px;
@@ -1123,8 +1061,8 @@ row:selected
   outline-color: rgba(188, 193, 195, 0.3);
   border-color: #373e41;
   background-image: linear-gradient(to bottom, #4F585C, #434b4e);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.73176);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.73176);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .inline-toolbar toolbutton > button:hover {
@@ -1132,16 +1070,16 @@ row:selected
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #515b5f, #4a5357 60%, #464e51);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.68376);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.68376);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
   .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #bcc1c3;
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #3f4649, #4a5357);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.81176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .inline-toolbar toolbutton > button:insensitive {
@@ -1153,8 +1091,6 @@ row:selected
     icon-shadow: none; }
     .inline-toolbar toolbutton > button:insensitive GtkLabel, .inline-toolbar toolbutton > button:insensitive {
       color: #868d90; }
-    .inline-toolbar toolbutton > button:insensitive label, .inline-toolbar toolbutton > button:insensitive {
-      color: #868d90; }
     .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked {
       border-color: #373e41;
       background-image: none;
@@ -1163,8 +1099,6 @@ row:selected
       box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
       .inline-toolbar toolbutton > button:insensitive:active GtkLabel, .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked GtkLabel, .inline-toolbar toolbutton > button:insensitive:checked {
         color: #868d90; }
-      .inline-toolbar toolbutton > button:insensitive:active label, .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked label, .inline-toolbar toolbutton > button:insensitive:checked {
-        color: #868d90; }
   .inline-toolbar toolbutton > button:backdrop {
     border-color: #394144;
     background-image: linear-gradient(to bottom, #4F585C);
@@ -1173,8 +1107,6 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop GtkLabel, .inline-toolbar toolbutton > button:backdrop {
       color: #868d90; }
-    .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop {
-      color: #868d90; }
     .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
       border-color: #394144;
       background-image: none;
@@ -1192,14 +1124,12 @@ row:selected
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .inline-toolbar toolbutton > button:backdrop:insensitive GtkLabel, .inline-toolbar toolbutton > button:backdrop:insensitive {
         color: #727f85; }
-      .inline-toolbar toolbutton > button:backdrop:insensitive label, .inline-toolbar toolbutton > button:backdrop:insensitive {
-        color: #727f85; }
       .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar toolbutton > button:backdrop:insensitive:checked {
         border-color: #394144;
         background-image: none;
         background-color: #4b5457;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
-        .inline-toolbar toolbutton > button:backdrop:insensitive:active label, .inline-toolbar toolbutton > button:backdrop:insensitive:checked label {
+        .inline-toolbar toolbutton > button:backdrop:insensitive:active GtkLabel, .inline-toolbar toolbutton > button:backdrop:insensitive:checked GtkLabel {
           color: #727f85; }
 
 toolbar.inline-toolbar toolbutton > button.flat,
@@ -1835,8 +1765,8 @@ GtkColorSwatch#add-color-button {
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #4F585C, #434b4e);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.73176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.73176);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
     box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.05); }
     GtkColorSwatch#add-color-button overlay:hover {
@@ -1844,8 +1774,8 @@ GtkColorSwatch#add-color-button {
       outline-color: rgba(188, 193, 195, 0.3);
       border-color: #373e41;
       background-image: linear-gradient(to bottom, #515b5f, #4a5357 60%, #464e51);
-      text-shadow: 0 1px rgba(0, 0, 0, 0.68376);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.68376);
+      text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+      icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
     GtkColorSwatch#add-color-button overlay:backdrop {
       border-color: #394144;
@@ -1855,8 +1785,6 @@ GtkColorSwatch#add-color-button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       GtkColorSwatch#add-color-button overlay:backdrop GtkLabel, GtkColorSwatch#add-color-button overlay:backdrop {
         color: #868d90; }
-      GtkColorSwatch#add-color-button overlay:backdrop label, GtkColorSwatch#add-color-button overlay:backdrop {
-        color: #868d90; }
 GtkColorSwatch:insensitive {
   opacity: 0.5; }
   GtkColorSwatch:insensitive overlay {
@@ -2790,6 +2718,53 @@ GraniteWidgetsWelcome {
         .titlebar:not(headerbar) .button.titlebutton:active GtkImage,
         .header-bar .button.titlebutton:active GtkImage {
           color: #3B4245; }
+    .titlebar:not(headerbar) .button.suggested-action,
+    .header-bar .button.suggested-action {
+      font-weight: bold;
+      padding: 0;
+      padding: 5px 10px;
+      border-radius: 2px;
+      background-color: rgba(255, 255, 255, 0.5);
+      color: #426b7e;
+      box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); }
+      .titlebar:not(headerbar) .button.suggested-action GtkLabel,
+      .header-bar .button.suggested-action GtkLabel {
+        color: #426b7e; }
+      .titlebar:not(headerbar) .button.suggested-action:hover,
+      .header-bar .button.suggested-action:hover {
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); }
+        .titlebar:not(headerbar) .button.suggested-action:hover GtkLabel,
+        .header-bar .button.suggested-action:hover GtkLabel {
+          color: #426b7e; }
+        .titlebar:not(headerbar) .button.suggested-action:hover:backdrop,
+        .header-bar .button.suggested-action:hover:backdrop {
+          background-color: rgba(255, 255, 255, 0.3);
+          box-shadow: none; }
+          .titlebar:not(headerbar) .button.suggested-action:hover:backdrop GtkLabel,
+          .header-bar .button.suggested-action:hover:backdrop GtkLabel {
+            color: rgba(66, 107, 126, 0.8); }
+      .titlebar:not(headerbar) .button.suggested-action:insensitive,
+      .header-bar .button.suggested-action:insensitive {
+        background-color: rgba(0, 0, 0, 0.1);
+        box-shadow: none; }
+        .titlebar:not(headerbar) .button.suggested-action:insensitive GtkLabel,
+        .header-bar .button.suggested-action:insensitive GtkLabel {
+          color: rgba(255, 255, 255, 0); }
+        .titlebar:not(headerbar) .button.suggested-action:insensitive:backdrop,
+        .header-bar .button.suggested-action:insensitive:backdrop {
+          background-color: rgba(0, 0, 0, 0.1);
+          box-shadow: none; }
+          .titlebar:not(headerbar) .button.suggested-action:insensitive:backdrop GtkLabel,
+          .header-bar .button.suggested-action:insensitive:backdrop GtkLabel {
+            color: rgba(255, 255, 255, 0); }
+      .titlebar:not(headerbar) .button.suggested-action:backdrop,
+      .header-bar .button.suggested-action:backdrop {
+        background-color: rgba(255, 255, 255, 0);
+        box-shadow: none; }
+        .titlebar:not(headerbar) .button.suggested-action:backdrop GtkLabel,
+        .header-bar .button.suggested-action:backdrop GtkLabel {
+          color: rgba(66, 107, 126, 0.2); }
     .titlebar:not(headerbar) .button.linked:first-child, .titlebar:not(headerbar) .button.linked:last-child,
     .header-bar .button.linked:first-child,
     .header-bar .button.linked:last-child {
@@ -4283,143 +4258,107 @@ GtkSwitch {
 /************
  * Toolbars *
  ************/
-.toolbar,
-toolbar {
+.toolbar {
   -GtkWidget-window-dragging: true;
   padding: 0px;
   background-color: #3B4245;
   color: rgba(255, 255, 255, 0.5); }
-  .toolbar:backdrop,
-  toolbar:backdrop {
+  .toolbar:backdrop {
     background-color: #2f3537;
     color: rgba(255, 255, 255, 0.3); }
 
-.osd .toolbar, .osd
-toolbar {
+.osd .toolbar {
   box-shadow: none;
   background-color: transparent; }
-.toolbar button,
-.toolbar .button,
-.toolbar .flat,
-.toolbar .text-button,
-.toolbar .image-button,
-toolbar button,
-toolbar .button,
-toolbar .flat,
-toolbar .text-button,
-toolbar .image-button {
-  border: none;
-  background: none;
-  text-shadow: none;
+.toolbar .button {
   background-color: transparent;
-  color: rgba(255, 255, 255, 0.5);
+  background-image: none;
   border-radius: 0px;
-  padding: 10px; }
-  .toolbar button:focus, .toolbar button:active,
-  .toolbar .button:focus,
-  .toolbar .button:active,
-  .toolbar .flat:focus,
-  .toolbar .flat:active,
-  .toolbar .text-button:focus,
-  .toolbar .text-button:active,
-  .toolbar .image-button:focus,
-  .toolbar .image-button:active,
-  toolbar button:focus,
-  toolbar button:active,
-  toolbar .button:focus,
-  toolbar .button:active,
-  toolbar .flat:focus,
-  toolbar .flat:active,
-  toolbar .text-button:focus,
-  toolbar .text-button:active,
-  toolbar .image-button:focus,
-  toolbar .image-button:active {
-    color: rgba(255, 255, 255, 0.5);
+  border: none;
+  box-shadow: none;
+  icon-shadow: none;
+  margin: 0;
+  padding: 10px;
+  text-shadow: none; }
+  .toolbar .button.suggested-action, .toolbar .button.text-button, .toolbar .button.image-button, .toolbar .button.linked, .toolbar .button.flat {
+    background-color: transparent;
+    background-image: none;
+    border-radius: 0px;
+    border: none;
+    box-shadow: none;
+    icon-shadow: none;
+    margin: 0;
+    padding: 10px;
     text-shadow: none;
-    box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.5);
-    background-color: rgba(255, 255, 255, 0.1); }
-    .toolbar button:focus:backdrop, .toolbar button:active:backdrop,
-    .toolbar .button:focus:backdrop,
-    .toolbar .button:active:backdrop,
-    .toolbar .flat:focus:backdrop,
-    .toolbar .flat:active:backdrop,
-    .toolbar .text-button:focus:backdrop,
-    .toolbar .text-button:active:backdrop,
-    .toolbar .image-button:focus:backdrop,
-    .toolbar .image-button:active:backdrop,
-    toolbar button:focus:backdrop,
-    toolbar button:active:backdrop,
-    toolbar .button:focus:backdrop,
-    toolbar .button:active:backdrop,
-    toolbar .flat:focus:backdrop,
-    toolbar .flat:active:backdrop,
-    toolbar .text-button:focus:backdrop,
-    toolbar .text-button:active:backdrop,
-    toolbar .image-button:focus:backdrop,
-    toolbar .image-button:active:backdrop {
+    color: rgba(255, 255, 255, 0.5); }
+    .toolbar .button.suggested-action:backdrop, .toolbar .button.text-button:backdrop, .toolbar .button.image-button:backdrop, .toolbar .button.linked:backdrop, .toolbar .button.flat:backdrop {
       background-color: transparent;
+      background-image: none;
+      text-shadow: none;
       color: rgba(255, 255, 255, 0.3); }
-  .toolbar button:hover,
-  .toolbar .button:hover,
-  .toolbar .flat:hover,
-  .toolbar .text-button:hover,
-  .toolbar .image-button:hover,
-  toolbar button:hover,
-  toolbar .button:hover,
-  toolbar .flat:hover,
-  toolbar .text-button:hover,
-  toolbar .image-button:hover {
-    background-color: rgba(255, 255, 255, 0.1);
-    text-shadow: none;
+    .toolbar .button.suggested-action:hover, .toolbar .button.text-button:hover, .toolbar .button.image-button:hover, .toolbar .button.linked:hover, .toolbar .button.flat:hover {
+      background-image: none;
+      background-color: rgba(0, 0, 0, 0.15);
+      color: rgba(255, 255, 255, 0.5);
+      box-shadow: none;
+      text-shadow: none; }
+  .toolbar .button GtkLabel,
+  .toolbar .button GtkImage {
+    color: rgba(255, 255, 255, 0.5); }
+    .toolbar .button GtkLabel:backdrop,
+    .toolbar .button GtkImage:backdrop {
+      color: rgba(255, 255, 255, 0.3); }
+  .toolbar .button:focus, .toolbar .button:hover {
+    background-image: none;
+    background-color: rgba(0, 0, 0, 0.15);
     color: rgba(255, 255, 255, 0.5);
-    box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.5); }
-  .toolbar button:insensitive,
-  .toolbar .button:insensitive,
-  .toolbar .flat:insensitive,
-  .toolbar .text-button:insensitive,
-  .toolbar .image-button:insensitive,
-  toolbar button:insensitive,
-  toolbar .button:insensitive,
-  toolbar .flat:insensitive,
-  toolbar .text-button:insensitive,
-  toolbar .image-button:insensitive {
-    background: none;
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0); }
-  .toolbar button:backdrop,
-  .toolbar .button:backdrop,
-  .toolbar .flat:backdrop,
-  .toolbar .text-button:backdrop,
-  .toolbar .image-button:backdrop,
-  toolbar button:backdrop,
-  toolbar .button:backdrop,
-  toolbar .flat:backdrop,
-  toolbar .text-button:backdrop,
-  toolbar .image-button:backdrop {
-    background: none;
+    box-shadow: none;
+    text-shadow: none; }
+  .toolbar .button:backdrop {
     background-color: transparent;
+    background-image: none;
     color: rgba(255, 255, 255, 0.3); }
-.toolbar .separator,
-toolbar .separator {
+    .toolbar .button:backdrop GtkImage {
+      color: rgba(255, 255, 255, 0.3); }
+  .toolbar .button:active, .toolbar .button:checked {
+    border-radius: 0px;
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.5);
+    background-color: transparent;
+    background-image: none;
+    color: rgba(255, 255, 255, 0.5); }
+    .toolbar .button:active:backdrop, .toolbar .button:checked:backdrop {
+      background-color: transparent;
+      background-image: none;
+      color: rgba(255, 255, 255, 0.3);
+      box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.3); }
+    .toolbar .button:active:focus, .toolbar .button:active:hover, .toolbar .button:checked:focus, .toolbar .button:checked:hover {
+      background-image: none;
+      background-color: rgba(0, 0, 0, 0.15);
+      color: rgba(255, 255, 255, 0.5);
+      box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.5); }
+  .toolbar .button:insensitive, .toolbar .button:insensitive:backdrop {
+    color: rgba(255, 255, 255, 0.3);
+    background-color: transparent;
+    background-image: none; }
+    .toolbar .button:insensitive image,
+    .toolbar .button:insensitive GtkImage, .toolbar .button:insensitive:backdrop image,
+    .toolbar .button:insensitive:backdrop GtkImage {
+      -gtk-image-effect: dim; }
+.toolbar .separator {
   color: transparent;
   background-color: transparent; }
-.toolbar.osd,
-toolbar.osd {
+.toolbar.osd {
   padding: 13px;
   border: none;
   border-radius: 5px;
   background-color: rgba(32, 37, 38, 0.8); }
-  .toolbar.osd.left, .toolbar.osd.right, .toolbar.osd.top, .toolbar.osd.bottom,
-  toolbar.osd.left,
-  toolbar.osd.right,
-  toolbar.osd.top,
-  toolbar.osd.bottom {
+  .toolbar.osd.left, .toolbar.osd.right, .toolbar.osd.top, .toolbar.osd.bottom {
     border-radius: 0; }
-.toolbar.horizontal separator,
-toolbar.horizontal separator {
+.toolbar.horizontal separator {
   margin: 0 7px 1px 6px; }
-.toolbar.vertical separator,
-toolbar.vertical separator {
+.toolbar.vertical separator {
   margin: 6px 1px 7px 0; }
 
 /*******************
@@ -5889,8 +5828,8 @@ ConversationListView {
   outline-color: rgba(188, 193, 195, 0.3);
   border-color: #373e41;
   background-image: linear-gradient(to bottom, #4F585C, #434b4e);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.73176);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.73176);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   #content_frame button:hover {
@@ -5898,16 +5837,16 @@ ConversationListView {
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #515b5f, #4a5357 60%, #464e51);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.68376);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.68376);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
   #content_frame button:active, #content_frame button:checked {
     color: #bcc1c3;
     outline-color: rgba(188, 193, 195, 0.3);
     border-color: #373e41;
     background-image: linear-gradient(to bottom, #3f4649, #4a5357);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.81176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   #content_frame button:insensitive {
@@ -5919,8 +5858,6 @@ ConversationListView {
     icon-shadow: none; }
     #content_frame button:insensitive GtkLabel, #content_frame button:insensitive {
       color: #868d90; }
-    #content_frame button:insensitive label, #content_frame button:insensitive {
-      color: #868d90; }
 
 #buttonbox_frame {
   padding-top: 20px;
diff --git a/Paper/gtk-3.18/gtk.css b/Paper/gtk-3.18/gtk.css
index 268002b..02028ba 100644
--- a/Paper/gtk-3.18/gtk.css
+++ b/Paper/gtk-3.18/gtk.css
@@ -359,11 +359,6 @@ treeview.view:selected {
     .button:backdrop.flat GtkLabel,
     .button:backdrop.flat,
     .button:backdrop GtkLabel,
-    .button:backdrop {
-      color: #afafaf; }
-    .button:backdrop.flat label,
-    .button:backdrop.flat,
-    .button:backdrop label,
     .button:backdrop {
       color: #afafaf; }
     .button:backdrop.flat:active,
@@ -402,11 +397,6 @@ treeview.view:selected {
       .button:backdrop.flat:insensitive GtkLabel,
       .button:backdrop.flat:insensitive,
       .button:backdrop:insensitive GtkLabel,
-      .button:backdrop:insensitive {
-        color: #d1d1d1; }
-      .button:backdrop.flat:insensitive label,
-      .button:backdrop.flat:insensitive,
-      .button:backdrop:insensitive label,
       .button:backdrop:insensitive {
         color: #d1d1d1; }
       .button:backdrop.flat:insensitive:active,
@@ -417,10 +407,10 @@ treeview.view:selected {
         background-image: none;
         background-color: #ededed;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
-        .button:backdrop.flat:insensitive:active label,
-        .button:backdrop.flat:insensitive:checked label,
-        .button:backdrop:insensitive:active label,
-        .button:backdrop:insensitive:checked label {
+        .button:backdrop.flat:insensitive:active GtkLabel,
+        .button:backdrop.flat:insensitive:checked GtkLabel,
+        .button:backdrop:insensitive:active GtkLabel,
+        .button:backdrop:insensitive:checked GtkLabel {
           color: #d1d1d1; }
   .button.flat:backdrop,
   .button.flat:insensitive,
@@ -442,11 +432,6 @@ treeview.view:selected {
     .button:insensitive GtkLabel,
     .button:insensitive,
     .button:insensitive GtkLabel,
-    .button:insensitive {
-      color: #afafaf; }
-    .button:insensitive label,
-    .button:insensitive,
-    .button:insensitive label,
     .button:insensitive {
       color: #afafaf; }
     .button:insensitive:active,
@@ -467,15 +452,6 @@ treeview.view:selected {
       .button:insensitive:checked GtkLabel,
       .button:insensitive:checked {
         color: #afafaf; }
-      .button:insensitive:active label,
-      .button:insensitive:active,
-      .button:insensitive:checked label,
-      .button:insensitive:checked,
-      .button:insensitive:active label,
-      .button:insensitive:active,
-      .button:insensitive:checked label,
-      .button:insensitive:checked {
-        color: #afafaf; }
   .button.image-button {
     padding-left: 4px;
     padding-right: 4px; }
@@ -619,9 +595,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: none;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    box-shadow: none; }
     .app-notification .flat.button:hover, .app-notification button.flat:hover, .popover .background.touch-selection button.flat:hover, .popover .background.magnifier button.flat:hover, .osd
     .button.flat:hover {
       color: white;
@@ -668,8 +642,8 @@ row:selected
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #15313f;
   background-image: linear-gradient(to bottom, #347D9F, #2e6e8c);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.66902);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.66902);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   .button.suggested-action.flat {
@@ -685,8 +659,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #15313f;
     background-image: linear-gradient(to bottom, #3c8fb6, #347D9F 60%, #2f7190);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.62102);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.62102);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
   .button.suggested-action:active,
   .button.suggested-action:checked {
@@ -694,8 +668,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #15313f;
     background-image: linear-gradient(to bottom, #2b6884, #317797);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.74902);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.74902);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   .button.suggested-action:backdrop,
@@ -708,11 +682,6 @@ row:selected
     .button.suggested-action:backdrop GtkLabel,
     .button.suggested-action:backdrop,
     .button.suggested-action.flat:backdrop GtkLabel,
-    .button.suggested-action.flat:backdrop {
-      color: #d6e5ec; }
-    .button.suggested-action:backdrop label,
-    .button.suggested-action:backdrop,
-    .button.suggested-action.flat:backdrop label,
     .button.suggested-action.flat:backdrop {
       color: #d6e5ec; }
     .button.suggested-action:backdrop:active,
@@ -751,11 +720,6 @@ row:selected
       .button.suggested-action:backdrop:insensitive GtkLabel,
       .button.suggested-action:backdrop:insensitive,
       .button.suggested-action.flat:backdrop:insensitive GtkLabel,
-      .button.suggested-action.flat:backdrop:insensitive {
-        color: #d1d1d1; }
-      .button.suggested-action:backdrop:insensitive label,
-      .button.suggested-action:backdrop:insensitive,
-      .button.suggested-action.flat:backdrop:insensitive label,
       .button.suggested-action.flat:backdrop:insensitive {
         color: #d1d1d1; }
       .button.suggested-action:backdrop:insensitive:active,
@@ -766,10 +730,10 @@ row:selected
         background-image: none;
         background-color: #4a839c;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
-        .button.suggested-action:backdrop:insensitive:active label,
-        .button.suggested-action:backdrop:insensitive:checked label,
-        .button.suggested-action.flat:backdrop:insensitive:active label,
-        .button.suggested-action.flat:backdrop:insensitive:checked label {
+        .button.suggested-action:backdrop:insensitive:active GtkLabel,
+        .button.suggested-action:backdrop:insensitive:checked GtkLabel,
+        .button.suggested-action.flat:backdrop:insensitive:active GtkLabel,
+        .button.suggested-action.flat:backdrop:insensitive:checked GtkLabel {
           color: #89aebf; }
   .button.suggested-action.flat:backdrop,
   .button.suggested-action.flat:insensitive,
@@ -789,9 +753,6 @@ row:selected
     box-shadow: none;
     icon-shadow: none; }
     .button.suggested-action:insensitive GtkLabel,
-    .button.suggested-action:insensitive {
-      color: #afafaf; }
-    .button.suggested-action:insensitive label,
     .button.suggested-action:insensitive {
       color: #afafaf; }
     .button.suggested-action:insensitive:active,
@@ -806,11 +767,6 @@ row:selected
       .button.suggested-action:insensitive:checked GtkLabel,
       .button.suggested-action:insensitive:checked {
         color: #b7cdd7; }
-      .button.suggested-action:insensitive:active label,
-      .button.suggested-action:insensitive:active,
-      .button.suggested-action:insensitive:checked label,
-      .button.suggested-action:insensitive:checked {
-        color: #b7cdd7; }
   .osd
   .button.suggested-action {
     color: #A1A8AB;
@@ -868,8 +824,8 @@ row:selected
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #9f1409;
   background-image: linear-gradient(to bottom, #f34235, #f22b1d);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.53569);
-  icon-shadow: 0 -1px rgba(0, 0, 0, 0.53569);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   .button.destructive-action.flat {
@@ -885,8 +841,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #9f1409;
     background-image: linear-gradient(to bottom, #f55d52, #f34235 60%, #f23022);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.48769);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.48769);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
   .button.destructive-action:active,
   .button.destructive-action:checked {
@@ -894,8 +850,8 @@ row:selected
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #9f1409;
     background-image: linear-gradient(to bottom, #f12213, #f2392b);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.61569);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.61569);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   .button.destructive-action:backdrop,
@@ -908,11 +864,6 @@ row:selected
     .button.destructive-action:backdrop GtkLabel,
     .button.destructive-action:backdrop,
     .button.destructive-action.flat:backdrop GtkLabel,
-    .button.destructive-action.flat:backdrop {
-      color: #fdd9d7; }
-    .button.destructive-action:backdrop label,
-    .button.destructive-action:backdrop,
-    .button.destructive-action.flat:backdrop label,
     .button.destructive-action.flat:backdrop {
       color: #fdd9d7; }
     .button.destructive-action:backdrop:active,
@@ -951,11 +902,6 @@ row:selected
       .button.destructive-action:backdrop:insensitive GtkLabel,
       .button.destructive-action:backdrop:insensitive,
       .button.destructive-action.flat:backdrop:insensitive GtkLabel,
-      .button.destructive-action.flat:backdrop:insensitive {
-        color: #d1d1d1; }
-      .button.destructive-action:backdrop:insensitive label,
-      .button.destructive-action:backdrop:insensitive,
-      .button.destructive-action.flat:backdrop:insensitive label,
       .button.destructive-action.flat:backdrop:insensitive {
         color: #d1d1d1; }
       .button.destructive-action:backdrop:insensitive:active,
@@ -966,10 +912,10 @@ row:selected
         background-image: none;
         background-color: #f4473b;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
-        .button.destructive-action:backdrop:insensitive:active label,
-        .button.destructive-action:backdrop:insensitive:checked label,
-        .button.destructive-action.flat:backdrop:insensitive:active label,
-        .button.destructive-action.flat:backdrop:insensitive:checked label {
+        .button.destructive-action:backdrop:insensitive:active GtkLabel,
+        .button.destructive-action:backdrop:insensitive:checked GtkLabel,
+        .button.destructive-action.flat:backdrop:insensitive:active GtkLabel,
+        .button.destructive-action.flat:backdrop:insensitive:checked GtkLabel {
           color: #f88780; }
   .button.destructive-action.flat:backdrop,
   .button.destructive-action.flat:insensitive,
@@ -989,9 +935,6 @@ row:selected
     box-shadow: none;
     icon-shadow: none; }
     .button.destructive-action:insensitive GtkLabel,
-    .button.destructive-action:insensitive {
-      color: #afafaf; }
-    .button.destructive-action:insensitive label,
     .button.destructive-action:insensitive {
       color: #afafaf; }
     .button.destructive-action:insensitive:active,
@@ -1006,11 +949,6 @@ row:selected
       .button.destructive-action:insensitive:checked GtkLabel,
       .button.destructive-action:insensitive:checked {
         color: #fbb5b1; }
-      .button.destructive-action:insensitive:active label,
-      .button.destructive-action:insensitive:active,
-      .button.destructive-action:insensitive:checked label,
-      .button.destructive-action:insensitive:checked {
-        color: #fbb5b1; }
   .osd
   .button.destructive-action {
     color: #A1A8AB;
@@ -1067,11 +1005,11 @@ row:selected
 .button {
   outline-offset: -3px; }
   .stack-switcher >
-  .button > label {
+  .button > GtkLabel {
     padding-left: 6px;
     padding-right: 6px; }
   .stack-switcher >
-  .button > image {
+  .button > GtkImage {
     padding-left: 6px;
     padding-right: 6px;
     padding-top: 3px;
@@ -1157,8 +1095,6 @@ row:selected
     icon-shadow: none; }
     .inline-toolbar toolbutton > button:insensitive GtkLabel, .inline-toolbar toolbutton > button:insensitive {
       color: #afafaf; }
-    .inline-toolbar toolbutton > button:insensitive label, .inline-toolbar toolbutton > button:insensitive {
-      color: #afafaf; }
     .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked {
       border-color: #d1d1d1;
       background-image: none;
@@ -1167,8 +1103,6 @@ row:selected
       box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
       .inline-toolbar toolbutton > button:insensitive:active GtkLabel, .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked GtkLabel, .inline-toolbar toolbutton > button:insensitive:checked {
         color: #afafaf; }
-      .inline-toolbar toolbutton > button:insensitive:active label, .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked label, .inline-toolbar toolbutton > button:insensitive:checked {
-        color: #afafaf; }
   .inline-toolbar toolbutton > button:backdrop {
     border-color: #d5d5d5;
     background-image: linear-gradient(to bottom, #f7f7f7);
@@ -1177,8 +1111,6 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop GtkLabel, .inline-toolbar toolbutton > button:backdrop {
       color: #afafaf; }
-    .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop {
-      color: #afafaf; }
     .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
       border-color: #d5d5d5;
       background-image: none;
@@ -1196,14 +1128,12 @@ row:selected
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .inline-toolbar toolbutton > button:backdrop:insensitive GtkLabel, .inline-toolbar toolbutton > button:backdrop:insensitive {
         color: #d1d1d1; }
-      .inline-toolbar toolbutton > button:backdrop:insensitive label, .inline-toolbar toolbutton > button:backdrop:insensitive {
-        color: #d1d1d1; }
       .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar toolbutton > button:backdrop:insensitive:checked {
         border-color: #d5d5d5;
         background-image: none;
         background-color: #ededed;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
-        .inline-toolbar toolbutton > button:backdrop:insensitive:active label, .inline-toolbar toolbutton > button:backdrop:insensitive:checked label {
+        .inline-toolbar toolbutton > button:backdrop:insensitive:active GtkLabel, .inline-toolbar toolbutton > button:backdrop:insensitive:checked GtkLabel {
           color: #d1d1d1; }
 
 toolbar.inline-toolbar toolbutton > button.flat,
@@ -1864,8 +1794,6 @@ GtkColorSwatch#add-color-button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       GtkColorSwatch#add-color-button overlay:backdrop GtkLabel, GtkColorSwatch#add-color-button overlay:backdrop {
         color: #afafaf; }
-      GtkColorSwatch#add-color-button overlay:backdrop label, GtkColorSwatch#add-color-button overlay:backdrop {
-        color: #afafaf; }
 GtkColorSwatch:insensitive {
   opacity: 0.5; }
   GtkColorSwatch:insensitive overlay {
@@ -2799,6 +2727,53 @@ GraniteWidgetsWelcome {
         .titlebar:not(headerbar) .button.titlebutton:active GtkImage,
         .header-bar .button.titlebutton:active GtkImage {
           color: #636E73; }
+    .titlebar:not(headerbar) .button.suggested-action,
+    .header-bar .button.suggested-action {
+      font-weight: bold;
+      padding: 0;
+      padding: 5px 10px;
+      border-radius: 2px;
+      background-color: #ffffff;
+      color: #347D9F;
+      box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); }
+      .titlebar:not(headerbar) .button.suggested-action GtkLabel,
+      .header-bar .button.suggested-action GtkLabel {
+        color: #347D9F; }
+      .titlebar:not(headerbar) .button.suggested-action:hover,
+      .header-bar .button.suggested-action:hover {
+        background-color: #ffffff;
+        box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); }
+        .titlebar:not(headerbar) .button.suggested-action:hover GtkLabel,
+        .header-bar .button.suggested-action:hover GtkLabel {
+          color: #347D9F; }
+        .titlebar:not(headerbar) .button.suggested-action:hover:backdrop,
+        .header-bar .button.suggested-action:hover:backdrop {
+          background-color: rgba(255, 255, 255, 0.8);
+          box-shadow: none; }
+          .titlebar:not(headerbar) .button.suggested-action:hover:backdrop GtkLabel,
+          .header-bar .button.suggested-action:hover:backdrop GtkLabel {
+            color: rgba(52, 125, 159, 0.8); }
+      .titlebar:not(headerbar) .button.suggested-action:insensitive,
+      .header-bar .button.suggested-action:insensitive {
+        background-color: rgba(0, 0, 0, 0.1);
+        box-shadow: none; }
+        .titlebar:not(headerbar) .button.suggested-action:insensitive GtkLabel,
+        .header-bar .button.suggested-action:insensitive GtkLabel {
+          color: rgba(255, 255, 255, 0.5); }
+        .titlebar:not(headerbar) .button.suggested-action:insensitive:backdrop,
+        .header-bar .button.suggested-action:insensitive:backdrop {
+          background-color: rgba(0, 0, 0, 0.1);
+          box-shadow: none; }
+          .titlebar:not(headerbar) .button.suggested-action:insensitive:backdrop GtkLabel,
+          .header-bar .button.suggested-action:insensitive:backdrop GtkLabel {
+            color: rgba(255, 255, 255, 0.5); }
+      .titlebar:not(headerbar) .button.suggested-action:backdrop,
+      .header-bar .button.suggested-action:backdrop {
+        background-color: rgba(255, 255, 255, 0.1);
+        box-shadow: none; }
+        .titlebar:not(headerbar) .button.suggested-action:backdrop GtkLabel,
+        .header-bar .button.suggested-action:backdrop GtkLabel {
+          color: rgba(52, 125, 159, 0.2); }
     .titlebar:not(headerbar) .button.linked:first-child, .titlebar:not(headerbar) .button.linked:last-child,
     .header-bar .button.linked:first-child,
     .header-bar .button.linked:last-child {
@@ -4292,143 +4267,107 @@ GtkSwitch {
 /************
  * Toolbars *
  ************/
-.toolbar,
-toolbar {
+.toolbar {
   -GtkWidget-window-dragging: true;
   padding: 0px;
   background-color: #636E73;
   color: #ffffff; }
-  .toolbar:backdrop,
-  toolbar:backdrop {
+  .toolbar:backdrop {
     background-color: #576165;
     color: rgba(255, 255, 255, 0.5); }
 
-.osd .toolbar, .osd
-toolbar {
+.osd .toolbar {
   box-shadow: none;
   background-color: transparent; }
-.toolbar button,
-.toolbar .button,
-.toolbar .flat,
-.toolbar .text-button,
-.toolbar .image-button,
-toolbar button,
-toolbar .button,
-toolbar .flat,
-toolbar .text-button,
-toolbar .image-button {
-  border: none;
-  background: none;
-  text-shadow: none;
+.toolbar .button {
   background-color: transparent;
-  color: #ffffff;
+  background-image: none;
   border-radius: 0px;
-  padding: 10px; }
-  .toolbar button:focus, .toolbar button:active,
-  .toolbar .button:focus,
-  .toolbar .button:active,
-  .toolbar .flat:focus,
-  .toolbar .flat:active,
-  .toolbar .text-button:focus,
-  .toolbar .text-button:active,
-  .toolbar .image-button:focus,
-  .toolbar .image-button:active,
-  toolbar button:focus,
-  toolbar button:active,
-  toolbar .button:focus,
-  toolbar .button:active,
-  toolbar .flat:focus,
-  toolbar .flat:active,
-  toolbar .text-button:focus,
-  toolbar .text-button:active,
-  toolbar .image-button:focus,
-  toolbar .image-button:active {
-    color: #ffffff;
+  border: none;
+  box-shadow: none;
+  icon-shadow: none;
+  margin: 0;
+  padding: 10px;
+  text-shadow: none; }
+  .toolbar .button.suggested-action, .toolbar .button.text-button, .toolbar .button.image-button, .toolbar .button.linked, .toolbar .button.flat {
+    background-color: transparent;
+    background-image: none;
+    border-radius: 0px;
+    border: none;
+    box-shadow: none;
+    icon-shadow: none;
+    margin: 0;
+    padding: 10px;
     text-shadow: none;
-    box-shadow: inset 0 -2px 0 0 #ffffff;
-    background-color: rgba(255, 255, 255, 0.1); }
-    .toolbar button:focus:backdrop, .toolbar button:active:backdrop,
-    .toolbar .button:focus:backdrop,
-    .toolbar .button:active:backdrop,
-    .toolbar .flat:focus:backdrop,
-    .toolbar .flat:active:backdrop,
-    .toolbar .text-button:focus:backdrop,
-    .toolbar .text-button:active:backdrop,
-    .toolbar .image-button:focus:backdrop,
-    .toolbar .image-button:active:backdrop,
-    toolbar button:focus:backdrop,
-    toolbar button:active:backdrop,
-    toolbar .button:focus:backdrop,
-    toolbar .button:active:backdrop,
-    toolbar .flat:focus:backdrop,
-    toolbar .flat:active:backdrop,
-    toolbar .text-button:focus:backdrop,
-    toolbar .text-button:active:backdrop,
-    toolbar .image-button:focus:backdrop,
-    toolbar .image-button:active:backdrop {
+    color: #ffffff; }
+    .toolbar .button.suggested-action:backdrop, .toolbar .button.text-button:backdrop, .toolbar .button.image-button:backdrop, .toolbar .button.linked:backdrop, .toolbar .button.flat:backdrop {
       background-color: transparent;
+      background-image: none;
+      text-shadow: none;
       color: rgba(255, 255, 255, 0.5); }
-  .toolbar button:hover,
-  .toolbar .button:hover,
-  .toolbar .flat:hover,
-  .toolbar .text-button:hover,
-  .toolbar .image-button:hover,
-  toolbar button:hover,
-  toolbar .button:hover,
-  toolbar .flat:hover,
-  toolbar .text-button:hover,
-  toolbar .image-button:hover {
-    background-color: rgba(255, 255, 255, 0.1);
+    .toolbar .button.suggested-action:hover, .toolbar .button.text-button:hover, .toolbar .button.image-button:hover, .toolbar .button.linked:hover, .toolbar .button.flat:hover {
+      background-image: none;
+      background-color: rgba(0, 0, 0, 0.15);
+      color: white;
+      box-shadow: none;
+      text-shadow: none; }
+  .toolbar .button GtkLabel,
+  .toolbar .button GtkImage {
+    color: #ffffff; }
+    .toolbar .button GtkLabel:backdrop,
+    .toolbar .button GtkImage:backdrop {
+      color: rgba(255, 255, 255, 0.5); }
+  .toolbar .button:focus, .toolbar .button:hover {
+    background-image: none;
+    background-color: rgba(0, 0, 0, 0.15);
+    color: white;
+    box-shadow: none;
+    text-shadow: none; }
+  .toolbar .button:backdrop {
+    background-color: transparent;
+    background-image: none;
+    color: rgba(255, 255, 255, 0.5); }
+    .toolbar .button:backdrop GtkImage {
+      color: rgba(255, 255, 255, 0.5); }
+  .toolbar .button:active, .toolbar .button:checked {
+    border-radius: 0px;
     text-shadow: none;
-    color: #ffffff;
-    box-shadow: inset 0 -2px 0 0 #ffffff; }
-  .toolbar button:insensitive,
-  .toolbar .button:insensitive,
-  .toolbar .flat:insensitive,
-  .toolbar .text-button:insensitive,
-  .toolbar .image-button:insensitive,
-  toolbar button:insensitive,
-  toolbar .button:insensitive,
-  toolbar .flat:insensitive,
-  toolbar .text-button:insensitive,
-  toolbar .image-button:insensitive {
-    background: none;
+    icon-shadow: none;
+    box-shadow: inset 0 -2px 0 0 #ffffff;
     background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
-  .toolbar button:backdrop,
-  .toolbar .button:backdrop,
-  .toolbar .flat:backdrop,
-  .toolbar .text-button:backdrop,
-  .toolbar .image-button:backdrop,
-  toolbar button:backdrop,
-  toolbar .button:backdrop,
-  toolbar .flat:backdrop,
-  toolbar .text-button:backdrop,
-  toolbar .image-button:backdrop {
-    background: none;
+    background-image: none;
+    color: #ffffff; }
+    .toolbar .button:active:backdrop, .toolbar .button:checked:backdrop {
+      background-color: transparent;
+      background-image: none;
+      color: rgba(255, 255, 255, 0.5);
+      box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.5); }
+    .toolbar .button:active:focus, .toolbar .button:active:hover, .toolbar .button:checked:focus, .toolbar .button:checked:hover {
+      background-image: none;
+      background-color: rgba(0, 0, 0, 0.15);
+      color: white;
+      box-shadow: inset 0 -2px 0 0 #ffffff; }
+  .toolbar .button:insensitive, .toolbar .button:insensitive:backdrop {
+    color: rgba(255, 255, 255, 0.5);
     background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
-.toolbar .separator,
-toolbar .separator {
+    background-image: none; }
+    .toolbar .button:insensitive image,
+    .toolbar .button:insensitive GtkImage, .toolbar .button:insensitive:backdrop image,
+    .toolbar .button:insensitive:backdrop GtkImage {
+      -gtk-image-effect: dim; }
+.toolbar .separator {
   color: transparent;
   background-color: transparent; }
-.toolbar.osd,
-toolbar.osd {
+.toolbar.osd {
   padding: 13px;
   border: none;
   border-radius: 5px;
   background-color: rgba(32, 37, 38, 0.8); }
-  .toolbar.osd.left, .toolbar.osd.right, .toolbar.osd.top, .toolbar.osd.bottom,
-  toolbar.osd.left,
-  toolbar.osd.right,
-  toolbar.osd.top,
-  toolbar.osd.bottom {
+  .toolbar.osd.left, .toolbar.osd.right, .toolbar.osd.top, .toolbar.osd.bottom {
     border-radius: 0; }
-.toolbar.horizontal separator,
-toolbar.horizontal separator {
+.toolbar.horizontal separator {
   margin: 0 7px 1px 6px; }
-.toolbar.vertical separator,
-toolbar.vertical separator {
+.toolbar.vertical separator {
   margin: 6px 1px 7px 0; }
 
 /*******************
@@ -5934,8 +5873,6 @@ ConversationListView {
     icon-shadow: none; }
     #content_frame button:insensitive GtkLabel, #content_frame button:insensitive {
       color: #afafaf; }
-    #content_frame button:insensitive label, #content_frame button:insensitive {
-      color: #afafaf; }
 
 #buttonbox_frame {
   padding-top: 20px;
diff --git a/Paper/gtk-3.18/widgets/_buttons.scss b/Paper/gtk-3.18/widgets/_buttons.scss
index b7f9794..7c8b033 100644
--- a/Paper/gtk-3.18/widgets/_buttons.scss
+++ b/Paper/gtk-3.18/widgets/_buttons.scss
@@ -191,8 +191,6 @@ $_dot_color: if($variant=='light', $selected_bg_color,
       @include button(undecorated);
 
       box-shadow: none; //FIXME respect no edge on the button mixin
-      text-shadow: 0 1px black;
-      icon-shadow: 0 1px black;
 
       &:hover { @include button(osd-hover); }
 
@@ -279,12 +277,12 @@ $_dot_color: if($variant=='light', $selected_bg_color,
 
     outline-offset: -3px; // needs to be set or it gets overriden by GtkRadioButton outline-offset
 
-    > label {
+    > GtkLabel {
       padding-left: 6px;  // label padding
       padding-right: 6px; //
     }
 
-    > image {
+    > GtkImage {
       padding-left: 6px;   // image padding
       padding-right: 6px;  //
       padding-top: 3px;    //
diff --git a/Paper/gtk-3.18/widgets/_header-bars.scss b/Paper/gtk-3.18/widgets/_header-bars.scss
index 3802a3c..1ac910e 100644
--- a/Paper/gtk-3.18/widgets/_header-bars.scss
+++ b/Paper/gtk-3.18/widgets/_header-bars.scss
@@ -2,7 +2,7 @@
  * Header Bars *
  ***************/
 
-%titlebar,
+%headerbar,
 .header-bar {
   padding:0 8px;
   border: none;
@@ -320,6 +320,50 @@
       }
     }
 
+    // Suggested Button
+    &.suggested-action {
+      font-weight: bold;
+      padding:0;
+      padding: 5px 10px;
+      border-radius: 2px;
+
+      background-color: $headerbar_fg_color;
+      color: $selected_bg_color;
+      box-shadow: 0 1px 0 0 transparentize(black, 0.8);
+
+      GtkLabel { color: $selected_bg_color;}
+
+      &:hover {
+        background-color: $headerbar_fg_color;
+        box-shadow: 0 1px 2px 0 transparentize(black, 0.6);
+        GtkLabel {color: $selected_bg_color;}
+
+        &:backdrop {
+          background-color: transparentize($headerbar_fg_color, 0.2);
+          box-shadow:none;
+          GtkLabel { color:transparentize($selected_bg_color, 0.2);}
+        }
+      }
+
+      &:insensitive {
+        background-color: transparentize(black, 0.9);
+        box-shadow:none;
+        GtkLabel { color:transparentize($headerbar_fg_color, 0.5);}
+
+        &:backdrop {
+          background-color: transparentize(black, 0.9);
+          box-shadow:none;
+          GtkLabel { color:transparentize($headerbar_fg_color, 0.5);}
+        }
+      }
+
+      &:backdrop {
+        background-color: transparentize($headerbar_fg_color, 0.9);
+        box-shadow: none;
+        GtkLabel {color:transparentize($selected_bg_color, 0.8);}
+      }
+    }
+
     // Linked button
     &.linked {
       &:first-child,
@@ -367,5 +411,5 @@
     }
   }
 
-  @extend %titlebar;
+  @extend %headerbar;
 }
diff --git a/Paper/gtk-3.18/widgets/_toolbars.scss b/Paper/gtk-3.18/widgets/_toolbars.scss
index 01df9b9..9355de0 100644
--- a/Paper/gtk-3.18/widgets/_toolbars.scss
+++ b/Paper/gtk-3.18/widgets/_toolbars.scss
@@ -13,57 +13,124 @@
   }
 }
 
-.toolbar,
-toolbar {
+.toolbar {
   @extend %toolbar;
 
   // on OSD
   .osd & { box-shadow:none; background-color: transparent; }
-
-  // buttons
-  button,
-  .button,
-  .flat,
-  .text-button,
-  .image-button {
-    border: none;
-    background: none;
-    text-shadow: none;
+  
+  // Buttons
+  .button {
     background-color: transparent;
-    color: $headerbar_fg_color;
+    background-image: none;
     border-radius: 0px;
+    border: none;
+    box-shadow: none;
+    icon-shadow: none;
+    margin: 0;
     padding: 10px;
+    text-shadow: none;
 
-    &:focus,
-    &:active {
-      color: $headerbar_fg_color; 
+    &.suggested-action,
+    &.text-button,
+    &.image-button,
+    &.linked,
+    &.flat {
+      background-color: transparent;
+      background-image: none;
+      border-radius: 0px;
+      border: none;
+      box-shadow: none;
+      icon-shadow: none;
+      margin: 0;
+      padding: 10px;
       text-shadow: none;
-      box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
-      background-color: transparentize(white, 0.9);
+      color: $headerbar_fg_color;
 
       &:backdrop {
         background-color: transparent;
+        background-image: none;
+        text-shadow: none;
+        color: $backdrop_headerbar_fg_color;
+      }
+
+      &:hover { 
+        background-image:none;
+        background-color: transparentize(black, 0.85);
+        color:lighten($headerbar_fg_color, 10%);
+        box-shadow:none;
+        text-shadow:none;
+      }
+    }
+
+    GtkLabel,
+    GtkImage {
+      color: $headerbar_fg_color;
+
+      &:backdrop {
         color: $backdrop_headerbar_fg_color;
       }
     }
 
-    &:hover {
-      background-color: transparentize(white, 0.9);
-      text-shadow: none;
-      color: $headerbar_fg_color;
-      box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
-    }
-
-    &:insensitive {
-      background:none;
-      background-color: transparent;
-      color: transparentize($headerbar_fg_color,0.5);
+    &:focus,
+    &:hover { 
+      background-image:none;
+      background-color: transparentize(black, 0.85);
+      color:lighten($headerbar_fg_color, 10%);
+      box-shadow:none;
+      text-shadow:none;
     }
 
     &:backdrop {
-      background:none;
       background-color: transparent;
+      background-image: none;
       color: $backdrop_headerbar_fg_color;
+
+      GtkImage {
+        color: $backdrop_headerbar_fg_color;
+      }
+    }
+
+    &:active,
+    &:checked {
+      border-radius: 0px;
+
+      text-shadow: none;
+      icon-shadow: none;
+      
+      box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
+
+      background-color: transparent;
+      background-image: none;
+      color: $headerbar_fg_color;
+
+      &:backdrop {
+        background-color: transparent;
+        background-image: none;
+        color: $backdrop_headerbar_fg_color;
+
+        box-shadow: inset 0 -2px 0 0 $backdrop_headerbar_fg_color;
+      }
+
+      &:focus,
+      &:hover { 
+        background-image:none;
+        background-color: transparentize(black, 0.85);
+        color:lighten($headerbar_fg_color, 10%);
+        box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
+      }
+    }
+
+    &:insensitive,
+    &:insensitive:backdrop {
+      color: $backdrop_headerbar_fg_color;
+      background-color: transparent;
+      background-image: none;
+
+      image,
+      GtkImage {
+        -gtk-image-effect: dim;
+      }
     }
   }