diff --git a/data/application.css b/data/application.css
index ad100ec2..c8828126 100644
--- a/data/application.css
+++ b/data/application.css
@@ -1,4 +1,3 @@
-decoration,
 window,
 .titlebar {
     background: transparent;
@@ -18,19 +17,19 @@ window,
             @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);
+        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);
+    -gtk-icon-shadow: 0 1px 1px alpha(#000, 0.6);
 }
 
 .notification stack > grid {
diff --git a/data/image-mask.svg b/data/image-mask.svg
deleted file mode 100644
index 2209a4b6..00000000
--- a/data/image-mask.svg
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   width="48"
-   height="48"
-   id="svg2"
-   version="1.1">
-  <defs
-     id="defs4">
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)">
-      <stop
-         id="stop3750-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-1"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <filter
-       id="filter3174-4"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur3176-5"
-         stdDeviation="1.71" />
-    </filter>
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)">
-      <stop
-         id="stop3750-9"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-7"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <filter
-       id="filter3174"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur3176"
-         stdDeviation="1.71" />
-    </filter>
-    <linearGradient
-       xlink:href="#ButtonShadow-9"
-       id="linearGradient6176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)"
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396" />
-    <linearGradient
-       xlink:href="#ButtonShadow"
-       id="linearGradient6178"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)"
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396" />
-    <linearGradient
-       id="linearGradient3688-464-309-9-2-4-2">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2889-7-9-6-9" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2891-6-6-1-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.1578952,0,0,0.6428571,-3.78948,16.2857)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-501-757-8-4-1-1-9"
-       id="linearGradient6084"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-501-757-8-4-1-1-9">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2895-8-9-9-1-4" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2897-7-8-7-7-3" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2899-4-5-1-5-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,1)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3924-1-7-54"
-       id="linearGradient3028-82"
-       y2="43"
-       x2="23.99999"
-       y1="4.999989"
-       x1="23.99999" />
-    <linearGradient
-       id="linearGradient3924-1-7-54">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3926-3-4-4" />
-      <stop
-         offset="0.06316455"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop3928-91-41-8" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop3930-6-6-6" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop3932-6-6-7" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.3201719,0,0,0.89999994,28.617841,5.0999865)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-9-2-4-2"
-       id="radialGradient3013-3"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <radialGradient
-       gradientTransform="matrix(-2.3201719,0,0,-0.89999994,19.382168,83.399981)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-9-2-4-2"
-       id="radialGradient3015-3"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(906.27272,-451.79544)"
-     style="display:none"
-     id="layer2">
-    <rect
-       style="opacity:0.9;fill:url(#linearGradient6178);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)"
-       id="rect3745"
-       y="7"
-       x="5"
-       ry="6"
-       rx="6"
-       height="85"
-       width="86" />
-  </g>
-  <g
-     transform="translate(903,-452.15908)"
-     style="display:none"
-     id="layer2-4">
-    <rect
-       style="opacity:0.9;fill:url(#linearGradient6176);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174-4)"
-       id="rect3745-5"
-       y="7"
-       x="5"
-       ry="6"
-       rx="6"
-       height="85"
-       width="86" />
-  </g>
-  <rect
-     width="37"
-     height="37"
-     rx="1"
-     ry="1"
-     x="5.5"
-     y="6.4999828"
-     id="rect6741-11-6"
-     style="opacity:0.4;fill:none;stroke:url(#linearGradient3028-82);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-  <rect
-     width="39"
-     height="39"
-     rx="2"
-     ry="2"
-     x="4.5"
-     y="5.4999828"
-     id="rect5505-21-3-2-7-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     id="rect4188"
-     d="M 7.7890625 45 L 7.7890625 46.5 L 40.210938 46.5 L 40.210938 45 L 7.7890625 45 z "
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient6084);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0" />
-  <path
-     id="rect2801-3"
-     d="M 44 42 L 44 42.5 C 44 43.885 42.885 45 41.5 45 L 40.210938 45 L 40.210938 46.5 L 46 46.5 L 46 42 L 44 42 z "
-     style="fill:url(#radialGradient3013-3);fill-opacity:1;stroke:none;opacity:0.3" />
-  <path
-     id="rect3696-6"
-     d="M 2 42 L 2 46.5 L 7.7890625 46.5 L 7.7890625 45 L 6.5 45 C 5.115 45 4 43.885 4 42.5 L 4 42 L 2 42 z "
-     style="fill:url(#radialGradient3015-3);fill-opacity:1;stroke:none;opacity:0.3" />
-</svg>
diff --git a/data/notifications.gresource.xml b/data/notifications.gresource.xml
index 01f6eace..06854e8f 100644
--- a/data/notifications.gresource.xml
+++ b/data/notifications.gresource.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/notifications">
-    <file alias="application.css" compressed="true">application.css</file>
-    <file alias="image-mask.svg" compressed="true">image-mask.svg</file>
+    <file alias="Application.css" compressed="true">application.css</file>
   </gresource>
 </gresources>
diff --git a/src/AbstractBubble.vala b/src/AbstractBubble.vala
index 0b8b7e10..7803619a 100644
--- a/src/AbstractBubble.vala
+++ b/src/AbstractBubble.vala
@@ -55,7 +55,8 @@ public class Notifications.AbstractBubble : Gtk.Window {
             transition_type = Gtk.RevealerTransitionType.CROSSFADE,
             halign = Gtk.Align.START,
             valign = Gtk.Align.START,
-            child = close_button
+            child = close_button,
+            overflow = VISIBLE
         };
 
         var overlay = new Gtk.Overlay () {
@@ -122,7 +123,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
             timeout_id = 0;
         }
 
-        show ();
+        base.present ();
 
         if (timeout != 0) {
             timeout_id = Timeout.add (timeout, timeout_expired);
diff --git a/src/Widgets/MaskedImage.vala b/src/Widgets/MaskedImage.vala
index be78ab69..d31ae06a 100644
--- a/src/Widgets/MaskedImage.vala
+++ b/src/Widgets/MaskedImage.vala
@@ -18,7 +18,7 @@
 *
 */
 
-public class Notifications.MaskedImage : Gtk.Overlay {
+public class Notifications.MaskedImage : Granite.Bin {
     private const int ICON_SIZE = 48;
 
     public Gdk.Pixbuf pixbuf { get; construct; }
@@ -28,15 +28,11 @@ public class Notifications.MaskedImage : Gtk.Overlay {
     }
 
     construct {
-        var mask = new Gtk.Image.from_resource ("/io/elementary/notifications/image-mask.svg");
-        mask.pixel_size = ICON_SIZE;
-
         var image = new Gtk.Image ();
         image.gicon = mask_pixbuf (pixbuf, scale_factor);
         image.pixel_size = ICON_SIZE;
 
         child = image;
-        add_overlay (mask);
     }
 
     private static Gdk.Pixbuf? mask_pixbuf (Gdk.Pixbuf pixbuf, int scale) {