diff --git a/data/SettingsOption.css b/data/SettingsOption.css
index 88c46855..d7eaa89c 100644
--- a/data/SettingsOption.css
+++ b/data/SettingsOption.css
@@ -17,70 +17,92 @@
 * Boston, MA 02110-1301 USA.
 */
 
-.card {
-   background-position: center;
-   background-repeat: no-repeat;
-   background-size: 112px 80px, cover;
-   min-width: 112px;
-   min-height: 80px;
+settingspage.notifications .card {
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 112px 80px, cover;
+    min-width: 112px;
+    min-height: 80px;
+    margin-top: 1em;
 }
 
-.card.bubbles {
+settingspage.notifications .card.bubbles {
     background-image:
-        url("resource:///io/elementary/settings/notifications/bubbles.svg"),
+        url("resource:///io/elementary/settings/notifications/bubble.svg"),
+        url("resource:///io/elementary/settings/notifications/dock.svg"),
         linear-gradient(
             to bottom,
-            alpha(@accent_color_300, 0.1),
-            alpha(@accent_color_500, 0.1)
+            shade(@selected_bg_color, 1.1),
+            @selected_bg_color
         );
+    background-size: 40px 14px, 54px 12px, cover;
+    background-position: calc(100% - 3px) 12px, bottom, center;
 }
 
-.card.bubbles.dark {
+settingspage.notifications .card.bubbles.dark {
     background-image:
-        url("resource:///io/elementary/settings/notifications/bubbles-dark.svg"),
+        url("resource:///io/elementary/settings/notifications/bubble-dark.svg"),
+        url("resource:///io/elementary/settings/notifications/dock-dark.svg"),
         linear-gradient(
             to bottom,
-            alpha(@accent_color_300, 0.1),
-            alpha(@accent_color_500, 0.1)
+            shade(@selected_bg_color, 1.1),
+            @selected_bg_color
         );
 }
 
-.card.sounds {
+settingspage.notifications .card.bubbles:dir(rtl) {
+    background-position: 3px 12px, bottom, center;
+}
+
+settingspage.notifications .card.sounds {
     background-image:
-        url("resource:///io/elementary/settings/notifications/sounds.svg"),
+        -gtk-icontheme("audio-volume-high-symbolic"),
+        url("resource:///io/elementary/settings/notifications/dock.svg"),
         linear-gradient(
             to bottom,
-            alpha(@accent_color_300, 0.1),
-            alpha(@accent_color_500, 0.1)
+            shade(@selected_bg_color, 1.1),
+            @selected_bg_color
         );
+    background-size: 32px, 54px 12px, cover;
+    background-position: center, bottom, center;
+    color: @selected_fg_color;
 }
 
-.card.sounds.dark {
+settingspage.notifications .card.sounds.dark {
     background-image:
-        url("resource:///io/elementary/settings/notifications/sounds-dark.svg"),
+        -gtk-icontheme("audio-volume-high-symbolic"),
+        url("resource:///io/elementary/settings/notifications/dock-dark.svg"),
         linear-gradient(
             to bottom,
-            alpha(@accent_color_300, 0.1),
-            alpha(@accent_color_500, 0.1)
+            shade(@selected_bg_color, 1.1),
+            @selected_bg_color
         );
 }
 
-.card.notify-center {
+settingspage.notifications .card.notify-center {
     background-image:
         url("resource:///io/elementary/settings/notifications/notify-center.svg"),
+        url("resource:///io/elementary/settings/notifications/dock.svg"),
         linear-gradient(
             to bottom,
-            alpha(@accent_color_300, 0.1),
-            alpha(@accent_color_500, 0.1)
+            shade(@selected_bg_color, 1.1),
+            @selected_bg_color
         );
+    background-size: 40px 55px, 54px 12px, cover;
+    background-position: calc(100% - 3px) 3px, bottom, center;
 }
 
-.card.notify-center.dark {
+settingspage.notifications .card.notify-center.dark {
     background-image:
         url("resource:///io/elementary/settings/notifications/notify-center-dark.svg"),
+        url("resource:///io/elementary/settings/notifications/dock-dark.svg"),
         linear-gradient(
             to bottom,
-            alpha(@accent_color_300, 0.1),
-            alpha(@accent_color_500, 0.1)
+            shade(@selected_bg_color, 1.1),
+            @selected_bg_color
         );
 }
+
+settingspage.notifications .card.notify-center:dir(rtl) {
+    background-position: 3px 3px, bottom, center;
+}
diff --git a/data/bubble-dark.svg b/data/bubble-dark.svg
new file mode 100644
index 00000000..5798f949
--- /dev/null
+++ b/data/bubble-dark.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="40"
+   height="14"
+   id="svg4729"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4731">
+    <linearGradient
+       id="linearGradient3924-4">
+      <stop
+         id="stop3926-8"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#ffffff;stop-opacity:0.23529412;"
+         id="stop3928-5" />
+      <stop
+         id="stop3930-6-4"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         offset="0.95056331" />
+      <stop
+         id="stop3932-25"
+         style="stop-color:#ffffff;stop-opacity:0.39215687;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3924-4"
+       id="linearGradient1529"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6263817,0,0,0.43555485,-11.945112,-0.895545)"
+       x1="14.447668"
+       y1="6.6480026"
+       x2="14.447668"
+       y2="24.964697" />
+    <filter
+       height="1.1767287"
+       y="-0.088364332"
+       width="1.052541"
+       x="-0.026270477"
+       id="filter4818"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4820"
+         stdDeviation="0.4050032" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4734">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate"
+     d="m 3.5000077,1.499995 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 H 36.500008 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
+     id="path1027" />
+  <path
+     id="rect845"
+     d="m 3.4999777,0.500065 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 H 36.499978 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.745;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.975822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.502164;marker:none;enable-background:accumulate"
+     id="rect845-6"
+     d="m 3.4990477,1.013015 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 7 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 H 36.499048 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -7 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 z" />
+  <path
+     id="rect1527"
+     d="M 3.5248677,1.500015 H 36.462898 c 0.554,0 1.03707,0.446 1.03707,1 v 7.00001 c 0,0.554 -0.446,1 -1,1 H 3.4999677 c -0.554,0 -1,-0.446 -1,-1 v -7.00001 c 0,-0.554 0.4709,-1 1.0249,-1 z"
+     style="opacity:0.15;fill:none;stroke:url(#linearGradient1529);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+</svg>
diff --git a/data/bubble.svg b/data/bubble.svg
new file mode 100644
index 00000000..92e59306
--- /dev/null
+++ b/data/bubble.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg4729"
+   height="14"
+   width="40"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4731">
+    <linearGradient
+       y2="80.117599"
+       x2="14.066927"
+       y1="6.6480942"
+       x1="14.066927"
+       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9678"
+       xlink:href="#linearGradient3924-4" />
+    <linearGradient
+       id="linearGradient3924-4">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3926-8" />
+      <stop
+         id="stop3928-5"
+         style="stop-color:#ffffff;stop-opacity:0.23529412;"
+         offset="0.06316455" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         id="stop3930-6-4" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687;"
+         id="stop3932-25" />
+    </linearGradient>
+    <filter
+       height="1.5880001"
+       y="-0.294"
+       width="1.1147317"
+       x="-0.057365853"
+       id="filter1523"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur1525"
+         stdDeviation="0.98" />
+    </filter>
+    <linearGradient
+       y2="24.827114"
+       x2="14.447668"
+       y1="6.6480026"
+       x1="14.447668"
+       gradientTransform="matrix(2.6263817,0,0,0.43555485,-11.945112,-0.89557)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1529"
+       xlink:href="#linearGradient3924-4" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4700"
+       x="-0.03035295"
+       width="1.0607059"
+       y="-0.044228554"
+       height="1.0884571">
+      <feGaussianBlur
+         stdDeviation="0.6450012"
+         id="feGaussianBlur4702" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4733"
+       x="-0.07082355"
+       width="1.1416471"
+       y="-0.10319996"
+       height="1.2063999">
+      <feGaussianBlur
+         stdDeviation="1.5050028"
+         id="feGaussianBlur4735" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4733-6"
+       x="-0.07082355"
+       width="1.1416471"
+       y="-0.10319996"
+       height="1.2063999">
+      <feGaussianBlur
+         stdDeviation="1.5050028"
+         id="feGaussianBlur4735-2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4700-6"
+       x="-0.03035295"
+       width="1.0607059"
+       y="-0.044228554"
+       height="1.0884571">
+      <feGaussianBlur
+         stdDeviation="0.6450012"
+         id="feGaussianBlur4702-1" />
+    </filter>
+    <linearGradient
+       xlink:href="#linearGradient3924-4"
+       id="linearGradient4798"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
+       x1="14.066927"
+       y1="6.6480942"
+       x2="14.066927"
+       y2="80.117599" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4818"
+       x="-0.026270477"
+       width="1.052541"
+       y="-0.088364332"
+       height="1.1767287">
+      <feGaussianBlur
+         stdDeviation="0.4050032"
+         id="feGaussianBlur4820" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4734">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path1027"
+     d="m 3.5000077,1.49997 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 H 36.500008 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 3.4999777,0.50004 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 H 36.499978 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
+     id="rect845" />
+  <path
+     d="m 3.4990477,1.01299 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 7 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 H 36.499048 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -7 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 z"
+     id="rect845-6"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="opacity:1;fill:none;stroke:url(#linearGradient1529);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 3.5248677,1.49999 H 36.462898 c 0.554,0 1.03707,0.446 1.03707,1 V 9.5 c 0,0.554 -0.446,1 -1,1 H 3.4999677 c -0.554,0 -1,-0.446 -1,-1 V 2.49999 c 0,-0.554 0.4709,-1 1.0249,-1 z"
+     id="rect1527" />
+</svg>
diff --git a/data/bubbles-dark.svg b/data/bubbles-dark.svg
deleted file mode 100644
index ffd7e0c6..00000000
--- a/data/bubbles-dark.svg
+++ /dev/null
@@ -1,220 +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="112"
-   height="80"
-   id="svg4729"
-   version="1.1">
-  <defs
-     id="defs4731">
-    <linearGradient
-       id="linearGradient5063">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         id="stop5055" />
-      <stop
-         id="stop5057"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         offset="0.19461967" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         id="stop5059" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         id="stop5061" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3924-4">
-      <stop
-         id="stop3926-8"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.06316455"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop3928-5" />
-      <stop
-         id="stop3930-6-4"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.95056331" />
-      <stop
-         id="stop3932-25"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter1523"
-       x="-0.057365853"
-       width="1.1147317"
-       y="-0.294"
-       height="1.5880001">
-      <feGaussianBlur
-         stdDeviation="0.98"
-         id="feGaussianBlur1525" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient1529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.104455)"
-       x1="14.447668"
-       y1="6.6480026"
-       x2="14.447668"
-       y2="24.964697" />
-    <filter
-       height="1.0441815"
-       y="-0.022090762"
-       width="1.052541"
-       x="-0.026270478"
-       id="filter4818"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4820"
-         stdDeviation="0.4050032" />
-    </filter>
-    <linearGradient
-       gradientTransform="matrix(0.98039219,0,0,0.9,-352.08409,-344.00433)"
-       gradientUnits="userSpaceOnUse"
-       y2="473.27878"
-       x2="438.65228"
-       y1="466.57907"
-       x1="438.65228"
-       id="linearGradient5053"
-       xlink:href="#linearGradient5063" />
-  </defs>
-  <metadata
-     id="metadata4734">
-    <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>
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97582185;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50216447;marker:none;enable-background:accumulate"
-     d="M 80,80 V 76.56912 C 80,75.55867 79.37995,75 78.29324,75 H 30.67845 C 29.59174,75 29,75.61529 29,76.62574 V 80"
-     id="rect857" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.74500002;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="m 80.5,79.9834 v -3.48276 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
-     id="rect857-2" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate"
-     d="m 72.50003,15.499995 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
-     id="path1027" />
-  <path
-     id="rect845"
-     d="m 72.5,14.500065 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.74500002;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97582185;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50216447;marker:none;enable-background:accumulate"
-     id="rect845-6"
-     d="m 72.49907,15.013015 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 7 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 h 33 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -7 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 z" />
-  <path
-     id="rect1527"
-     d="m 72.52489,15.500015 h 32.93803 c 0.554,0 1.03707,0.446 1.03707,1 v 7.00001 c 0,0.554 -0.446,1 -1,1 h -33 c -0.554,0 -1,-0.446 -1,-1 v -7.00001 c 0,-0.554 0.4709,-1 1.0249,-1 z"
-     style="opacity:0.15;fill:none;stroke:url(#linearGradient1529);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-  <path
-     id="rect1343"
-     d="m 35.5,71.001 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
-     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5053);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="M 79.50002,80 V 76.91221 C 79.50002,76.0028 78.89212,75.5 77.82672,75.5 H 31.14556 c -1.06541,0 -1.64555,0.55376 -1.64555,1.46317 V 80"
-     id="rect857-0" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863"
-     width="7.0000782"
-     height="7.0000782"
-     x="34.499958"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="45.499958"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect869"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect875"
-     width="7.0000782"
-     height="7.0000782"
-     x="67.499992"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="56.499989"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect881"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1"
-     width="6"
-     height="6"
-     x="34.999989"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1-8"
-     width="6"
-     height="6"
-     x="45.999989"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1-4"
-     width="6"
-     height="6"
-     x="56.999989"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1-8-5"
-     width="6"
-     height="6"
-     x="67.999992"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <g
-     id="g5339"
-     transform="matrix(0.4137931,0,0,0.4137931,-27.03689,89.90069)"
-     style="color:#bebebe;fill:#abacae;stroke-width:2.41666675">
-    <path
-       id="path5337"
-       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41666675;marker:none"
-       overflow="visible"
-       d="m 301,-210.01 a 1,1 0 0 0 -1,1 v 0.01 c -1.764,0.456 -2.998,2.168 -3,3.99 0,0 0,5 -1.66,5.622 -0.016,0.01 -0.023,0.03 -0.04,0.043 a 0.726,0.726 0 0 0 -0.161,0.175 c -0.018,0.027 -0.039,0.048 -0.053,0.077 a 0.738,0.738 0 0 0 -0.086,0.334 c 0,0.415 0.335,0.75 0.75,0.75 h 10.5 c 0.416,0 0.75,-0.335 0.75,-0.75 a 0.738,0.738 0 0 0 -0.086,-0.334 c -0.014,-0.03 -0.035,-0.05 -0.052,-0.077 a 0.725,0.725 0 0 0 -0.162,-0.175 c -0.016,-0.012 -0.023,-0.033 -0.04,-0.043 -1.66,-0.622 -1.66,-5.622 -1.66,-5.622 -0.002,-1.822 -1.235,-3.534 -3,-3.99 v -0.01 a 1,1 0 0 0 -1,-1 z m -1.933,13 a 2,2 0 0 0 1.933,1.5 2,2 0 0 0 1.936,-1.5 z" />
-  </g>
-</svg>
diff --git a/data/bubbles.svg b/data/bubbles.svg
deleted file mode 100644
index c167cb7c..00000000
--- a/data/bubbles.svg
+++ /dev/null
@@ -1,274 +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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg4729"
-   height="80"
-   width="112"
-   sodipodi:docname="bubbles.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3200"
-     inkscape:window-height="1678"
-     id="namedview42"
-     showgrid="false"
-     inkscape:zoom="2.95"
-     inkscape:cx="56"
-     inkscape:cy="36.779661"
-     inkscape:window-x="0"
-     inkscape:window-y="60"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4729" />
-  <defs
-     id="defs4731">
-    <linearGradient
-       y2="80.117599"
-       x2="14.066927"
-       y1="6.6480942"
-       x1="14.066927"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9678"
-       xlink:href="#linearGradient3924-4" />
-    <linearGradient
-       id="linearGradient3924-4">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         id="stop3926-8" />
-      <stop
-         id="stop3928-5"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         offset="0.06316455" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         id="stop3930-6-4" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         id="stop3932-25" />
-    </linearGradient>
-    <filter
-       height="1.5880001"
-       y="-0.294"
-       width="1.1147317"
-       x="-0.057365853"
-       id="filter1523"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur1525"
-         stdDeviation="0.98" />
-    </filter>
-    <linearGradient
-       y2="24.827114"
-       x2="14.447668"
-       y1="6.6480026"
-       x1="14.447668"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.10443)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1529"
-       xlink:href="#linearGradient3924-4" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4700"
-       x="-0.03035295"
-       width="1.0607059"
-       y="-0.044228553"
-       height="1.0884571">
-      <feGaussianBlur
-         stdDeviation="0.6450012"
-         id="feGaussianBlur4702" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4733"
-       x="-0.07082355"
-       width="1.1416471"
-       y="-0.10319996"
-       height="1.2063999">
-      <feGaussianBlur
-         stdDeviation="1.5050028"
-         id="feGaussianBlur4735" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4733-6"
-       x="-0.07082355"
-       width="1.1416471"
-       y="-0.10319996"
-       height="1.2063999">
-      <feGaussianBlur
-         stdDeviation="1.5050028"
-         id="feGaussianBlur4735-2" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4700-6"
-       x="-0.03035295"
-       width="1.0607059"
-       y="-0.044228554"
-       height="1.0884571">
-      <feGaussianBlur
-         stdDeviation="0.6450012"
-         id="feGaussianBlur4702-1" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient4798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
-       x1="14.066927"
-       y1="6.6480942"
-       x2="14.066927"
-       y2="80.117599" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4818"
-       x="-0.026270478"
-       width="1.052541"
-       y="-0.022090762"
-       height="1.0441815">
-      <feGaussianBlur
-         stdDeviation="0.4050032"
-         id="feGaussianBlur4820" />
-    </filter>
-  </defs>
-  <metadata
-     id="metadata4734">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     id="rect857"
-     d="M 80,80 V 76.8239 C 80,75.81345 79.12517,75 78.03846,75 H 30.96154 C 29.87483,75 29,75.81345 29,76.8239 V 80"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.94573361;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     id="rect857-2"
-     d="m 80.5,79.9834 v -3.48276 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     id="path1027"
-     d="m 72.50003,15.49997 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="m 72.5,14.50004 c -1.108,0 -2,0.892 -2,2 v 7 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -7 c 0,-1.108 -0.892,-2 -2,-2 z"
-     id="rect845" />
-  <path
-     d="m 72.49907,15.01299 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 7 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 h 33 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -7 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 z"
-     id="rect845-6"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     style="opacity:1;fill:none;stroke:url(#linearGradient1529);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 72.52489,15.49999 h 32.93803 c 0.554,0 1.03707,0.446 1.03707,1 V 23.5 c 0,0.554 -0.446,1 -1,1 h -33 c -0.554,0 -1,-0.446 -1,-1 v -7.00001 c 0,-0.554 0.4709,-1 1.0249,-1 z"
-     id="rect1527" />
-  <path
-     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)"
-     d="m 35.5,71.001 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
-     id="rect1343" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="34.499958"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect863"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect869"
-     width="7.0000782"
-     height="7.0000782"
-     x="45.499958"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="67.499992"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect875"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect881"
-     width="7.0000782"
-     height="7.0000782"
-     x="56.499989"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="34.999989"
-     height="6"
-     width="6"
-     id="rect863-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="45.999989"
-     height="6"
-     width="6"
-     id="rect863-1-8"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="56.999989"
-     height="6"
-     width="6"
-     id="rect863-1-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="67.999992"
-     height="6"
-     width="6"
-     id="rect863-1-8-5"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <g
-     style="color:#bebebe;fill:#abacae;stroke-width:2.41666675"
-     transform="matrix(0.4137931,0,0,0.4137931,-27.03689,89.90069)"
-     id="g5339">
-    <path
-       d="m 301,-210.01 a 1,1 0 0 0 -1,1 v 0.01 c -1.764,0.456 -2.998,2.168 -3,3.99 0,0 0,5 -1.66,5.622 -0.016,0.01 -0.023,0.03 -0.04,0.043 a 0.726,0.726 0 0 0 -0.161,0.175 c -0.018,0.027 -0.039,0.048 -0.053,0.077 a 0.738,0.738 0 0 0 -0.086,0.334 c 0,0.415 0.335,0.75 0.75,0.75 h 10.5 c 0.416,0 0.75,-0.335 0.75,-0.75 a 0.738,0.738 0 0 0 -0.086,-0.334 c -0.014,-0.03 -0.035,-0.05 -0.052,-0.077 a 0.725,0.725 0 0 0 -0.162,-0.175 c -0.016,-0.012 -0.023,-0.033 -0.04,-0.043 -1.66,-0.622 -1.66,-5.622 -1.66,-5.622 -0.002,-1.822 -1.235,-3.534 -3,-3.99 v -0.01 a 1,1 0 0 0 -1,-1 z m -1.933,13 a 2,2 0 0 0 1.933,1.5 2,2 0 0 0 1.936,-1.5 z"
-       overflow="visible"
-       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41666675;marker:none"
-       id="path5337" />
-  </g>
-</svg>
diff --git a/data/dock-dark.svg b/data/dock-dark.svg
new file mode 100644
index 00000000..926cad01
--- /dev/null
+++ b/data/dock-dark.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg4729"
+   height="12"
+   width="54"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4731">
+    <linearGradient
+       id="linearGradient5063">
+      <stop
+         id="stop5055"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.19461967"
+         style="stop-color:#ffffff;stop-opacity:0.23529412;"
+         id="stop5057" />
+      <stop
+         id="stop5059"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         offset="0.95056331" />
+      <stop
+         id="stop5061"
+         style="stop-color:#ffffff;stop-opacity:0.39215687;"
+         offset="1" />
+    </linearGradient>
+    <filter
+       height="1.588"
+       y="-0.29400001"
+       width="1.1147317"
+       x="-0.057365855"
+       id="filter1523"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur1525"
+         stdDeviation="0.98" />
+    </filter>
+    <linearGradient
+       xlink:href="#linearGradient5063"
+       id="linearGradient5053"
+       x1="438.65228"
+       y1="466.57907"
+       x2="438.65228"
+       y2="473.27878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.98039219,0,0,0.9,-380.08409,-412.00433)" />
+  </defs>
+  <metadata
+     id="metadata4734">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="rect857"
+     d="M 52,12 V 8.56912 C 52,7.55867 51.37995,7 50.29324,7 H 2.67845 C 1.59174,7 1,7.61529 1,8.62574 V 12"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.975822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.502164;marker:none;enable-background:accumulate" />
+  <path
+     id="rect857-2"
+     d="M 52.5,11.9834 V 8.50064 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.745;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)"
+     d="M 7.5,3.001 C 6.66899,3.001 6,3.66999 6,4.501 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
+     id="rect1343" />
+  <path
+     id="rect857-0"
+     d="M 51.50002,12 V 8.91221 C 51.50002,8.0028 50.89212,7.5 49.82672,7.5 H 3.14556 C 2.08015,7.5 1.50001,8.05376 1.50001,8.96317 V 12"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5053);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     ry="1.0000445"
+     rx="1.0000445"
+     y="2.4999542"
+     x="6.499958"
+     height="7.0000782"
+     width="7.0000782"
+     id="rect863"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect869"
+     width="7.0000782"
+     height="7.0000782"
+     x="17.499958"
+     y="2.4999542"
+     rx="1.0000445"
+     ry="1.0000445" />
+  <rect
+     ry="1.0000445"
+     rx="1.0000445"
+     y="2.4999542"
+     x="39.499992"
+     height="7.0000782"
+     width="7.0000782"
+     id="rect875"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect881"
+     width="7.0000782"
+     height="7.0000782"
+     x="28.499989"
+     y="2.4999542"
+     rx="1.0000445"
+     ry="1.0000445" />
+  <rect
+     ry="0.85717142"
+     rx="0.85717142"
+     y="3.0000153"
+     x="6.9999886"
+     height="6"
+     width="6"
+     id="rect863-1"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     ry="0.85717142"
+     rx="0.85717142"
+     y="3.0000153"
+     x="17.999989"
+     height="6"
+     width="6"
+     id="rect863-1-8"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     ry="0.85717142"
+     rx="0.85717142"
+     y="3.0000153"
+     x="28.999989"
+     height="6"
+     width="6"
+     id="rect863-1-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     ry="0.85717142"
+     rx="0.85717142"
+     y="3.0000153"
+     x="39.999992"
+     height="6"
+     width="6"
+     id="rect863-1-8-5"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+</svg>
diff --git a/data/dock.svg b/data/dock.svg
new file mode 100644
index 00000000..521edaf4
--- /dev/null
+++ b/data/dock.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="54"
+   height="12"
+   id="svg4729"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4731">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter1523"
+       x="-0.057365855"
+       width="1.1147317"
+       y="-0.29400001"
+       height="1.588">
+      <feGaussianBlur
+         stdDeviation="0.98"
+         id="feGaussianBlur1525" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4734">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.945734;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 52,12 V 8.8239 C 52,7.81345 51.12517,7 50.03846,7 H 2.96154 C 1.87483,7 1,7.81345 1,8.8239 V 12"
+     id="rect857" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 52.5,11.9834 V 8.50064 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
+     id="rect857-2" />
+  <path
+     id="rect1343"
+     d="M 7.5,3.001 C 6.66899,3.001 6,3.66999 6,4.501 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
+     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect863"
+     width="7.0000782"
+     height="7.0000782"
+     x="6.499958"
+     y="2.4999542"
+     rx="1.0000445"
+     ry="1.0000445" />
+  <rect
+     ry="1.0000445"
+     rx="1.0000445"
+     y="2.4999542"
+     x="17.499958"
+     height="7.0000782"
+     width="7.0000782"
+     id="rect869"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect875"
+     width="7.0000782"
+     height="7.0000782"
+     x="39.499992"
+     y="2.4999542"
+     rx="1.0000445"
+     ry="1.0000445" />
+  <rect
+     ry="1.0000445"
+     rx="1.0000445"
+     y="2.4999542"
+     x="28.499989"
+     height="7.0000782"
+     width="7.0000782"
+     id="rect881"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect863-1"
+     width="6"
+     height="6"
+     x="6.9999886"
+     y="3.0000153"
+     rx="0.85717142"
+     ry="0.85717142" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect863-1-8"
+     width="6"
+     height="6"
+     x="17.999989"
+     y="3.0000153"
+     rx="0.85717142"
+     ry="0.85717142" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect863-1-4"
+     width="6"
+     height="6"
+     x="28.999989"
+     y="3.0000153"
+     rx="0.85717142"
+     ry="0.85717142" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.857066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect863-1-8-5"
+     width="6"
+     height="6"
+     x="39.999992"
+     y="3.0000153"
+     rx="0.85717142"
+     ry="0.85717142" />
+</svg>
diff --git a/data/notifications.gresource.xml b/data/notifications.gresource.xml
index ee63ceb8..57a66870 100644
--- a/data/notifications.gresource.xml
+++ b/data/notifications.gresource.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/settings/notifications">
-    <file alias="bubbles.svg" compressed="true">bubbles.svg</file>
-    <file alias="bubbles-dark.svg" compressed="true">bubbles-dark.svg</file>
-    <file alias="notify-center.svg" compressed="true">notify-center.svg</file>
-    <file alias="notify-center-dark.svg" compressed="true">notify-center-dark.svg</file>
-    <file alias="SettingsOption.css" compressed="true">SettingsOption.css</file>
-    <file alias="sounds.svg" compressed="true">sounds.svg</file>
-    <file alias="sounds-dark.svg" compressed="true">sounds-dark.svg</file>
+    <file compressed="true">bubble.svg</file>
+    <file compressed="true">bubble-dark.svg</file>
+    <file compressed="true">dock.svg</file>
+    <file compressed="true">dock-dark.svg</file>
+    <file compressed="true">notify-center.svg</file>
+    <file compressed="true">notify-center-dark.svg</file>
+    <file compressed="true">SettingsOption.css</file>
   </gresource>
 </gresources>
diff --git a/data/notify-center-dark.svg b/data/notify-center-dark.svg
index 0eb5a565..8f9c2a00 100644
--- a/data/notify-center-dark.svg
+++ b/data/notify-center-dark.svg
@@ -1,15 +1,15 @@
 <?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"
    version="1.1"
    id="svg4729"
-   height="80"
-   width="112">
+   height="55"
+   width="40"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4731">
     <linearGradient
@@ -66,7 +66,7 @@
        x2="14.447668"
        y1="6.6480026"
        x1="14.447668"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.104455)"
