diff --git a/data/application.css b/data/application.css
index 8c34231..81a3710 100644
--- a/data/application.css
+++ b/data/application.css
@@ -6,25 +6,19 @@ window,
     padding: 0;
 }
 
-.close {
-    padding: 3px;
-    border: none;
-    border-radius: 100%;
-    background: @BLACK_500;
-    box-shadow:
-        inset 0 0 0 1px alpha(#fff, 0.02),
-        inset 0 1px 0 0 alpha(#fff, 0.07),
-        inset 0 -1px 0 0 alpha(#fff, 0.01),
-        0 0 0 1px alpha(#000, 0.7),
-        0 1px 2px alpha(#000, 0.16),
-        0 2px 3px alpha(#000, 0.23);
-    margin: 3px;
-    -gtk-icon-size: 24px;
-}
-
-.close image {
-    color: #fff;
-    -gtk-icon-shadow: 0 1px 1px alpha(#000, 0.6);
+button.osd {
+   border-radius: 100%;
+   background: @BLACK_500;
+   box-shadow:
+       inset 0 0 0 1px alpha(#fff, 0.02),
+       inset 0 1px 0 0 alpha(#fff, 0.07),
+       inset 0 -1px 0 0 alpha(#fff, 0.01),
+       0 0 0 1px alpha(#000, 0.7),
+       0 1px 2px alpha(#000, 0.16),
+       0 2px 3px alpha(#000, 0.23);
+   margin: 3px;
+   -gtk-icon-shadow: 0 1px 1px alpha(#000, 0.6);
+   -gtk-icon-size: 24px;
 }
 
 .notification stack > box,
diff --git a/src/AbstractBubble.vala b/src/AbstractBubble.vala
index 197fe0b..d01a0e6 100644
--- a/src/AbstractBubble.vala
+++ b/src/AbstractBubble.vala
@@ -72,7 +72,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
             halign = Gtk.Align.START,
             valign = Gtk.Align.START
         };
-        close_button.add_css_class ("close");
+        close_button.add_css_class (Granite.STYLE_CLASS_OSD);
 
         close_revealer = new Gtk.Revealer () {
             reveal_child = false,