diff --git a/data/gresource.xml b/data/gresource.xml
new file mode 100644
index 00000000..9678f550
--- /dev/null
+++ b/data/gresource.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/io/elementary/wingpanel/notifications">
+    <file compressed="true">indicator.css</file>
+    <file compressed="true">NotificationEntry.css</file>
+  </gresource>
+  <gresource prefix="/io/elementary/notifications">
+    <file alias="image-mask.svg" compressed="true" preprocess="xml-stripblanks">image-mask.svg</file>
+  </gresource>
+  <gresource prefix="org/elementary/wingpanel/icons">
+    <file alias="24x24/status/notification-disabled-10-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-10.svg</file>
+    <file alias="24x24/status/notification-disabled-20-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-20.svg</file>
+    <file alias="24x24/status/notification-disabled-30-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-30.svg</file>
+    <file alias="24x24/status/notification-disabled-40-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-40.svg</file>
+    <file alias="24x24/status/notification-disabled-50-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-50.svg</file>
+    <file alias="24x24/status/notification-disabled-60-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-60.svg</file>
+    <file alias="24x24/status/notification-disabled-70-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-70.svg</file>
+    <file alias="24x24/status/notification-disabled-80-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-80.svg</file>
+    <file alias="24x24/status/notification-disabled-90-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-90.svg</file>
+    <file alias="24x24/status/notification-disabled-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled.svg</file>
+
+    <file alias="24x24/status/notification-new-10-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-10.svg</file>
+    <file alias="24x24/status/notification-new-20-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-20.svg</file>
+    <file alias="24x24/status/notification-new-30-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-30.svg</file>
+    <file alias="24x24/status/notification-new-40-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-40.svg</file>
+    <file alias="24x24/status/notification-new-50-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-50.svg</file>
+    <file alias="24x24/status/notification-new-60-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-60.svg</file>
+    <file alias="24x24/status/notification-new-70-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-70.svg</file>
+    <file alias="24x24/status/notification-new-80-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-80.svg</file>
+    <file alias="24x24/status/notification-new-90-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-90.svg</file>
+    <file alias="24x24/status/notification-new-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new.svg</file>
+
+    <file alias="24x24/status/notification-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/notification.svg</file>
+
+    <file alias="24x24@2/status/notification-disabled-10-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-10.svg</file>
+    <file alias="24x24@2/status/notification-disabled-20-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-20.svg</file>
+    <file alias="24x24@2/status/notification-disabled-30-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-30.svg</file>
+    <file alias="24x24@2/status/notification-disabled-40-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-40.svg</file>
+    <file alias="24x24@2/status/notification-disabled-50-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-50.svg</file>
+    <file alias="24x24@2/status/notification-disabled-60-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-60.svg</file>
+    <file alias="24x24@2/status/notification-disabled-70-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-70.svg</file>
+    <file alias="24x24@2/status/notification-disabled-80-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-80.svg</file>
+    <file alias="24x24@2/status/notification-disabled-90-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-90.svg</file>
+    <file alias="24x24@2/status/notification-disabled-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled.svg</file>
+
+    <file alias="24x24@2/status/notification-new-10-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-10.svg</file>
+    <file alias="24x24@2/status/notification-new-20-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-20.svg</file>
+    <file alias="24x24@2/status/notification-new-30-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-30.svg</file>
+    <file alias="24x24@2/status/notification-new-40-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-40.svg</file>
+    <file alias="24x24@2/status/notification-new-50-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-50.svg</file>
+    <file alias="24x24@2/status/notification-new-60-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-60.svg</file>
+    <file alias="24x24@2/status/notification-new-70-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-70.svg</file>
+    <file alias="24x24@2/status/notification-new-80-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-80.svg</file>
+    <file alias="24x24@2/status/notification-new-90-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new-90.svg</file>
+    <file alias="24x24@2/status/notification-new-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/new.svg</file>
+
+    <file alias="24x24@2/status/notification-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/notification.svg</file>
+  </gresource>
+</gresources>
diff --git a/data/icons/disabled-10.svg b/data/icons/disabled-10.svg
new file mode 100644
index 00000000..dd44f4ad
--- /dev/null
+++ b/data/icons/disabled-10.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     color="#bebebe"
+     d="M 12,5 A 1,1 0 0 0 11,6 V 6.01 C 9.236,6.466 8.002,8.178 8,10 8,10 8,15 6.34,15.621 6.324,15.632 6.317,15.652 6.3,15.664 A 0.726,0.726 0 0 0 6.139,15.84 C 6.121,15.867 6.1,15.888 6.086,15.916 A 0.738,0.738 0 0 0 6,16.25 C 6,16.666 6.335,17 6.75,17 h 10.5 C 17.666,17 18,16.666 18,16.25 A 0.738,0.738 0 0 0 17.914,15.916 C 17.9,15.888 17.879,15.866 17.862,15.84 A 0.725,0.725 0 0 0 17.7,15.664 C 17.684,15.652 17.677,15.632 17.66,15.621 16,15.001 16,10 16,10 15.998,8.177 14.765,6.465 13,6.01 V 6 A 1,1 0 0 0 12,5 Z M 10.067,18 A 2,2 0 0 0 12,19.5 2,2 0 0 0 13.936,18 Z"
+     fill="#666"
+     overflow="visible"
+     style="font-variation-settings:normal;opacity:0.95;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path2" />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1-2-7-0-9"
+     width="1.248"
+     height="1.9799999"
+     x="-0.16577783"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-20.svg b/data/icons/disabled-20.svg
new file mode 100644
index 00000000..33888b73
--- /dev/null
+++ b/data/icons/disabled-20.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     color="#bebebe"
+     d="M 12,5 A 1,1 0 0 0 11,6 V 6.01 C 9.236,6.466 8.002,8.178 8,10 8,10 8,15 6.34,15.621 6.324,15.632 6.317,15.652 6.3,15.664 A 0.726,0.726 0 0 0 6.139,15.84 C 6.121,15.867 6.1,15.888 6.086,15.916 A 0.738,0.738 0 0 0 6,16.25 C 6,16.666 6.335,17 6.75,17 h 10.5 C 17.666,17 18,16.666 18,16.25 A 0.738,0.738 0 0 0 17.914,15.916 C 17.9,15.888 17.879,15.866 17.862,15.84 A 0.725,0.725 0 0 0 17.7,15.664 C 17.684,15.652 17.677,15.632 17.66,15.621 16,15.001 16,10 16,10 15.998,8.177 14.765,6.465 13,6.01 V 6 A 1,1 0 0 0 12,5 Z M 10.067,18 A 2,2 0 0 0 12,19.5 2,2 0 0 0 13.936,18 Z"
+     fill="#666"
+     overflow="visible"
+     style="font-variation-settings:normal;opacity:0.9;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path2" />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1-2-7-0"
+     width="1.248"
+     height="3.96"
+     x="-0.16577788"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-30.svg b/data/icons/disabled-30.svg
new file mode 100644
index 00000000..31e8dc17
--- /dev/null
+++ b/data/icons/disabled-30.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.85;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.085122 6.2462648 9.3150224 6.821901 8.7832031 7.5742188 L 9.7714844 8.5625 C 9.9673528 8.7583684 9.9673527 9.0736629 9.7714844 9.2695312 L 8.9726562 10.068359 C 8.7767879 10.264228 8.4614934 10.264228 8.265625 10.068359 L 8.0078125 9.8105469 C 8.0047811 9.8737158 8.0000697 9.9365155 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1-2-7"
+     width="1.248"
+     height="5.9400001"
+     x="-0.16577812"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-40.svg b/data/icons/disabled-40.svg
new file mode 100644
index 00000000..c9b41254
--- /dev/null
+++ b/data/icons/disabled-40.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.8;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.080477 6.2474655 9.307453 6.827988 8.7753906 7.5859375 L 11.158203 9.9667969 C 11.354072 10.162665 11.354071 10.47796 11.158203 10.673828 L 10.357422 11.472656 C 10.161554 11.668525 9.846259 11.668525 9.6503906 11.472656 L 8.0078125 9.8300781 C 8.0053641 9.8867788 8.0000625 9.9430494 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1-2"
+     width="1.248"
+     height="7.9200001"
+     x="-0.16577816"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-50.svg b/data/icons/disabled-50.svg
new file mode 100644
index 00000000..63aad306
--- /dev/null
+++ b/data/icons/disabled-50.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.75;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.089236 6.2452013 9.3225946 6.8171152 8.7910156 7.5644531 L 12.566406 11.339844 C 12.762275 11.535712 12.762275 11.851007 12.566406 12.046875 L 11.767578 12.847656 C 11.57171 13.043525 11.256415 13.043525 11.060547 12.847656 L 8.0078125 9.7949219 C 8.0042704 9.8632592 8.0000754 9.9312883 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9"
+     width="1.248"
+     height="9.8999996"
+     x="-0.16577816"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-60.svg b/data/icons/disabled-60.svg
new file mode 100644
index 00000000..6c47d540
--- /dev/null
+++ b/data/icons/disabled-60.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.7;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.086913 6.2458016 9.3188269 6.8201644 8.7871094 7.5703125 L 13.972656 12.755859 C 14.168525 12.951728 14.168525 13.267022 13.972656 13.462891 L 13.173828 14.263672 C 12.97796 14.45954 12.660712 14.45954 12.464844 14.263672 L 8.0078125 9.8066406 C 8.0046571 9.8711022 8.0000711 9.9352087 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992003;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2"
+     width="1.248"
+     height="11.88"
+     x="-0.16577813"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-70.svg b/data/icons/disabled-70.svg
new file mode 100644
index 00000000..ee21180e
--- /dev/null
+++ b/data/icons/disabled-70.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.65;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.086548 6.245896 9.3168949 6.8197224 8.7851562 7.5703125 L 15.373047 14.158203 C 15.568915 14.354072 15.568915 14.669366 15.373047 14.865234 L 14.574219 15.664062 C 14.37835 15.859931 14.063056 15.859931 13.867188 15.664062 L 8.0078125 9.8046875 C 8.0045942 9.8697953 8.0000718 9.9345553 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992003;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1"
+     width="1.248"
+     height="13.86"
+     x="-0.16577819"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-80.svg b/data/icons/disabled-80.svg
new file mode 100644
index 00000000..065f4f7f
--- /dev/null
+++ b/data/icons/disabled-80.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.6;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.086913 6.2458016 9.3188269 6.8201644 8.7871094 7.5703125 L 16.775391 15.560547 C 16.971259 15.756415 16.971259 16.07171 16.775391 16.267578 L 16.041016 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 8.0078125 9.8066406 C 8.0046571 9.8711022 8.0000711 9.9352087 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 15.201172 17 L 8.0078125 9.8066406 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1-3"
+     width="1.248"
+     height="15.84"
+     x="-0.16577809"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled-90.svg b/data/icons/disabled-90.svg
new file mode 100644
index 00000000..f3fc6f45
--- /dev/null
+++ b/data/icons/disabled-90.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.55;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.087444 6.2456644 9.3187959 6.8188537 8.7871094 7.5683594 L 17.878906 16.658203 C 17.955124 16.540732 18 16.401277 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 8.0078125 9.8007812 C 8.0044665 9.8671811 8.0000733 9.9332485 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 15.207031 17 L 8.0078125 9.8007812 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992003;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1"
+     width="1.248"
+     height="13.86"
+     x="-0.16577819"
+     y="7.5240593"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-1-6-2-9-1-3-6"
+     width="1.248"
+     height="17.82"
+     x="-0.16577765"
+     y="7.5240588"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/disabled.svg b/data/icons/disabled.svg
new file mode 100644
index 00000000..bbf984e1
--- /dev/null
+++ b/data/icons/disabled.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="font-variation-settings:normal;opacity:0.5;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     d="M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 9.774011 6.3266879 8.8044776 7.2509084 8.3261719 8.3964844 L 16.929688 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000158 15.001094 16 10 16 10 C 15.998 8.1770018 14.764998 6.4647652 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 8.0058594 9.8417969 C 8.0037332 9.8945864 8.0000582 9.9469961 8 10 C 8 10 7.9998421 15.000094 6.3398438 15.621094 C 6.3238438 15.632094 6.3177812 15.652063 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.3350004 17 6.75 17 L 15.164062 17 L 8.0058594 9.8417969 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z " />
+  <rect
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     id="rect2480-1-6"
+     width="1.248"
+     height="19.799999"
+     x="-0.16605946"
+     y="7.5239558"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/data/icons/notification-new-10-symbolic.svg b/data/icons/new-10.svg
similarity index 100%
rename from data/icons/notification-new-10-symbolic.svg
rename to data/icons/new-10.svg
diff --git a/data/icons/notification-new-20-symbolic.svg b/data/icons/new-20.svg
similarity index 100%
rename from data/icons/notification-new-20-symbolic.svg
rename to data/icons/new-20.svg
diff --git a/data/icons/notification-new-30-symbolic.svg b/data/icons/new-30.svg
similarity index 100%
rename from data/icons/notification-new-30-symbolic.svg
rename to data/icons/new-30.svg
diff --git a/data/icons/notification-new-40-symbolic.svg b/data/icons/new-40.svg
similarity index 100%
rename from data/icons/notification-new-40-symbolic.svg
rename to data/icons/new-40.svg
diff --git a/data/icons/notification-new-50-symbolic.svg b/data/icons/new-50.svg
similarity index 100%
rename from data/icons/notification-new-50-symbolic.svg
rename to data/icons/new-50.svg
diff --git a/data/icons/notification-new-60-symbolic.svg b/data/icons/new-60.svg
similarity index 100%
rename from data/icons/notification-new-60-symbolic.svg
rename to data/icons/new-60.svg
diff --git a/data/icons/notification-new-70-symbolic.svg b/data/icons/new-70.svg
similarity index 100%
rename from data/icons/notification-new-70-symbolic.svg
rename to data/icons/new-70.svg
diff --git a/data/icons/notification-new-80-symbolic.svg b/data/icons/new-80.svg
similarity index 100%
rename from data/icons/notification-new-80-symbolic.svg
rename to data/icons/new-80.svg
diff --git a/data/icons/notification-new-90-symbolic.svg b/data/icons/new-90.svg
similarity index 100%
rename from data/icons/notification-new-90-symbolic.svg
rename to data/icons/new-90.svg
diff --git a/data/icons/notification-new-symbolic.svg b/data/icons/new.svg
similarity index 100%
rename from data/icons/notification-new-symbolic.svg
rename to data/icons/new.svg
diff --git a/data/icons/notification-disabled-10-symbolic.svg b/data/icons/notification-disabled-10-symbolic.svg
deleted file mode 100644
index c4dbb38a..00000000
--- a/data/icons/notification-disabled-10-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     style="color:#bebebe;overflow:visible;opacity:1;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#666666;fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-     d="M 6.3535156 4.7363281 L 5.4121094 5.6777344 L 6.7617188 7.0273438 L 7.703125 6.0859375 L 6.3535156 4.7363281 z M 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 9.236 6.4657656 8.002 8.178 8 10 C 8 10 7.9998438 15.000094 6.3398438 15.621094 C 6.3238437 15.632094 6.3177812 15.652062 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.335 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900062 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652062 17.677156 15.632094 17.660156 15.621094 C 16.000156 15.001094 16 10 16 10 C 15.998 8.177 14.765 6.4647656 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z "
-     id="path2" />
-</svg>
diff --git a/data/icons/notification-disabled-20-symbolic.svg b/data/icons/notification-disabled-20-symbolic.svg
deleted file mode 100644
index 46c712c5..00000000
--- a/data/icons/notification-disabled-20-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     style="color:#bebebe;overflow:visible;opacity:1;isolation:auto;mix-blend-mode:normal;fill:#666666;stroke-width:1;marker:none;font-variant-east_asian:normal;vector-effect:none;fill-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 6.3535156 4.7363281 L 5.4121094 5.6777344 L 8.1210938 8.3867188 L 8.5429688 7.9648438 C 8.2003377 8.5800327 8.0007908 9.2795684 8 10 C 8 10 7.9998438 15.000094 6.3398438 15.621094 C 6.3238437 15.632094 6.3177812 15.652062 6.3007812 15.664062 A 0.726 0.726 0 0 0 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 A 0.738 0.738 0 0 0 6 16.25 C 6 16.666 6.335 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 A 0.738 0.738 0 0 0 17.914062 15.916016 C 17.900062 15.888016 17.878328 15.865844 17.861328 15.839844 A 0.725 0.725 0 0 0 17.699219 15.664062 C 17.683219 15.652062 17.677156 15.632094 17.660156 15.621094 C 16.000156 15.001094 16 10 16 10 C 15.998 8.177 14.765 6.4647656 13 6.0097656 L 13 6 A 1 1 0 0 0 12 5 A 1 1 0 0 0 11 6 L 11 6.0097656 C 10.181052 6.2214665 9.4850817 6.7111595 8.9648438 7.3496094 L 6.3535156 4.7363281 z M 10.066406 18 A 2 2 0 0 0 12 19.5 A 2 2 0 0 0 13.935547 18 L 10.066406 18 z "
-     id="path2" />
-</svg>
diff --git a/data/icons/notification-disabled-30-symbolic.svg b/data/icons/notification-disabled-30-symbolic.svg
deleted file mode 100644
index 0c52f667..00000000
--- a/data/icons/notification-disabled-30-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     style="color:#bebebe;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none;opacity:1"
-     d="M 6.3515625 4.7363281 L 6.3515625 4.7382812 L 5.4121094 5.6777344 L 9.4746094 9.7402344 L 8.1738281 9.7402344 L 8.0332031 9.5996094 C 8.0198271 9.732866 8.0001481 9.8650714 8 10 C 8 10 7.9998436 15.000094 6.3398438 15.621094 C 6.3238437 15.632094 6.3177812 15.652062 6.3007812 15.664062 C 6.2374003 15.713292 6.1826211 15.772693 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 C 6.0313172 16.018995 6.0018673 16.133447 6 16.25 C 6 16.666 6.335 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 C 17.9981 16.133447 17.968682 16.018995 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 C 17.817398 15.772684 17.762608 15.713282 17.699219 15.664062 C 17.683219 15.652063 17.677156 15.632094 17.660156 15.621094 C 16.000146 15.001094 16 10 16 10 C 15.998 8.177 14.765 6.4647656 13 6.0097656 L 13 6 C 13 5.4477153 12.552285 5 12 5 C 11.447715 5 11 5.4477153 11 6 L 11 6.0097656 C 10.181169 6.2214318 9.4836645 6.70863 8.9648438 7.3476562 L 6.3535156 4.7363281 L 6.3515625 4.7363281 z M 10.066406 18 C 10.294135 18.881993 11.089083 19.49868 12 19.5 C 12.911645 19.499569 13.707636 18.882696 13.935547 18 L 10.066406 18 z "
-     id="path2-6" />
-</svg>
diff --git a/data/icons/notification-disabled-40-symbolic.svg b/data/icons/notification-disabled-40-symbolic.svg
deleted file mode 100644
index 82f84442..00000000
--- a/data/icons/notification-disabled-40-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     style="color:#bebebe;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none;opacity:1"
-     d="M 6.3515625 4.7363281 L 5.4121094 5.6777344 L 10.830078 11.095703 L 9.5292969 11.095703 L 8.0332031 9.5996094 C 8.0198271 9.732866 8.0001481 9.8650714 8 10 C 8 10 7.9998436 15.000094 6.3398438 15.621094 C 6.3238437 15.632094 6.3177812 15.652062 6.3007812 15.664062 C 6.2374003 15.713292 6.1826211 15.772693 6.1386719 15.839844 C 6.1206719 15.866844 6.0999375 15.888016 6.0859375 15.916016 C 6.0313172 16.018995 6.0018673 16.133447 6 16.25 C 6 16.666 6.335 17 6.75 17 L 17.25 17 C 17.666 17 18 16.666 18 16.25 C 17.9981 16.133447 17.968682 16.018995 17.914062 15.916016 C 17.900063 15.888016 17.878328 15.865844 17.861328 15.839844 C 17.817398 15.772684 17.762608 15.713282 17.699219 15.664062 C 17.683219 15.652062 17.677156 15.632094 17.660156 15.621094 C 16.000146 15.001094 16 10 16 10 C 15.998 8.177 14.765 6.4647656 13 6.0097656 L 13 6 C 13 5.4477153 12.552285 5 12 5 C 11.447715 5 11 5.4477153 11 6 L 11 6.0097656 C 10.180696 6.2215541 9.4837588 6.7100393 8.9648438 7.3496094 L 6.3515625 4.7363281 z M 10.066406 18 C 10.294135 18.881993 11.089083 19.49868 12 19.5 C 12.911645 19.499569 13.707636 18.882696 13.935547 18 L 10.066406 18 z "
-     id="path2-6" />
-</svg>
diff --git a/data/icons/notification-disabled-50-symbolic.svg b/data/icons/notification-disabled-50-symbolic.svg
deleted file mode 100644
index 7d89846a..00000000
--- a/data/icons/notification-disabled-50-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   id="svg6"
-   version="1.1"
-   width="24"
-   height="24">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     style="color:#bebebe;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none;opacity:1"
-     d="M 6.3515625,4.7363281 5.4121094,5.6777344 12.183594,12.449219 v 0 H 10.882812 L 8.0332031,9.5996094 C 8.0198271,9.732866 8.0001481,9.8650714 8,10 c 0,0 -1.563e-4,5.000094 -1.6601562,5.621094 -0.016,0.011 -0.022063,0.03097 -0.039063,0.04297 -0.063381,0.04923 -0.1181601,0.108631 -0.1621093,0.175782 -0.018,0.027 -0.038734,0.04817 -0.052734,0.07617 C 6.0313172,16.018995 6.0018673,16.133447 6,16.25 6,16.666 6.335,17 6.75,17 h 10.5 c 0.416,0 0.75,-0.334 0.75,-0.75 -0.0019,-0.116553 -0.03132,-0.231005 -0.08594,-0.333984 -0.014,-0.028 -0.03573,-0.05017 -0.05273,-0.07617 -0.04393,-0.06716 -0.09872,-0.126563 -0.162109,-0.175782 -0.016,-0.012 -0.02206,-0.03197 -0.03906,-0.04297 C 16.000151,15.001094 16,10 16,10 15.998,8.177 14.765,6.4647656 13,6.0097656 V 6 C 13,5.4477153 12.552285,5 12,5 11.447715,5 11,5.4477153 11,6 v 0.00977 C 10.180696,6.2215585 9.4837589,6.7100393 8.9648438,7.3496094 Z M 10.066406,18 c 0.227729,0.881993 1.022677,1.49868 1.933594,1.5 0.911645,-4.31e-4 1.707636,-0.617304 1.935547,-1.5 z"
-     id="path2-6" />
-</svg>
diff --git a/data/icons/notification-disabled-60-symbolic.svg b/data/icons/notification-disabled-60-symbolic.svg
deleted file mode 100644
index 05d5fd1f..00000000
--- a/data/icons/notification-disabled-60-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     id="path2-6"
-     d="M 6.3515625,4.7363281 5.4121094,5.6777344 13.537867,13.803687 v 0 H 12.237085 L 8.0332031,9.5996094 C 8.0198271,9.732866 8.0001481,9.8650714 8,10 c 0,0 -1.563e-4,5.000094 -1.6601562,5.621094 -0.016,0.011 -0.022063,0.03097 -0.039063,0.04297 -0.063381,0.04923 -0.1181601,0.108631 -0.1621093,0.175782 -0.018,0.027 -0.038734,0.04817 -0.052734,0.07617 C 6.0313172,16.018995 6.0018673,16.133447 6,16.25 6,16.666 6.335,17 6.75,17 h 10.5 c 0.416,0 0.75,-0.334 0.75,-0.75 -0.0019,-0.116553 -0.03132,-0.231005 -0.08594,-0.333984 -0.014,-0.028 -0.03573,-0.05017 -0.05273,-0.07617 -0.04393,-0.06716 -0.09872,-0.126563 -0.162109,-0.175782 -0.016,-0.012 -0.02206,-0.03197 -0.03906,-0.04297 C 16.000151,15.001094 16,10 16,10 15.998,8.177 14.765,6.4647656 13,6.0097656 V 6 C 13,5.4477153 12.552285,5 12,5 11.447715,5 11,5.4477153 11,6 V 6.00977 C 10.180696,6.2215585 9.4837589,6.7100393 8.9648438,7.3496094 Z M 10.066406,18 c 0.227729,0.881993 1.022677,1.49868 1.933594,1.5 0.911645,-4.31e-4 1.707636,-0.617304 1.935547,-1.5 z"
-     style="color:#bebebe;overflow:visible;opacity:1;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none" />
-</svg>
diff --git a/data/icons/notification-disabled-70-symbolic.svg b/data/icons/notification-disabled-70-symbolic.svg
deleted file mode 100644
index 2532e731..00000000
--- a/data/icons/notification-disabled-70-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     id="path2-6"
-     d="M 6.3515625,4.7363281 5.4121094,5.6777344 14.892155,15.158074 v 0 H 13.591373 L 8.0332031,9.5996094 C 8.0198271,9.732866 8.0001481,9.8650714 8,10 c 0,0 -1.563e-4,5.000094 -1.6601562,5.621094 -0.016,0.011 -0.022063,0.03097 -0.039063,0.04297 -0.063381,0.04923 -0.1181601,0.108631 -0.1621093,0.175782 -0.018,0.027 -0.038734,0.04817 -0.052734,0.07617 C 6.0313172,16.018995 6.0018673,16.133447 6,16.25 6,16.666 6.335,17 6.75,17 h 10.5 c 0.416,0 0.75,-0.334 0.75,-0.75 -0.0019,-0.116553 -0.03132,-0.231005 -0.08594,-0.333984 -0.014,-0.028 -0.03573,-0.05017 -0.05273,-0.07617 -0.04393,-0.06716 -0.09872,-0.126563 -0.162109,-0.175782 -0.016,-0.012 -0.02206,-0.03197 -0.03906,-0.04297 C 16.000151,15.001094 16,10 16,10 15.998,8.177 14.765,6.4647656 13,6.0097656 V 6 C 13,5.4477153 12.552285,5 12,5 11.447715,5 11,5.4477153 11,6 V 6.00977 C 10.180696,6.2215585 9.4837589,6.7100393 8.9648438,7.3496094 Z M 10.066406,18 c 0.227729,0.881993 1.022677,1.49868 1.933594,1.5 0.911645,-4.31e-4 1.707636,-0.617304 1.935547,-1.5 z"
-     style="color:#bebebe;overflow:visible;opacity:1;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none" />
-</svg>
diff --git a/data/icons/notification-disabled-80-symbolic.svg b/data/icons/notification-disabled-80-symbolic.svg
deleted file mode 100644
index b2c7bca5..00000000
--- a/data/icons/notification-disabled-80-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     id="path2-6"
-     d="M 6.3515625,4.7363281 5.4121094,5.6777344 16.24645,16.512467 v 0 H 14.945668 L 8.0332031,9.5996094 C 8.0198271,9.732866 8.0001481,9.8650714 8,10 c 0,0 -1.563e-4,5.000094 -1.6601562,5.621094 -0.016,0.011 -0.022063,0.03097 -0.039063,0.04297 -0.063381,0.04923 -0.1181601,0.108631 -0.1621093,0.175782 -0.018,0.027 -0.038734,0.04817 -0.052734,0.07617 C 6.0313172,16.018995 6.0018673,16.133447 6,16.25 6,16.666 6.335,17 6.75,17 h 10.5 c 0.416,0 0.75,-0.334 0.75,-0.75 -0.0019,-0.116553 -0.03132,-0.231005 -0.08594,-0.333984 -0.014,-0.028 -0.03573,-0.05017 -0.05273,-0.07617 -0.04393,-0.06716 -0.09872,-0.126563 -0.162109,-0.175782 -0.016,-0.012 -0.02206,-0.03197 -0.03906,-0.04297 C 16.000151,15.001094 16,10 16,10 15.998,8.177 14.765,6.4647656 13,6.0097656 V 6 C 13,5.4477153 12.552285,5 12,5 11.447715,5 11,5.4477153 11,6 V 6.00977 C 10.180696,6.2215585 9.4837589,6.7100393 8.9648438,7.3496094 Z M 10.066406,18 c 0.227729,0.881993 1.022677,1.49868 1.933594,1.5 0.911645,-4.31e-4 1.707636,-0.617304 1.935547,-1.5 z"
-     style="color:#bebebe;overflow:visible;opacity:1;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none" />
-</svg>
diff --git a/data/icons/notification-disabled-90-symbolic.svg b/data/icons/notification-disabled-90-symbolic.svg
deleted file mode 100644
index 5ebdad33..00000000
--- a/data/icons/notification-disabled-90-symbolic.svg
+++ /dev/null
@@ -1,30 +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"
-   height="24"
-   width="24"
-   version="1.1"
-   id="svg6">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <path
-     style="color:#bebebe;overflow:visible;opacity:1;isolation:auto;mix-blend-mode:normal;fill:#666666;marker:none"
-     d="M 6.3515625,4.7363281 5.7011719,5.3867188 5.4121094,5.6777344 17.601562,17.867188 l 0.939454,-0.941407 -0.564454,-0.5625 C 17.982593,16.32478 18,16.290267 18,16.25 c -0.0019,-0.116553 -0.03132,-0.231005 -0.08594,-0.333984 -0.014,-0.028 -0.03573,-0.05017 -0.05273,-0.07617 -0.04393,-0.06716 -0.09872,-0.126562 -0.162109,-0.175782 -0.016,-0.012 -0.02206,-0.03197 -0.03906,-0.04297 C 16.000146,15.001094 16,10 16,10 15.998,8.177 14.765,6.4647656 13,6.0097656 V 6 C 13,5.4477153 12.552285,5 12,5 11.447715,5 11,5.4477153 11,6 v 0.00977 C 10.180696,6.2215541 9.4837587,6.7100393 8.9648438,7.3496094 Z M 8.0332031,9.5996094 C 8.0198271,9.732866 8.0001481,9.8650714 8,10 c 0,0 -1.564e-4,5.000094 -1.6601562,5.621094 -0.016,0.011 -0.022063,0.03097 -0.039063,0.04297 -0.063381,0.04923 -0.1181601,0.108631 -0.1621093,0.175782 -0.018,0.027 -0.038734,0.04817 -0.052734,0.07617 C 6.0313172,16.018995 6.0018673,16.133447 6,16.25 6,16.666 6.335,17 6.75,17 h 8.683594 c 0,0 -4.933594,-4.933593 -7.4003909,-7.4003906 z M 10.066406,18 c 0.227729,0.881993 1.022677,1.49868 1.933594,1.5 0.911645,-4.31e-4 1.707636,-0.617304 1.935547,-1.5 z"
-     id="path2-6" />
-</svg>
diff --git a/data/icons/notification-disabled-symbolic.svg b/data/icons/notification-disabled-symbolic.svg
deleted file mode 100644
index b3a91eaf..00000000
--- a/data/icons/notification-disabled-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg height='24' width='24' xmlns='http://www.w3.org/2000/svg'>
-    <g transform='translate(-633 -25)'>
-        <path color='#bebebe' d='M639.352 29.736l-.94.942 13.543 13.543.94-.942-1.918-1.918c.007-.04.023-.078.023-.12a.738.738 0 0 0-.086-.335c-.014-.028-.035-.05-.052-.076a.725.725 0 0 0-.163-.176c-.015-.012-.022-.032-.039-.043-1.66-.62-1.66-5.62-1.66-5.62-.002-1.823-1.235-3.535-3-3.991v-.01a1 1 0 1 0-2 0V31c-.822.212-1.52.703-2.039 1.346zm1.68 4.873c-.013.127-.032.253-.032.381 0 0 0 5-1.66 5.621-.016.011-.023.031-.039.043a.726.726 0 0 0-.162.176c-.018.027-.039.048-.053.076a.738.738 0 0 0-.086.334c0 .416.335.75.75.75h8.662zm2.035 8.381a2 2 0 0 0 1.933 1.5 2 2 0 0 0 1.936-1.5z' fill='#666' opacity='.4' overflow='visible' style='isolation:auto;mix-blend-mode:normal;marker:none'/>
-        
-    </g>
-</svg>
diff --git a/data/icons/notification-symbolic.svg b/data/icons/notification-symbolic.svg
deleted file mode 100644
index d5ddd259..00000000
--- a/data/icons/notification-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg height='24' width='24' xmlns='http://www.w3.org/2000/svg'>
-    <g transform='translate(-593 -25)'>
-        <path color='#bebebe' d='M605 30a1 1 0 0 0-1 1v.01c-1.764.456-2.998 2.168-3 3.99 0 0 0 5-1.66 5.621-.016.011-.023.031-.04.043a.726.726 0 0 0-.161.176c-.018.027-.039.048-.053.076a.738.738 0 0 0-.086.334c0 .416.335.75.75.75h10.5c.416 0 .75-.334.75-.75a.738.738 0 0 0-.086-.334c-.014-.028-.035-.05-.052-.076a.725.725 0 0 0-.162-.176c-.016-.012-.023-.032-.04-.043C609 40.001 609 35 609 35c-.002-1.823-1.235-3.535-3-3.99V31a1 1 0 0 0-1-1zm-1.933 13A2 2 0 0 0 605 44.5a2 2 0 0 0 1.936-1.5z' fill='#666' overflow='visible' style='isolation:auto;mix-blend-mode:normal;marker:none'/>
-        
-    </g>
-</svg>
diff --git a/data/icons/notification.svg b/data/icons/notification.svg
new file mode 100644
index 00000000..308ab118
--- /dev/null
+++ b/data/icons/notification.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     color="#bebebe"
+     d="M 12,5 A 1,1 0 0 0 11,6 V 6.01 C 9.236,6.466 8.002,8.178 8,10 8,10 8,15 6.34,15.621 6.324,15.632 6.317,15.652 6.3,15.664 A 0.726,0.726 0 0 0 6.139,15.84 C 6.121,15.867 6.1,15.888 6.086,15.916 A 0.738,0.738 0 0 0 6,16.25 C 6,16.666 6.335,17 6.75,17 h 10.5 C 17.666,17 18,16.666 18,16.25 A 0.738,0.738 0 0 0 17.914,15.916 C 17.9,15.888 17.879,15.866 17.862,15.84 A 0.725,0.725 0 0 0 17.7,15.664 C 17.684,15.652 17.677,15.632 17.66,15.621 16,15.001 16,10 16,10 15.998,8.177 14.765,6.465 13,6.01 V 6 A 1,1 0 0 0 12,5 Z M 10.067,18 A 2,2 0 0 0 12,19.5 2,2 0 0 0 13.936,18 Z"
+     fill="#666"
+     overflow="visible"
+     style="font-variation-settings:normal;opacity:1;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="path2" />
+</svg>
diff --git a/data/indicator.css b/data/indicator.css
index bfbc7f01..f527b235 100644
--- a/data/indicator.css
+++ b/data/indicator.css
@@ -1,21 +1,7 @@
 /*
-* Copyright (c) 2017 elementary LLC. (https://elementary.io)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public
-* License along with this program; if not, write to the
-* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-* Boston, MA 02110-1301 USA.
-*/
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-FileCopyrightText: 2017-2023 elementary, Inc. (https://elementary.io)
+ */
 
 .notification-icon {
     animation: none;
@@ -37,15 +23,15 @@
 
 @keyframes notification-disabled {
     0% { -gtk-icon-source: -gtk-icontheme("notification-symbolic"); }
-    10% { -gtk-icon-source: -gtk-icontheme("notification-disabled-10-symbolic"); opacity: 0.94; }
-    20% { -gtk-icon-source: -gtk-icontheme("notification-disabled-20-symbolic"); opacity: 0.88; }
-    30% { -gtk-icon-source: -gtk-icontheme("notification-disabled-30-symbolic"); opacity: 0.82; }
-    40% { -gtk-icon-source: -gtk-icontheme("notification-disabled-40-symbolic"); opacity: 0.76; }
-    50% { -gtk-icon-source: -gtk-icontheme("notification-disabled-50-symbolic"); opacity: 0.70; }
-    60% { -gtk-icon-source: -gtk-icontheme("notification-disabled-60-symbolic"); opacity: 0.64; }
-    70% { -gtk-icon-source: -gtk-icontheme("notification-disabled-70-symbolic"); opacity: 0.58; }
-    80% { -gtk-icon-source: -gtk-icontheme("notification-disabled-80-symbolic"); opacity: 0.52; }
-    90% { -gtk-icon-source: -gtk-icontheme("notification-disabled-90-symbolic"); opacity: 0.46; }
+    10% { -gtk-icon-source: -gtk-icontheme("notification-disabled-10-symbolic"); }
+    20% { -gtk-icon-source: -gtk-icontheme("notification-disabled-20-symbolic"); }
+    30% { -gtk-icon-source: -gtk-icontheme("notification-disabled-30-symbolic"); }
+    40% { -gtk-icon-source: -gtk-icontheme("notification-disabled-40-symbolic"); }
+    50% { -gtk-icon-source: -gtk-icontheme("notification-disabled-50-symbolic"); }
+    60% { -gtk-icon-source: -gtk-icontheme("notification-disabled-60-symbolic"); }
+    70% { -gtk-icon-source: -gtk-icontheme("notification-disabled-70-symbolic"); }
+    80% { -gtk-icon-source: -gtk-icontheme("notification-disabled-80-symbolic"); }
+    90% { -gtk-icon-source: -gtk-icontheme("notification-disabled-90-symbolic"); }
     100% { -gtk-icon-source: -gtk-icontheme("notification-disabled-symbolic"); }
 }
 
diff --git a/data/io.elementary.wingpanel.notifications.gresource.xml b/data/io.elementary.wingpanel.notifications.gresource.xml
deleted file mode 100644
index 5efac4e6..00000000
--- a/data/io.elementary.wingpanel.notifications.gresource.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/io/elementary/wingpanel/notifications">
-    <file compressed="true">indicator.css</file>
-    <file compressed="true">NotificationEntry.css</file>
-
-    <file alias="notification-disabled-10-symbolic.svg" compressed="true">icons/notification-disabled-10-symbolic.svg</file>
-    <file alias="notification-disabled-20-symbolic.svg" compressed="true">icons/notification-disabled-20-symbolic.svg</file>
-    <file alias="notification-disabled-30-symbolic.svg" compressed="true">icons/notification-disabled-30-symbolic.svg</file>
-    <file alias="notification-disabled-40-symbolic.svg" compressed="true">icons/notification-disabled-40-symbolic.svg</file>
-    <file alias="notification-disabled-50-symbolic.svg" compressed="true">icons/notification-disabled-50-symbolic.svg</file>
-    <file alias="notification-disabled-60-symbolic.svg" compressed="true">icons/notification-disabled-60-symbolic.svg</file>
-    <file alias="notification-disabled-70-symbolic.svg" compressed="true">icons/notification-disabled-70-symbolic.svg</file>
-    <file alias="notification-disabled-80-symbolic.svg" compressed="true">icons/notification-disabled-80-symbolic.svg</file>
-    <file alias="notification-disabled-90-symbolic.svg" compressed="true">icons/notification-disabled-90-symbolic.svg</file>
-    <file alias="notification-disabled-symbolic.svg" compressed="true">icons/notification-disabled-symbolic.svg</file>
-
-    <file alias="notification-new-10-symbolic.svg" compressed="true">icons/notification-new-10-symbolic.svg</file>
-    <file alias="notification-new-20-symbolic.svg" compressed="true">icons/notification-new-20-symbolic.svg</file>
-    <file alias="notification-new-30-symbolic.svg" compressed="true">icons/notification-new-30-symbolic.svg</file>
-    <file alias="notification-new-40-symbolic.svg" compressed="true">icons/notification-new-40-symbolic.svg</file>
-    <file alias="notification-new-50-symbolic.svg" compressed="true">icons/notification-new-50-symbolic.svg</file>
-    <file alias="notification-new-60-symbolic.svg" compressed="true">icons/notification-new-60-symbolic.svg</file>
-    <file alias="notification-new-70-symbolic.svg" compressed="true">icons/notification-new-70-symbolic.svg</file>
-    <file alias="notification-new-80-symbolic.svg" compressed="true">icons/notification-new-80-symbolic.svg</file>
-    <file alias="notification-new-90-symbolic.svg" compressed="true">icons/notification-new-90-symbolic.svg</file>
-    <file alias="notification-new-symbolic.svg" compressed="true">icons/notification-new-symbolic.svg</file>
-
-    <file alias="notification-symbolic.svg" compressed="true">icons/notification-symbolic.svg</file>
-  </gresource>
-  <gresource prefix="/io/elementary/notifications">
-    <file alias="image-mask.svg" compressed="true">image-mask.svg</file>
-  </gresource>
-</gresources>
diff --git a/meson.build b/meson.build
index 9bdeacb2..a3d4ffcf 100644
--- a/meson.build
+++ b/meson.build
@@ -18,10 +18,10 @@ add_global_arguments(
 )
 add_project_arguments('-DG_LOG_DOMAIN="io.elementary.wingpanel.notifications"', language:'c')
 
-asresources = gnome.compile_resources(
-    'as-resources', 'data/io.elementary.wingpanel.notifications.gresource.xml',
-    source_dir: 'data',
-    c_name: 'as'
+gresource = gnome.compile_resources(
+    'gresource',
+    'data' / 'gresource.xml',
+    source_dir: 'data'
 )
 
 wingpanel_dep = dependency('wingpanel')
@@ -47,7 +47,7 @@ shared_module(
     'src/Services/Notification.vala',
     'src/Services/Session.vala',
     'src/Services/Interfaces.vala',
-    asresources,
+    gresource,
     config_vala,
     dependencies: [
         dependency('glib-2.0'),
diff --git a/src/Indicator.vala b/src/Indicator.vala
index ec8b0da5..8c493058 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -46,8 +46,6 @@ public class Notifications.Indicator : Wingpanel.Indicator {
 
     public override Gtk.Widget get_display_widget () {
         if (dynamic_icon == null) {
-            Gtk.IconTheme.get_default ().add_resource_path ("/io/elementary/wingpanel/notifications");
-
             var provider = new Gtk.CssProvider ();
             provider.load_from_resource ("io/elementary/wingpanel/notifications/indicator.css");