+       gradientTransform="matrix(2.6263817,0,0,0.43555485,-11.945112,10.104454)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1529"
        xlink:href="#linearGradient3924-4" />
@@ -104,7 +104,7 @@
     <filter
        style="color-interpolation-filters:sRGB"
        id="filter4818"
-       x="-0.026270478"
+       x="-0.026270477"
        width="1.052541"
        y="-0.022090762"
        height="1.0441815">
@@ -192,126 +192,37 @@
         <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>
-  <path
-     id="rect857"
-     d="M 80,80 V 76.56912 C 80,75.55867 79.37995,75 78.29324,75 H 30.67845 C 29.59174,75 29,75.61529 29,76.62574 V 80"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97582185;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50216447;marker:none;enable-background:accumulate" />
-  <path
-     id="rect857-2"
-     d="m 80.5,79.9834 v -3.48276 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.74500002;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <path
      id="path1027"
-     d="m 97.50003,12.499355 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 l -2.29297,2.70564 h -22 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.70564 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate" />
+     d="m 28.500008,9.4993539 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 l -2.29297,2.7056401 H 3.5000077 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 H 36.500008 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.7056401 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate" />
   <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.74500002;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="m 97.5,11.499425 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 L 94.5,14.500065 h -22 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.70564 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.745;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 28.499978,8.4994239 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 l -2.29297,2.7056401 H 3.4999777 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 H 36.499978 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.7056401 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
      id="rect845" />
   <path
