diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 97208e0..27d7a51 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -118,21 +118,6 @@ read if you used those and something break with a version upgrade you're on your
   .app-notification.frame:backdrop {
     background-image: none;
     transition: 200ms ease-out; }
-  .app-notification button, .app-notification button.flat,
-  .app-notification.frame button,
-  .app-notification.frame button.flat {
-    color: #fefefe;
-    border-color: rgba(0, 0, 0, 0.7);
-    background-color: rgba(20, 23, 26, 0.8);
-    background-clip: padding-box;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-    text-shadow: 0 1px black;
-    -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(254, 254, 254, 0.3); }
-    .app-notification button:hover, .app-notification button.flat:hover,
-    .app-notification.frame button:hover,
-    .app-notification.frame button.flat:hover {
-      background: rgba(47, 54, 61, 0.8); }
   .app-notification border,
   .app-notification.frame border {
     border: none; }
@@ -497,7 +482,8 @@ button.osd {
     -gtk-icon-shadow: none;
     border: none; }
 
-.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button,
+.app-notification button,
+.app-notification.frame button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button,
 .osd
 button {
   color: #fefefe;
@@ -508,7 +494,7 @@ button {
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black;
   outline-color: rgba(254, 254, 254, 0.3); }
-  popover.background.touch-selection button:hover, popover.background.magnifier button:hover,
+  .app-notification button:hover, popover.background.touch-selection button:hover, popover.background.magnifier button:hover,
   .osd
   button:hover {
     color: white;
@@ -519,7 +505,7 @@ button {
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
     outline-color: rgba(254, 254, 254, 0.3); }
-  popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, popover.background.touch-selection button:active, popover.background.magnifier button:active, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, popover.background.touch-selection button:checked, popover.background.magnifier button:checked,
+  .app-notification button:active:backdrop, popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked,
   .osd
   button:active:backdrop,
   .osd
@@ -536,7 +522,7 @@ button {
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(254, 254, 254, 0.3); }
-  popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled,
+  .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled,
   .osd
   button:disabled:backdrop,
   .osd
@@ -548,7 +534,7 @@ button {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop,
+  .app-notification button:backdrop, popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop,
   .osd
   button:backdrop {
     color: #fefefe;
@@ -558,19 +544,21 @@ button {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  popover.background.touch-selection button.flat, popover.background.magnifier button.flat,
+  .app-notification button.flat, popover.background.touch-selection button.flat, popover.background.magnifier button.flat,
   .osd
   button.flat {
-    background-color: transparent;
-    background-image: none;
-    background-color: #181b28;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-    text-shadow: none;
-    -gtk-icon-shadow: none;
+    color: #fefefe;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-color: rgba(20, 23, 26, 0.8);
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    -gtk-icon-shadow: 0 1px black;
+    outline-color: rgba(254, 254, 254, 0.3);
     box-shadow: none;
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black; }
-    popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat: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;
@@ -581,7 +569,7 @@ button {
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(254, 254, 254, 0.3); }
-    popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled,
+    .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled,
     .osd
     button.flat:disabled {
       color: #898b8c;
@@ -594,16 +582,17 @@ button {
       background-image: none;
       border-color: transparent;
       box-shadow: none; }
-    popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop,
+    .app-notification button.flat:backdrop, popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop,
     .osd
     button.flat:backdrop {
-      background-color: transparent;
-      background-image: none;
-      background-color: #181b28;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+      color: #fefefe;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+      background-clip: padding-box;
+      box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
-    popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, popover.background.touch-selection button.flat:checked, popover.background.magnifier button.flat:checked,
+    .app-notification button.flat:active, popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, .app-notification button.flat:checked, popover.background.touch-selection button.flat:checked, popover.background.magnifier button.flat:checked,
     .osd
     button.flat:active,
     .osd
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index b1f5e6b..07bfc58 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -118,21 +118,6 @@ read if you used those and something break with a version upgrade you're on your
   .app-notification.frame:backdrop {
     background-image: none;
     transition: 200ms ease-out; }
-  .app-notification button, .app-notification button.flat,
-  .app-notification.frame button,
-  .app-notification.frame button.flat {
-    color: #fefefe;
-    border-color: rgba(0, 0, 0, 0.7);
-    background-color: rgba(20, 23, 26, 0.8);
-    background-clip: padding-box;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-    text-shadow: 0 1px black;
-    -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(254, 254, 254, 0.3); }
-    .app-notification button:hover, .app-notification button.flat:hover,
-    .app-notification.frame button:hover,
-    .app-notification.frame button.flat:hover {
-      background: rgba(47, 54, 61, 0.8); }
   .app-notification border,
   .app-notification.frame border {
     border: none; }
@@ -500,7 +485,8 @@ button.osd {
     -gtk-icon-shadow: none;
     border: none; }
 
-.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button,
+.app-notification button,
+.app-notification.frame button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button,
 .osd
 button {
   color: #fefefe;
@@ -511,7 +497,7 @@ button {
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black;
   outline-color: rgba(254, 254, 254, 0.3); }
-  popover.background.touch-selection button:hover, popover.background.magnifier button:hover,
+  .app-notification button:hover, popover.background.touch-selection button:hover, popover.background.magnifier button:hover,
   .osd
   button:hover {
     color: white;
@@ -522,7 +508,7 @@ button {
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
     outline-color: rgba(254, 254, 254, 0.3); }
-  popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, popover.background.touch-selection button:active, popover.background.magnifier button:active, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, popover.background.touch-selection button:checked, popover.background.magnifier button:checked,
+  .app-notification button:active:backdrop, popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked,
   .osd
   button:active:backdrop,
   .osd
@@ -539,7 +525,7 @@ button {
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(254, 254, 254, 0.3); }
-  popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled,
+  .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled,
   .osd
   button:disabled:backdrop,
   .osd
@@ -551,7 +537,7 @@ button {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop,
+  .app-notification button:backdrop, popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop,
   .osd
   button:backdrop {
     color: #fefefe;
@@ -561,19 +547,21 @@ button {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  popover.background.touch-selection button.flat, popover.background.magnifier button.flat,
+  .app-notification button.flat, popover.background.touch-selection button.flat, popover.background.magnifier button.flat,
   .osd
   button.flat {
-    background-color: transparent;
-    background-image: none;
-    background-color: #eaeef2;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-    text-shadow: none;
-    -gtk-icon-shadow: none;
+    color: #fefefe;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-color: rgba(20, 23, 26, 0.8);
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    -gtk-icon-shadow: 0 1px black;
+    outline-color: rgba(254, 254, 254, 0.3);
     box-shadow: none;
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black; }
-    popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat: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;
@@ -584,7 +572,7 @@ button {
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(254, 254, 254, 0.3); }
-    popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled,
+    .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled,
     .osd
     button.flat:disabled {
       color: #898b8c;
@@ -597,16 +585,17 @@ button {
       background-image: none;
       border-color: transparent;
       box-shadow: none; }
-    popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop,
+    .app-notification button.flat:backdrop, popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop,
     .osd
     button.flat:backdrop {
-      background-color: transparent;
-      background-image: none;
-      background-color: #eaeef2;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+      color: #fefefe;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+      background-clip: padding-box;
+      box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
-    popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, popover.background.touch-selection button.flat:checked, popover.background.magnifier button.flat:checked,
+    .app-notification button.flat:active, popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, .app-notification button.flat:checked, popover.background.touch-selection button.flat:checked, popover.background.magnifier button.flat:checked,
     .osd
     button.flat:active,
     .osd
diff --git a/gtk-3.0/widgets/_app-notifications.scss b/gtk-3.0/widgets/_app-notifications.scss
index 0f0f56c..fa46542 100644
--- a/gtk-3.0/widgets/_app-notifications.scss
+++ b/gtk-3.0/widgets/_app-notifications.scss
@@ -17,12 +17,7 @@
     transition: $backdrop_transition;
   }
 
-  button, button.flat { 
-    @include button(osd);
-    &:hover {
-      background: lighten($osd_bg_color, 12%);
-    }
-  }
+  button { @extend %osd_button; }
 
   border { border: none; }
 }
diff --git a/gtk-3.0/widgets/_buttons.scss b/gtk-3.0/widgets/_buttons.scss
index e76b7eb..3699f4b 100644
--- a/gtk-3.0/widgets/_buttons.scss
+++ b/gtk-3.0/widgets/_buttons.scss
@@ -206,7 +206,7 @@ button {
     &:backdrop { @include button(osd-backdrop); }
 
     &.flat {
-      @include button(undecorated);
+      @include button(osd);
 
       box-shadow: none; //FIXME respect no edge on the button mixin
       text-shadow: 0 1px black;
@@ -221,7 +221,7 @@ button {
         box-shadow: none;
       }
 
-      &:backdrop { @include button(undecorated); }
+      &:backdrop { @include button(osd-backdrop); }
 
       &:active,
       &:checked { @include button(osd-active); }