-     d="m 97.49907,12.013015 c -0.12134,0 -0.24148,0.046 -0.33984,0.14257 l -2.26758,2.67579 a 0.51438915,0.51438915 0 0 1 -0.39258,0.18164 h -22 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 37 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 h 33 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -37 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 h -5 a 0.51438915,0.51438915 0 0 1 -0.39257,-0.18164 l -2.26758,-2.67579 c -0.0984,-0.0966 -0.21854,-0.14257 -0.33985,-0.14257 z"
+     d="m 28.499048,9.0130139 c -0.12134,0 -0.24148,0.046 -0.33984,0.14257 l -2.26758,2.6757901 a 0.51438915,0.51438915 0 0 1 -0.39258,0.18164 H 3.4990477 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 37 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 H 36.499048 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -37 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 h -5 a 0.51438915,0.51438915 0 0 1 -0.39257,-0.18164 l -2.26758,-2.6757901 c -0.0984,-0.0966 -0.21854,-0.14257 -0.33985,-0.14257 z"
      id="rect845-6"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97582185;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50216447;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.975822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.502164;marker:none;enable-background:accumulate" />
   <path
-     style="opacity:0.15;fill:none;stroke:url(#linearGradient1529);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 72.52489,15.500015 H 95 l 2.5,-2.99999 2.5,2.99999 h 5.46292 c 0.554,0 1.03707,0.446 1.03707,1 v 37.00001 c 0,0.554 -0.446,1 -1,1 h -33 c -0.554,0 -1,-0.446 -1,-1 v -37.00001 c 0,-0.554 0.4709,-1 1.0249,-1 z"
+     style="opacity:0.15;fill:none;stroke:url(#linearGradient1529);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 3.5248677,12.500014 H 25.999978 l 2.5,-2.9999901 2.5,2.9999901 h 5.46292 c 0.554,0 1.03707,0.446 1.03707,1 v 37.00001 c 0,0.554 -0.446,1 -1,1 H 3.4999677 c -0.554,0 -1,-0.446 -1,-1 v -37.00001 c 0,-0.554 0.4709,-1 1.0249,-1 z"
      id="rect1527" />
-  <path
-     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)"
-     d="m 35.5,71.001 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
-     id="rect1343" />
-  <path
-     id="rect857-0"
-     d="M 79.50002,80 V 76.91221 C 79.50002,76.0028 78.89212,75.5 77.82672,75.5 H 31.14556 c -1.06541,0 -1.64555,0.55376 -1.64555,1.46317 V 80"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5053);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="34.499958"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect863"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect869"
-     width="7.0000782"
-     height="7.0000782"
-     x="45.499958"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="67.499992"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect875"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect881"
-     width="7.0000782"
-     height="7.0000782"
-     x="56.499989"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="34.999989"
-     height="6"
-     width="6"
-     id="rect863-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="45.999989"
-     height="6"
-     width="6"
-     id="rect863-1-8"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="56.999989"
-     height="6"
-     width="6"
-     id="rect863-1-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="67.999992"
-     height="6"
-     width="6"
-     id="rect863-1-8-5"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <g
-     style="color:#bebebe;fill:#abacae;stroke-width:2.41666675"
-     transform="matrix(0.4137931,0,0,0.4137931,-27.03689,89.90069)"
+     style="color:#bebebe;fill:#abacae;stroke-width:2.41667"
+     transform="matrix(0.4137931,0,0,0.4137931,-96.036912,86.900689)"
      id="g5339">
     <path
        d="m 301,-210.01 a 1,1 0 0 0 -1,1 v 0.01 c -1.764,0.456 -2.998,2.168 -3,3.99 0,0 0,5 -1.66,5.622 -0.016,0.01 -0.023,0.03 -0.04,0.043 a 0.726,0.726 0 0 0 -0.161,0.175 c -0.018,0.027 -0.039,0.048 -0.053,0.077 a 0.738,0.738 0 0 0 -0.086,0.334 c 0,0.415 0.335,0.75 0.75,0.75 h 10.5 c 0.416,0 0.75,-0.335 0.75,-0.75 a 0.738,0.738 0 0 0 -0.086,-0.334 c -0.014,-0.03 -0.035,-0.05 -0.052,-0.077 a 0.725,0.725 0 0 0 -0.162,-0.175 c -0.016,-0.012 -0.023,-0.033 -0.04,-0.043 -1.66,-0.622 -1.66,-5.622 -1.66,-5.622 -0.002,-1.822 -1.235,-3.534 -3,-3.99 v -0.01 a 1,1 0 0 0 -1,-1 z m -1.933,13 a 2,2 0 0 0 1.933,1.5 2,2 0 0 0 1.936,-1.5 z"
        overflow="visible"
-       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41666675;marker:none"
+       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41667;marker:none"
        id="path5337" />
   </g>
   <path
      id="rect4584"
-     d="M 77 19 C 75.892 19 75 19.892 75 21 L 75 23 C 75 24.108 75.892 25 77 25 L 79 25 C 80.108 25 81 24.108 81 23 L 81 21 C 81 19.892 80.108 19 79 19 L 77 19 z M 83.5 20 C 83.223 20 83 20.223 83 20.5 C 83 20.777 83.223 21 83.5 21 L 99.5 21 C 99.777 21 100 20.777 100 20.5 C 100 20.223 99.777 20 99.5 20 L 83.5 20 z M 83.5 23 C 83.222996 23 83 23.222996 83 23.5 C 83 23.777004 83.222996 24 83.5 24 L 94.5 24 C 94.777004 24 95 23.777004 95 23.5 C 95 23.222996 94.777004 23 94.5 23 L 83.5 23 z M 77 28 C 75.892 28 75 28.892 75 30 L 75 32 C 75 33.108 75.892 34 77 34 L 79 34 C 80.108 34 81 33.108 81 32 L 81 30 C 81 28.892 80.108 28 79 28 L 77 28 z M 83.5 29 C 83.223 29 83 29.223 83 29.5 C 83 29.777 83.223 30 83.5 30 L 93.5 30 C 93.777 30 94 29.777 94 29.5 C 94 29.223 93.777 29 93.5 29 L 83.5 29 z M 83.5 32 C 83.222996 32 83 32.222996 83 32.5 C 83 32.777004 83.222996 33 83.5 33 L 101.5 33 C 101.777 33 102 32.777004 102 32.5 C 102 32.222996 101.777 32 101.5 32 L 83.5 32 z M 77 37 C 75.892 37 75 37.892 75 39 L 75 41 C 75 42.108 75.892 43 77 43 L 79 43 C 80.108 43 81 42.108 81 41 L 81 39 C 81 37.892 80.108 37 79 37 L 77 37 z M 83.5 38 C 83.223 38 83 38.223 83 38.5 C 83 38.777 83.223 39 83.5 39 L 96.5 39 C 96.777 39 97 38.777 97 38.5 C 97 38.223 96.777 38 96.5 38 L 83.5 38 z M 83.5 41 C 83.222996 41 83 41.222996 83 41.5 C 83 41.777004 83.222996 42 83.5 42 L 89.5 42 C 89.777004 42 90 41.777004 90 41.5 C 90 41.222996 89.777004 41 89.5 41 L 83.5 41 z M 77 46 C 75.892 46 75 46.892 75 48 L 75 50 C 75 51.108 75.892 52 77 52 L 79 52 C 80.108 52 81 51.108 81 50 L 81 48 C 81 46.892 80.108 46 79 46 L 77 46 z M 83.5 47 C 83.223 47 83 47.223 83 47.5 C 83 47.777 83.223 48 83.5 48 L 99.5 48 C 99.777 48 100 47.777 100 47.5 C 100 47.223 99.777 47 99.5 47 L 83.5 47 z M 83.5 50 C 83.222996 50 83 50.222996 83 50.5 C 83 50.777004 83.222996 51 83.5 51 L 103.5 51 C 103.777 51 104 50.777004 104 50.5 C 104 50.222996 103.777 50 103.5 50 L 83.5 50 z "
+     d="m 7.9999777,15.999999 c -1.108,0 -2,0.892 -2,2 v 2 c 0,1.108 0.892,2 2,2 h 2 c 1.1080003,0 2.0000003,-0.892 2.0000003,-2 v -2 c 0,-1.108 -0.892,-2 -2.0000003,-2 z m 6.5000003,1 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 16 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,3 c -0.277004,0 -0.5,0.222996 -0.5,0.5 0,0.277004 0.222996,0.5 0.5,0.5 h 11 c 0.277004,0 0.5,-0.222996 0.5,-0.5 0,-0.277004 -0.222996,-0.5 -0.5,-0.5 z m -6.5000003,5 c -1.108,0 -2,0.892 -2,2 v 2 c 0,1.108 0.892,2 2,2 h 2 c 1.1080003,0 2.0000003,-0.892 2.0000003,-2 v -2 c 0,-1.108 -0.892,-2 -2.0000003,-2 z m 6.5000003,1 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 10 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,3 c -0.277004,0 -0.5,0.222996 -0.5,0.5 0,0.277004 0.222996,0.5 0.5,0.5 h 18 c 0.277,0 0.5,-0.222996 0.5,-0.5 0,-0.277004 -0.223,-0.5 -0.5,-0.5 z m -6.5000003,5 c -1.108,0 -2,0.892 -2,2 v 2 c 0,1.108 0.892,2 2,2 h 2 c 1.1080003,0 2.0000003,-0.892 2.0000003,-2 v -2 c 0,-1.108 -0.892,-2 -2.0000003,-2 z m 6.5000003,1 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 13 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,3 c -0.277004,0 -0.5,0.222996 -0.5,0.5 0,0.277004 0.222996,0.5 0.5,0.5 h 6 c 0.277004,0 0.5,-0.222996 0.5,-0.5 0,-0.277004 -0.222996,-0.5 -0.5,-0.5 z m -6.5000003,5 c -1.108,0 -2,0.892 -2,2 v 2 c 0,1.108 0.892,2 2,2 h 2 c 1.1080003,0 2.0000003,-0.892 2.0000003,-2 v -2 c 0,-1.108 -0.892,-2 -2.0000003,-2 z m 6.5000003,1 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 16 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,3 c -0.277004,0 -0.5,0.222996 -0.5,0.5 0,0.277004 0.222996,0.5 0.5,0.5 h 20 c 0.277,0 0.5,-0.222996 0.5,-0.5 0,-0.277004 -0.223,-0.5 -0.5,-0.5 z"
      style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;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;enable-background:accumulate" />
 </svg>
diff --git a/data/notify-center.svg b/data/notify-center.svg
index 0ab18988..eaf34880 100644
--- a/data/notify-center.svg
+++ b/data/notify-center.svg
@@ -1,15 +1,15 @@
 <?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"
    version="1.1"
    id="svg4729"
-   height="80"
-   width="112">
+   height="55"
+   width="40"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4731">
     <linearGradient
@@ -31,30 +31,19 @@
          style="stop-color:#ffffff;stop-opacity:0.39215687;"
          id="stop3932-25" />
     </linearGradient>
-    <filter
-       height="1.5880001"
-       y="-0.294"
-       width="1.1147317"
-       x="-0.057365853"
-       id="filter1523"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur1525"
-         stdDeviation="0.98" />
-    </filter>
     <linearGradient
        y2="93.893044"
        x2="14.447668"
        y1="6.6480026"
        x1="14.447668"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.10443)"
+       gradientTransform="matrix(2.6263817,0,0,0.43555485,-11.945112,10.104429)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1529"
        xlink:href="#linearGradient3924-4" />
     <filter
        style="color-interpolation-filters:sRGB"
        id="filter4818"
-       x="-0.026270478"
+       x="-0.026270477"
        width="1.052541"
        y="-0.022090762"
        height="1.0441815">
@@ -71,125 +60,40 @@
         <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>
-  <path
-     id="rect857"
-     d="M 80,80 V 76.8239 C 80,75.81345 79.12517,75 78.03846,75 H 30.96154 C 29.87483,75 29,75.81345 29,76.8239 V 80"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.94573361;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     id="rect857-2"
-     d="m 80.5,79.9834 v -3.48276 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <path
      id="path1027"
-     d="m 97.50003,12.49933 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 l -2.29297,2.70564 h -22 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.70564 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate" />
+     d="m 28.500008,9.4993289 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 l -2.29297,2.7056401 H 3.5000077 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 H 36.500008 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.7056401 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4818);enable-background:accumulate" />
   <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="m 97.5,11.4994 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 L 94.5,14.50004 h -22 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 h 33 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 L 98.20703,11.7944 C 98.01116,11.59853 97.75562,11.4994 97.5,11.4994 Z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 28.499978,8.4993989 c -0.25562,0 -0.51116,0.0991 -0.70703,0.295 l -2.29297,2.7056401 H 3.4999777 c -1.108,0 -2,0.892 -2,2 v 37 c 0,1.108 0.892,2 2,2 H 36.499978 c 1.108,0 2,-0.892 2,-2 v -37 c 0,-1.108 -0.892,-2 -2,-2 h -5 l -2.29297,-2.7056401 c -0.19587,-0.19587 -0.45141,-0.295 -0.70703,-0.295 z"
      id="rect845" />
   <path
-     d="m 97.49907,12.01299 c -0.12134,0 -0.24148,0.046 -0.33984,0.14257 l -2.26758,2.67579 a 0.51438915,0.51438915 0 0 1 -0.39258,0.18164 h -22 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 37 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 h 33 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -37 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 h -5 a 0.51438915,0.51438915 0 0 1 -0.39257,-0.18164 l -2.26758,-2.67579 c -0.0984,-0.0966 -0.21854,-0.14257 -0.33985,-0.14257 z"
+     d="m 28.499048,9.0129889 c -0.12134,0 -0.24148,0.046 -0.33984,0.14257 l -2.26758,2.6757901 a 0.51438915,0.51438915 0 0 1 -0.39258,0.18164 H 3.4990477 c -0.83195,0 -1.48632,0.65437 -1.48632,1.48632 v 37 c 0,0.83196 0.65437,1.48633 1.48632,1.48633 H 36.499048 c 0.83196,0 1.48633,-0.65437 1.48633,-1.48633 v -37 c 0,-0.83195 -0.65437,-1.48632 -1.48633,-1.48632 h -5 a 0.51438915,0.51438915 0 0 1 -0.39257,-0.18164 l -2.26758,-2.6757901 c -0.0984,-0.0966 -0.21854,-0.14257 -0.33985,-0.14257 z"
      id="rect845-6"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <path
-     style="opacity:1;fill:none;stroke:url(#linearGradient1529);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 72.52489,15.49999 H 95 L 97.5,12.5 100,15.49999 h 5.46292 c 0.554,0 1.03707,0.446 1.03707,1 V 53.5 c 0,0.554 -0.446,1 -1,1 h -33 c -0.554,0 -1,-0.446 -1,-1 V 16.49999 c 0,-0.554 0.4709,-1 1.0249,-1 z"
+     style="opacity:1;fill:none;stroke:url(#linearGradient1529);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 3.5248677,12.499989 H 25.999978 l 2.5,-2.9999901 2.5,2.9999901 h 5.46292 c 0.554,0 1.03707,0.446 1.03707,1 v 37.00001 c 0,0.554 -0.446,1 -1,1 H 3.4999677 c -0.554,0 -1,-0.446 -1,-1 v -37.00001 c 0,-0.554 0.4709,-1 1.0249,-1 z"
      id="rect1527" />
-  <path
-     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)"
-     d="m 35.5,71.001 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
-     id="rect1343" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="34.499958"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect863"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect869"
-     width="7.0000782"
-     height="7.0000782"
-     x="45.499958"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="67.499992"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect875"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect881"
-     width="7.0000782"
-     height="7.0000782"
-     x="56.499989"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="34.999989"
-     height="6"
-     width="6"
-     id="rect863-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="45.999989"
-     height="6"
-     width="6"
-     id="rect863-1-8"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="56.999989"
-     height="6"
-     width="6"
-     id="rect863-1-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="67.999992"
-     height="6"
-     width="6"
-     id="rect863-1-8-5"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <g
-     style="color:#bebebe;fill:#abacae;stroke-width:2.41666675"
-     transform="matrix(0.4137931,0,0,0.4137931,-27.03689,89.90069)"
+     style="color:#bebebe;fill:#abacae;stroke-width:2.41667"
+     transform="matrix(0.4137931,0,0,0.4137931,-96.036912,86.900689)"
      id="g5339">
     <path
        d="m 301,-210.01 a 1,1 0 0 0 -1,1 v 0.01 c -1.764,0.456 -2.998,2.168 -3,3.99 0,0 0,5 -1.66,5.622 -0.016,0.01 -0.023,0.03 -0.04,0.043 a 0.726,0.726 0 0 0 -0.161,0.175 c -0.018,0.027 -0.039,0.048 -0.053,0.077 a 0.738,0.738 0 0 0 -0.086,0.334 c 0,0.415 0.335,0.75 0.75,0.75 h 10.5 c 0.416,0 0.75,-0.335 0.75,-0.75 a 0.738,0.738 0 0 0 -0.086,-0.334 c -0.014,-0.03 -0.035,-0.05 -0.052,-0.077 a 0.725,0.725 0 0 0 -0.162,-0.175 c -0.016,-0.012 -0.023,-0.033 -0.04,-0.043 -1.66,-0.622 -1.66,-5.622 -1.66,-5.622 -0.002,-1.822 -1.235,-3.534 -3,-3.99 v -0.01 a 1,1 0 0 0 -1,-1 z m -1.933,13 a 2,2 0 0 0 1.933,1.5 2,2 0 0 0 1.936,-1.5 z"
        overflow="visible"
-       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41666675;marker:none"
+       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41667;marker:none"
        id="path5337" />
   </g>
   <rect
      ry="2"
      rx="2"
-     y="18.999987"
-     x="75"
+     y="15.999986"
+     x="5.9999776"
      height="6.0000134"
      width="6.0000134"
      id="rect4584"
@@ -197,8 +101,8 @@
   <rect
      ry="0.50000668"
      rx="0.50000668"
-     y="22.999987"
-     x="83"
+     y="19.999985"
+     x="13.999978"
      height="1.0000134"
      width="12"
      id="rect4584-9"
@@ -206,17 +110,17 @@
   <rect
      ry="0.5"
      rx="0.5"
-     y="19.999987"
-     x="83"
+     y="16.999985"
+     x="13.999978"
      height="1"
      width="17"
      id="rect4584-9-0"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;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;enable-background:accumulate" />
   <rect
      ry="2"
      rx="2"
-     y="27.999987"
-     x="75"
+     y="24.999985"
+     x="5.9999776"
      height="6.0000134"
      width="6.0000134"
      id="rect4584-7"
@@ -224,26 +128,26 @@
   <rect
      ry="0.50000668"
      rx="0.50000668"
-     y="31.999985"
-     x="83"
+     y="28.999983"
+     x="13.999978"
      height="1.0000134"
      width="19"
      id="rect4584-9-5"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;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;enable-background:accumulate" />
   <rect
      ry="0.5"
      rx="0.49999997"
-     y="28.999987"
-     x="83"
+     y="25.999985"
+     x="13.999978"
      height="1"
      width="11"
      id="rect4584-9-0-3"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;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;enable-background:accumulate" />
   <rect
      ry="2"
      rx="2"
-     y="36.999985"
-     x="75"
+     y="33.999985"
+     x="5.9999776"
      height="6.0000134"
      width="6.0000134"
      id="rect4584-7-5"
@@ -251,8 +155,8 @@
   <rect
      ry="0.50000668"
      rx="0.50000668"
-     y="40.999985"
-     x="83"
+     y="37.999985"
+     x="13.999978"
      height="1.0000134"
      width="7"
      id="rect4584-9-5-6"
@@ -260,17 +164,17 @@
   <rect
      ry="0.5"
      rx="0.5"
-     y="37.999985"
-     x="83"
+     y="34.999985"
+     x="13.999978"
      height="1"
      width="14"
      id="rect4584-9-0-3-2"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;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;enable-background:accumulate" />
   <rect
      ry="2"
      rx="2"
-     y="45.999985"
-     x="75"
+     y="42.999985"
+     x="5.9999776"
      height="6.0000134"
      width="6.0000134"
      id="rect4584-7-5-9"
@@ -278,8 +182,8 @@
   <rect
      ry="0.50000668"
      rx="0.50000668"
-     y="49.999985"
-     x="83"
+     y="46.999985"
+     x="13.999978"
      height="1.0000134"
      width="21"
      id="rect4584-9-5-6-1"
@@ -287,10 +191,10 @@
   <rect
      ry="0.5"
      rx="0.5"
-     y="46.999985"
-     x="83"
+     y="43.999985"
+     x="13.999978"
      height="1"
      width="17"
      id="rect4584-9-0-3-2-2"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#abacae;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;enable-background:accumulate" />
 </svg>
diff --git a/data/screenshot.png b/data/screenshot.png
index 9696c662..630ad61e 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/data/sounds-dark.svg b/data/sounds-dark.svg
deleted file mode 100644
index 089c483b..00000000
--- a/data/sounds-dark.svg
+++ /dev/null
@@ -1,341 +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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg4729"
-   height="80"
-   width="112"
-   sodipodi:docname="sounds-dark.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3200"
-     inkscape:window-height="1678"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="2.95"
-     inkscape:cx="66.169492"
-     inkscape:cy="36.779661"
-     inkscape:window-x="0"
-     inkscape:window-y="60"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4729" />
-  <defs
-     id="defs4731">
-    <linearGradient
-       id="linearGradient5063">
-      <stop
-         id="stop5055"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.19461967"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop5057" />
-      <stop
-         id="stop5059"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.95056331" />
-      <stop
-         id="stop5061"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3924-4">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         id="stop3926-8" />
-      <stop
-         id="stop3928-5"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         offset="0.06316455" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         id="stop3930-6-4" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         id="stop3932-25" />
-    </linearGradient>
-    <filter
-       height="1.5880001"
-       y="-0.294"
-       width="1.1147317"
-       x="-0.057365853"
-       id="filter1523"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur1525"
-         stdDeviation="0.98" />
-    </filter>
-    <linearGradient
-       y2="93.893044"
-       x2="14.447668"
-       y1="6.6480026"
-       x1="14.447668"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.104455)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1529"
-       xlink:href="#linearGradient3924-4" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4733-6"
-       x="-0.07082355"
-       width="1.1416471"
-       y="-0.10319996"
-       height="1.2063999">
-      <feGaussianBlur
-         stdDeviation="1.5050028"
-         id="feGaussianBlur4735-2" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4700-6"
-       x="-0.03035295"
-       width="1.0607059"
-       y="-0.044228554"
-       height="1.0884571">
-      <feGaussianBlur
-         stdDeviation="0.6450012"
-         id="feGaussianBlur4702-1" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient4798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
-       x1="14.066927"
-       y1="6.6480942"
-       x2="14.066927"
-       y2="80.117599" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4818"
-       x="-0.026270478"
-       width="1.052541"
-       y="-0.022090762"
-       height="1.0441815">
-      <feGaussianBlur
-         stdDeviation="0.4050032"
-         id="feGaussianBlur4820" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient5063"
-       id="linearGradient5053"
-       x1="438.65228"
-       y1="466.57907"
-       x2="438.65228"
-       y2="473.27878"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98039219,0,0,0.9,-352.08409,-344.00433)" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4733-3"
-       x="-0.07082355"
-       width="1.1416471"
-       y="-0.10319996"
-       height="1.2063999">
-      <feGaussianBlur
-         stdDeviation="1.5050028"
-         id="feGaussianBlur4735-6" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4700-7"
-       x="-0.03035295"
-       width="1.0607059"
-       y="-0.044228554"
-       height="1.0884571">
-      <feGaussianBlur
-         stdDeviation="0.6450012"
-         id="feGaussianBlur4702-5" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient923"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
-       x1="14.066927"
-       y1="6.6480942"
-       x2="14.066927"
-       y2="80.117599" />
-    <filter
-       height="1.0441815"
-       y="-0.022090763"
-       width="1.052541"
-       x="-0.026270477"
-       id="filter4818-3"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4820-6"
-         stdDeviation="0.4050032" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient1529-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.10443)"
-       x1="14.447668"
-       y1="6.6480026"
-       x2="14.447668"
-       y2="93.893044" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter1523-2"
-       x="-0.057365853"
-       width="1.1147317"
-       y="-0.294"
-       height="1.5880001">
-      <feGaussianBlur
-         stdDeviation="0.98"
-         id="feGaussianBlur1525-9" />
-    </filter>
-  </defs>
-  <metadata
-     id="metadata4734">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     id="rect857"
-     d="M 80,80 V 76.56912 C 80,75.55867 79.37995,75 78.29324,75 H 30.67845 C 29.59174,75 29,75.61529 29,76.62574 V 80"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97582185;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50216447;marker:none;enable-background:accumulate" />
-  <path
-     id="rect857-2"
-     d="m 80.5,79.9834 v -3.48276 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.74500002;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)"
-     d="m 35.5,71.001 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
-     id="rect1343" />
-  <path
-     id="rect857-0"
-     d="M 79.50002,80 V 76.91221 C 79.50002,76.0028 78.89212,75.5 77.82672,75.5 H 31.14556 c -1.06541,0 -1.64555,0.55376 -1.64555,1.46317 V 80"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5053);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="34.499958"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect863"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect869"
-     width="7.0000782"
-     height="7.0000782"
-     x="45.499958"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="67.499992"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect875"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect881"
-     width="7.0000782"
-     height="7.0000782"
-     x="56.499989"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="34.999989"
-     height="6"
-     width="6"
-     id="rect863-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="45.999989"
-     height="6"
-     width="6"
-     id="rect863-1-8"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="56.999989"
-     height="6"
-     width="6"
-     id="rect863-1-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     ry="0.85717142"
-     rx="0.85717142"
-     y="71.000015"
-     x="67.999992"
-     height="6"
-     width="6"
-     id="rect863-1-8-5"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <g
-     style="color:#bebebe;fill:#abacae;stroke-width:2.41666675"
-     transform="matrix(0.4137931,0,0,0.4137931,-27.03689,89.90069)"
-     id="g5339">
-    <path
-       d="m 301,-210.01 a 1,1 0 0 0 -1,1 v 0.01 c -1.764,0.456 -2.998,2.168 -3,3.99 0,0 0,5 -1.66,5.622 -0.016,0.01 -0.023,0.03 -0.04,0.043 a 0.726,0.726 0 0 0 -0.161,0.175 c -0.018,0.027 -0.039,0.048 -0.053,0.077 a 0.738,0.738 0 0 0 -0.086,0.334 c 0,0.415 0.335,0.75 0.75,0.75 h 10.5 c 0.416,0 0.75,-0.335 0.75,-0.75 a 0.738,0.738 0 0 0 -0.086,-0.334 c -0.014,-0.03 -0.035,-0.05 -0.052,-0.077 a 0.725,0.725 0 0 0 -0.162,-0.175 c -0.016,-0.012 -0.023,-0.033 -0.04,-0.043 -1.66,-0.622 -1.66,-5.622 -1.66,-5.622 -0.002,-1.822 -1.235,-3.534 -3,-3.99 v -0.01 a 1,1 0 0 0 -1,-1 z m -1.933,13 a 2,2 0 0 0 1.933,1.5 2,2 0 0 0 1.936,-1.5 z"
-       overflow="visible"
-       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41666675;marker:none"
-       id="path5337" />
-  </g>
-  <g
-     style="color:#bebebe;opacity:1;vector-effect:none;fill:#d4d5d6;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-     transform="matrix(2,0,0,2,-505,605.75)"
-     id="g8">
-    <path
-       d="m 288,-283 c 0,-3.225 -1.204,-5.982 -2.946,-7.25 l -1.155,1.04 c 1.5,1.062 2.542,3.453 2.542,6.21 0,2.757 -1.042,5.148 -2.542,6.21 l 1.155,1.04 c 1.742,-1.268 2.946,-4.025 2.946,-7.25 z"
-       overflow="visible"
-       style="overflow:visible;vector-effect:none;fill:#d4d5d6;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       id="path2" />
-    <path
-       d="m 284.939,-283 c 0,-2.18 -0.829,-4.085 -2.08,-5.285 l -1.068,0.953 c 0.965,1.026 1.588,2.582 1.588,4.332 0,1.75 -0.623,3.306 -1.588,4.332 l 1.068,0.953 c 1.251,-1.2 2.08,-3.104 2.08,-5.285 z"
-       overflow="visible"
-       style="overflow:visible;vector-effect:none;fill:#d4d5d6;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       id="path4" />
-    <path
-       d="m 281.993,-283 c 0,-1.326 -0.44,-2.542 -1.155,-3.495 l -1.098,0.982 a 4.9,4.9 0 0 1 0,5.026 l 1.098,0.982 A 5.813,5.813 0 0 0 281.993,-283 Z M 273,-285 v 4 h 1.652 l 3.348,3.37 v -10.74 l -3.348,3.37 z"
-       overflow="visible"
-       style="overflow:visible;vector-effect:none;fill:#d4d5d6;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       id="path6" />
-  </g>
-</svg>
diff --git a/data/sounds.svg b/data/sounds.svg
deleted file mode 100644
index aef83256..00000000
--- a/data/sounds.svg
+++ /dev/null
@@ -1,278 +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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="112"
-   height="80"
-   id="svg4729"
-   version="1.1"
-   sodipodi:docname="sounds.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3200"
-     inkscape:window-height="1678"
-     id="namedview42"
-     showgrid="false"
-     inkscape:zoom="2.95"
-     inkscape:cx="66.169492"
-     inkscape:cy="36.779661"
-     inkscape:window-x="0"
-     inkscape:window-y="60"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4729" />
-  <defs
-     id="defs4731">
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient9678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
-       x1="14.066927"
-       y1="6.6480942"
-       x2="14.066927"
-       y2="80.117599" />
-    <linearGradient
-       id="linearGradient3924-4">
-      <stop
-         id="stop3926-8"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.06316455"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop3928-5" />
-      <stop
-         id="stop3930-6-4"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.95056331" />
-      <stop
-         id="stop3932-25"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter1523"
-       x="-0.057365853"
-       width="1.1147317"
-       y="-0.294"
-       height="1.5880001">
-      <feGaussianBlur
-         stdDeviation="0.98"
-         id="feGaussianBlur1525" />
-    </filter>
-    <linearGradient
-       xlink:href="#linearGradient3924-4"
-       id="linearGradient1529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,57.05491,13.10443)"
-       x1="14.447668"
-       y1="6.6480026"
-       x2="14.447668"
-       y2="24.827114" />
-    <filter
-       height="1.0884571"
-       y="-0.044228553"
-       width="1.0607059"
-       x="-0.03035295"
-       id="filter4700"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4702"
-         stdDeviation="0.6450012" />
-    </filter>
-    <filter
-       height="1.2063999"
-       y="-0.10319996"
-       width="1.1416471"
-       x="-0.07082355"
-       id="filter4733"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4735"
-         stdDeviation="1.5050028" />
-    </filter>
-    <filter
-       height="1.2063999"
-       y="-0.10319996"
-       width="1.1416471"
-       x="-0.07082355"
-       id="filter4733-6"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4735-2"
-         stdDeviation="1.5050028" />
-    </filter>
-    <filter
-       height="1.0884571"
-       y="-0.044228554"
-       width="1.0607059"
-       x="-0.03035295"
-       id="filter4700-6"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4702-1"
-         stdDeviation="0.6450012" />
-    </filter>
-    <linearGradient
-       y2="80.117599"
-       x2="14.066927"
-       y1="6.6480942"
-       x1="14.066927"
-       gradientTransform="matrix(2.6263817,0,0,0.43555485,351.27065,412.22031)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4798"
-       xlink:href="#linearGradient3924-4" />
-    <filter
-       height="1.0441815"
-       y="-0.022090762"
-       width="1.052541"
-       x="-0.026270478"
-       id="filter4818"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4820"
-         stdDeviation="0.4050032" />
-    </filter>
-  </defs>
-  <metadata
-     id="metadata4734">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.95;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.94573361;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="M 80,80 V 76.8239 C 80,75.81345 79.12517,75 78.03846,75 H 30.96154 C 29.87483,75 29,75.81345 29,76.8239 V 80"
-     id="rect857" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     d="m 80.5,79.9834 v -3.48276 c 0,-1.10801 -0.89199,-2 -2,-2 h -48 c -1.10801,0 -2,0.89199 -2,2 v 3.48276"
-     id="rect857-2" />
-  <path
-     id="rect1343"
-     d="m 35.5,71.001 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z m 11,0 c -0.83101,0 -1.5,0.66899 -1.5,1.5 v 5 c 0,0.83101 0.66899,1.5 1.5,1.5 h 5 c 0.83101,0 1.5,-0.66899 1.5,-1.5 v -5 c 0,-0.83101 -0.66899,-1.5 -1.5,-1.5 z"
-     style="opacity:0.1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;filter:url(#filter1523)" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863"
-     width="7.0000782"
-     height="7.0000782"
-     x="34.499958"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="45.499958"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect869"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect875"
-     width="7.0000782"
-     height="7.0000782"
-     x="67.499992"
-     y="70.499954"
-     rx="1.0000445"
-     ry="1.0000445" />
-  <rect
-     ry="1.0000445"
-     rx="1.0000445"
-     y="70.499954"
-     x="56.499989"
-     height="7.0000782"
-     width="7.0000782"
-     id="rect881"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1"
-     width="6"
-     height="6"
-     x="34.999989"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1-8"
-     width="6"
-     height="6"
-     x="45.999989"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1-4"
-     width="6"
-     height="6"
-     x="56.999989"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85706621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect863-1-8-5"
-     width="6"
-     height="6"
-     x="67.999992"
-     y="71.000015"
-     rx="0.85717142"
-     ry="0.85717142" />
-  <g
-     id="g5339"
-     transform="matrix(0.4137931,0,0,0.4137931,-27.03689,89.90069)"
-     style="color:#bebebe;fill:#abacae;stroke-width:2.41666675">
-    <path
-       id="path5337"
-       style="overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#abacae;stroke-width:2.41666675;marker:none"
-       overflow="visible"
-       d="m 301,-210.01 a 1,1 0 0 0 -1,1 v 0.01 c -1.764,0.456 -2.998,2.168 -3,3.99 0,0 0,5 -1.66,5.622 -0.016,0.01 -0.023,0.03 -0.04,0.043 a 0.726,0.726 0 0 0 -0.161,0.175 c -0.018,0.027 -0.039,0.048 -0.053,0.077 a 0.738,0.738 0 0 0 -0.086,0.334 c 0,0.415 0.335,0.75 0.75,0.75 h 10.5 c 0.416,0 0.75,-0.335 0.75,-0.75 a 0.738,0.738 0 0 0 -0.086,-0.334 c -0.014,-0.03 -0.035,-0.05 -0.052,-0.077 a 0.725,0.725 0 0 0 -0.162,-0.175 c -0.016,-0.012 -0.023,-0.033 -0.04,-0.043 -1.66,-0.622 -1.66,-5.622 -1.66,-5.622 -0.002,-1.822 -1.235,-3.534 -3,-3.99 v -0.01 a 1,1 0 0 0 -1,-1 z m -1.933,13 a 2,2 0 0 0 1.933,1.5 2,2 0 0 0 1.936,-1.5 z" />
-  </g>
-  <g
-     id="g8"
-     transform="matrix(2,0,0,2,-505,605.75)"
-     style="color:#bebebe;opacity:1;vector-effect:none;fill:#838487;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none">
-    <path
-       id="path2"
-       style="overflow:visible;vector-effect:none;fill:#838487;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       overflow="visible"
-       d="m 288,-283 c 0,-3.225 -1.204,-5.982 -2.946,-7.25 l -1.155,1.04 c 1.5,1.062 2.542,3.453 2.542,6.21 0,2.757 -1.042,5.148 -2.542,6.21 l 1.155,1.04 c 1.742,-1.268 2.946,-4.025 2.946,-7.25 z" />
-    <path
-       id="path4"
-       style="overflow:visible;vector-effect:none;fill:#838487;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       overflow="visible"
-       d="m 284.939,-283 c 0,-2.18 -0.829,-4.085 -2.08,-5.285 l -1.068,0.953 c 0.965,1.026 1.588,2.582 1.588,4.332 0,1.75 -0.623,3.306 -1.588,4.332 l 1.068,0.953 c 1.251,-1.2 2.08,-3.104 2.08,-5.285 z" />
-    <path
-       id="path6"
-       style="overflow:visible;vector-effect:none;fill:#838487;fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       overflow="visible"
-       d="m 281.993,-283 c 0,-1.326 -0.44,-2.542 -1.155,-3.495 l -1.098,0.982 a 4.9,4.9 0 0 1 0,5.026 l 1.098,0.982 A 5.813,5.813 0 0 0 281.993,-283 Z M 273,-285 v 4 h 1.652 l 3.348,3.37 v -10.74 l -3.348,3.37 z" />
-  </g>
-</svg>
diff --git a/src/Widgets/AppSettingsView.vala b/src/Widgets/AppSettingsView.vala
index 035eca84..bc044d77 100644
--- a/src/Widgets/AppSettingsView.vala
+++ b/src/Widgets/AppSettingsView.vala
@@ -22,34 +22,39 @@ public class Widgets.AppSettingsView : Switchboard.SettingsPage {
     private SettingsOption sound_option;
     private SettingsOption remember_option;
 
+    static construct {
+        var css_provider = new Gtk.CssProvider ();
+        css_provider.load_from_resource ("/io/elementary/settings/notifications/SettingsOption.css");
+
+        Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
     construct {
         bubbles_option = new SettingsOption (
             "bubbles",
             _("Bubbles"),
-            _("Bubbles appear in the top right corner of the display and disappear automatically."),
-            new Gtk.Switch ()
+            _("Bubbles appear in the top right corner of the display and disappear automatically.")
         );
 
         sound_option = new SettingsOption (
             "sounds",
             _("Sounds"),
-            _("Sounds play once when a new notification arrives."),
-            new Gtk.Switch ()
+            _("Sounds play once when a new notification arrives.")
         );
 
         remember_option = new SettingsOption (
             "notify-center",
             _("Notification Center"),
-            _("Show missed notifications in Notification Center."),
-            new Gtk.Switch ()
+            _("Show missed notifications in Notification Center.")
         );
 
-        var box = new Gtk.Box (VERTICAL, 32);
+        var box = new Gtk.Box (VERTICAL, 24);
         box.append (bubbles_option);
         box.append (sound_option);
         box.append (remember_option);
 
         child = box;
+        add_css_class ("notifications");
 
         update_selected_app ();
 
diff --git a/src/Widgets/SettingsOption.vala b/src/Widgets/SettingsOption.vala
index 936683ff..9e23a677 100644
--- a/src/Widgets/SettingsOption.vala
+++ b/src/Widgets/SettingsOption.vala
@@ -21,64 +21,42 @@ public class Widgets.SettingsOption : Gtk.Grid {
     public string image_path { get; construct; }
     public string title { get; construct; }
     public string description { get; construct; }
-    public Gtk.Widget widget { get; construct; }
-
-    private static Gtk.CssProvider css_provider;
+    public Gtk.Switch widget { get; private set; }
 
     private Gtk.Grid card;
     private Gtk.Settings gtk_settings;
 
-    public SettingsOption (string image_path, string title, string description, Gtk.Widget widget) {
+    public SettingsOption (string image_path, string title, string description) {
         Object (
             image_path: image_path,
             title: title,
-            description: description,
-            widget: widget
+            description: description
         );
     }
 
-    static construct {
-        css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("/io/elementary/settings/notifications/SettingsOption.css");
-    }
-
     construct {
         card = new Gtk.Grid () {
-            valign = Gtk.Align.START
+            halign = START
         };
         card.add_css_class (image_path);
         card.add_css_class (Granite.STYLE_CLASS_CARD);
         card.add_css_class (Granite.STYLE_CLASS_ROUNDED);
-        card.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-        var title_label = new Gtk.Label (title) {
-            halign = Gtk.Align.START,
-            valign = Gtk.Align.END,
-            hexpand = true,
-            vexpand = false
+        widget = new Gtk.Switch () {
+            valign = START
         };
-        title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
-
-        widget.halign = Gtk.Align.START;
-        widget.valign = Gtk.Align.CENTER;
-        widget.hexpand = false;
-        widget.vexpand = false;
 
-        var description_label = new Gtk.Label (description) {
-            xalign = 0,
-            valign = Gtk.Align.START,
+        var header_label = new Granite.HeaderLabel (title) {
             hexpand = true,
-            vexpand = false,
-            wrap = true,
-            justify = Gtk.Justification.LEFT
+            halign = FILL,
+            secondary_text = description,
+            mnemonic_widget = widget
         };
 
         column_spacing = 12;
-        row_spacing = 6;
-        attach (card, 0, 0, 1, 3);
-        attach (title_label, 1, 0);
-        attach (widget, 1, 1);
-        attach (description_label, 1, 2);
+        attach (header_label, 0, 0);
+        attach (widget, 1, 0);
+        attach (card, 0, 1, 2);
 
         gtk_settings = Gtk.Settings.get_default ();
         gtk_settings.notify["gtk-application-prefer-dark-theme"].connect (() => {