diff --git a/bottles/frontend/bottles.py b/bottles/frontend/bottles.py
index 3063c267438..6c5cbbcd6d3 100644
--- a/bottles/frontend/bottles.py
+++ b/bottles/frontend/bottles.py
@@ -26,7 +26,8 @@
 pkgdatadir = "@pkgdatadir@"
 localedir = "@localedir@"
 # noinspection DuplicatedCode
-gresource_path = f"{pkgdatadir}/bottles.gresource"
+data_gresource_path = f"{pkgdatadir}/data.gresource"
+bottles_gresource_path = f"{pkgdatadir}/bottles.gresource"
 sys.path.insert(1, pkgdatadir)
 
 # Remove GTK_THEME variable to prevent breakages
@@ -39,9 +40,11 @@
 if __name__ == "__main__":
     from gi.repository import Gio
 
-    resource = Gio.Resource.load(gresource_path)
+    data_resource = Gio.Resource.load(data_gresource_path)
+    bottles_resource = Gio.Resource.load(bottles_gresource_path)
     # noinspection PyProtectedMember
-    resource._register()
+    data_resource._register()
+    bottles_resource._register()
 
     from bottles.frontend import main
 
diff --git a/bottles/frontend/main.py b/bottles/frontend/main.py
index ac4c485174f..f4e66de6f1a 100644
--- a/bottles/frontend/main.py
+++ b/bottles/frontend/main.py
@@ -82,6 +82,7 @@ class Bottles(Adw.Application):
     def __init__(self):
         super().__init__(
             application_id=APP_ID,
+            resource_base_path="/com/usebottles/bottles",
             flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
             register_session=True,
         )
diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml
index b3dd68b490a..4bfe69b3563 100644
--- a/bottles/frontend/ui/bottles.gresource.xml
+++ b/bottles/frontend/ui/bottles.gresource.xml
@@ -1,89 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-    <gresource prefix="/com/usebottles/bottles">
-        <file>style.css</file>
-        <file>style-dark.css</file>
-        <file>window.ui</file>
-        <file>new.ui</file>
-        <file>list.ui</file>
-        <file>loading.ui</file>
-        <file>list-entry.ui</file>
-        <file>task-entry.ui</file>
-        <file>dependency-entry.ui</file>
-        <file>program-entry.ui</file>
-        <file>importer-entry.ui</file>
-        <file>state-entry.ui</file>
-        <file>installer-entry.ui</file>
-        <file>dll-override-entry.ui</file>
-        <file>env-var-entry.ui</file>
-        <file>component-entry.ui</file>
-        <file>drive-entry.ui</file>
-        <file>library-entry.ui</file>
-        <file>local-resource-entry.ui</file>
-        <file>exclusion-pattern-entry.ui</file>
-        <file>details.ui</file>
-        <file>details-bottle.ui</file>
-        <file>details-dependencies.ui</file>
-        <file>details-installers.ui</file>
-        <file>details-preferences.ui</file>
-        <file>details-versioning.ui</file>
-        <file>details-taskmanager.ui</file>
-        <file>preferences.ui</file>
-        <file>importer.ui</file>
-        <file>library.ui</file>
-        <file>dialog-launch-options.ui</file>
-        <file>dialog-dll-overrides.ui</file>
-        <file>dialog-env-vars.ui</file>
-        <file>dialog-crash-report.ui</file>
-        <file>dialog-duplicate.ui</file>
-        <file>dialog-rename.ui</file>
-        <file>dialog-gamescope.ui</file>
-        <file>dialog-vkbasalt.ui</file>
-        <file>dialog-fsr.ui</file>
-        <file>dialog-mangohud.ui</file>
-        <file>dialog-display.ui</file>
-        <file>dialog-drives.ui</file>
-        <file>dialog-journal.ui</file>
-        <file>dialog-sandbox.ui</file>
-        <file>dialog-installer.ui</file>
-        <file>dialog-bottle-picker.ui</file>
-        <file>dialog-proton-alert.ui</file>
-        <file>dialog-deps-check.ui</file>
-        <file>dialog-exclusion-patterns.ui</file>
-        <file>dialog-upgrade-versioning.ui</file>
-        <file>dialog-vmtouch.ui</file>
-        <file>onboard.ui</file>
-        <file>about.ui</file>
-
-    </gresource>
-    <gresource prefix="/com/usebottles/bottles/icons/scalable/actions">
-        <file alias="bottles-steam-symbolic.svg">../../../data/icons/symbolic/scalable/apps/bottles-steam-symbolic.svg</file>
-        <file alias="external-link-symbolic.svg">../../../data/icons/symbolic/scalable/actions/external-link-symbolic.svg</file>
-        <file alias="applications-system-symbolic.svg">../../../data/icons/symbolic/scalable/actions/applications-system-symbolic.svg</file>
-        <file alias="application-x-addon-symbolic.svg">../../../data/icons/symbolic/scalable/actions/application-x-addon-symbolic.svg</file>
-        <file alias="computer-symbolic.svg">../../../data/icons/symbolic/scalable/actions/computer-symbolic.svg</file>
-        <file alias="document-save-symbolic.svg">../../../data/icons/symbolic/scalable/actions/document-save-symbolic.svg</file>
-        <file alias="go-next-symbolic.svg">../../../data/icons/symbolic/scalable/actions/go-next-symbolic.svg</file>
-        <file alias="go-previous-symbolic.svg">../../../data/icons/symbolic/scalable/actions/go-previous-symbolic.svg</file>
-        <file alias="media-playback-start-symbolic.svg">../../../data/icons/symbolic/scalable/actions/media-playback-start-symbolic.svg</file>
-        <file alias="media-playback-stop-symbolic.svg">../../../data/icons/symbolic/scalable/actions/media-playback-stop-symbolic.svg</file>
-        <file alias="preferences-desktop-apps-symbolic.svg">../../../data/icons/symbolic/scalable/actions/preferences-desktop-apps-symbolic.svg</file>
-        <file alias="preferences-system-time-symbolic.svg">../../../data/icons/symbolic/scalable/actions/preferences-system-time-symbolic.svg</file>
-        <file alias="selection-mode-symbolic.svg">../../../data/icons/symbolic/scalable/actions/selection-mode-symbolic.svg</file>
-        <file alias="system-run-symbolic.svg">../../../data/icons/symbolic/scalable/actions/system-run-symbolic.svg</file>
-        <file alias="system-shutdown-symbolic.svg">../../../data/icons/symbolic/scalable/actions/system-shutdown-symbolic.svg</file>
-        <file alias="system-software-install-symbolic.svg">../../../data/icons/symbolic/scalable/actions/system-software-install-symbolic.svg</file>
-        <file alias="view-more-symbolic.svg">../../../data/icons/symbolic/scalable/actions/view-more-symbolic.svg</file>
-        <file alias="open-menu-symbolic.svg">../../../data/icons/symbolic/scalable/actions/open-menu-symbolic.svg</file>
-        <file alias="system-search-symbolic.svg">../../../data/icons/symbolic/scalable/actions/system-search-symbolic.svg</file>
-        <file alias="list-add-symbolic.svg">../../../data/icons/symbolic/scalable/actions/list-add-symbolic.svg</file>
-        <file alias="paper-symbolic.svg">../../../data/icons/symbolic/scalable/actions/paper-symbolic.svg</file>
-        <file alias="info-symbolic.svg">../../../data/icons/symbolic/scalable/actions/info-symbolic.svg</file>
-        <file alias="library-symbolic.svg">../../../data/icons/symbolic/scalable/actions/library-symbolic.svg</file>
-        <file alias="warning-symbolic.svg">../../../data/icons/symbolic/scalable/actions/warning-symbolic.svg</file>
-    </gresource>
-    <gresource prefix="/com/usebottles/bottles/images">
-        <file alias="images/bottles-welcome.svg">../../../data/images/bottles-welcome.svg</file>
-        <file alias="images/bottles-welcome-night.svg">../../../data/images/bottles-welcome-night.svg</file>
-    </gresource>
+  <gresource prefix="/com/usebottles/bottles">
+    <file>style.css</file>
+    <file>style-dark.css</file>
+    <file preprocess="xml-stripblanks">window.ui</file>
+    <file preprocess="xml-stripblanks">new.ui</file>
+    <file preprocess="xml-stripblanks">list.ui</file>
+    <file preprocess="xml-stripblanks">loading.ui</file>
+    <file preprocess="xml-stripblanks">list-entry.ui</file>
+    <file preprocess="xml-stripblanks">task-entry.ui</file>
+    <file preprocess="xml-stripblanks">dependency-entry.ui</file>
+    <file preprocess="xml-stripblanks">program-entry.ui</file>
+    <file preprocess="xml-stripblanks">importer-entry.ui</file>
+    <file preprocess="xml-stripblanks">state-entry.ui</file>
+    <file preprocess="xml-stripblanks">installer-entry.ui</file>
+    <file preprocess="xml-stripblanks">dll-override-entry.ui</file>
+    <file preprocess="xml-stripblanks">env-var-entry.ui</file>
+    <file preprocess="xml-stripblanks">component-entry.ui</file>
+    <file preprocess="xml-stripblanks">drive-entry.ui</file>
+    <file preprocess="xml-stripblanks">library-entry.ui</file>
+    <file preprocess="xml-stripblanks">local-resource-entry.ui</file>
+    <file preprocess="xml-stripblanks">exclusion-pattern-entry.ui</file>
+    <file preprocess="xml-stripblanks">details.ui</file>
+    <file preprocess="xml-stripblanks">details-bottle.ui</file>
+    <file preprocess="xml-stripblanks">details-dependencies.ui</file>
+    <file preprocess="xml-stripblanks">details-installers.ui</file>
+    <file preprocess="xml-stripblanks">details-preferences.ui</file>
+    <file preprocess="xml-stripblanks">details-versioning.ui</file>
+    <file preprocess="xml-stripblanks">details-taskmanager.ui</file>
+    <file preprocess="xml-stripblanks">preferences.ui</file>
+    <file preprocess="xml-stripblanks">importer.ui</file>
+    <file preprocess="xml-stripblanks">library.ui</file>
+    <file preprocess="xml-stripblanks">dialog-launch-options.ui</file>
+    <file preprocess="xml-stripblanks">dialog-dll-overrides.ui</file>
+    <file preprocess="xml-stripblanks">dialog-env-vars.ui</file>
+    <file preprocess="xml-stripblanks">dialog-crash-report.ui</file>
+    <file preprocess="xml-stripblanks">dialog-duplicate.ui</file>
+    <file preprocess="xml-stripblanks">dialog-rename.ui</file>
+    <file preprocess="xml-stripblanks">dialog-gamescope.ui</file>
+    <file preprocess="xml-stripblanks">dialog-vkbasalt.ui</file>
+    <file preprocess="xml-stripblanks">dialog-fsr.ui</file>
+    <file preprocess="xml-stripblanks">dialog-mangohud.ui</file>
+    <file preprocess="xml-stripblanks">dialog-display.ui</file>
+    <file preprocess="xml-stripblanks">dialog-drives.ui</file>
+    <file preprocess="xml-stripblanks">dialog-journal.ui</file>
+    <file preprocess="xml-stripblanks">dialog-sandbox.ui</file>
+    <file preprocess="xml-stripblanks">dialog-installer.ui</file>
+    <file preprocess="xml-stripblanks">dialog-bottle-picker.ui</file>
+    <file preprocess="xml-stripblanks">dialog-proton-alert.ui</file>
+    <file preprocess="xml-stripblanks">dialog-deps-check.ui</file>
+    <file preprocess="xml-stripblanks">dialog-exclusion-patterns.ui</file>
+    <file preprocess="xml-stripblanks">dialog-upgrade-versioning.ui</file>
+    <file preprocess="xml-stripblanks">dialog-vmtouch.ui</file>
+    <file preprocess="xml-stripblanks">onboard.ui</file>
+    <file preprocess="xml-stripblanks">about.ui</file>
+  </gresource>
 </gresources>
diff --git a/data/data.gresource.xml b/data/data.gresource.xml
new file mode 100644
index 00000000000..ebf102fb604
--- /dev/null
+++ b/data/data.gresource.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/usebottles/bottles/icons/scalable/actions">
+    <file preprocess="xml-stripblanks" alias="bottles-steam-symbolic.svg">icons/hicolor/symbolic/apps/bottles-steam-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="external-link-symbolic.svg">icons/hicolor/symbolic/actions/external-link-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="applications-system-symbolic.svg">icons/hicolor/symbolic/actions/applications-system-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="application-x-addon-symbolic.svg">icons/hicolor/symbolic/actions/application-x-addon-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="computer-symbolic.svg">icons/hicolor/symbolic/actions/computer-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="document-save-symbolic.svg">icons/hicolor/symbolic/actions/document-save-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="go-next-symbolic.svg">icons/hicolor/symbolic/actions/go-next-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="go-previous-symbolic.svg">icons/hicolor/symbolic/actions/go-previous-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="media-playback-start-symbolic.svg">icons/hicolor/symbolic/actions/media-playback-start-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="media-playback-stop-symbolic.svg">icons/hicolor/symbolic/actions/media-playback-stop-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="preferences-desktop-apps-symbolic.svg">icons/hicolor/symbolic/actions/preferences-desktop-apps-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="preferences-system-time-symbolic.svg">icons/hicolor/symbolic/actions/preferences-system-time-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="selection-mode-symbolic.svg">icons/hicolor/symbolic/actions/selection-mode-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="system-run-symbolic.svg">icons/hicolor/symbolic/actions/system-run-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="system-shutdown-symbolic.svg">icons/hicolor/symbolic/actions/system-shutdown-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="system-software-install-symbolic.svg">icons/hicolor/symbolic/actions/system-software-install-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="view-more-symbolic.svg">icons/hicolor/symbolic/actions/view-more-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="open-menu-symbolic.svg">icons/hicolor/symbolic/actions/open-menu-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="system-search-symbolic.svg">icons/hicolor/symbolic/actions/system-search-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="list-add-symbolic.svg">icons/hicolor/symbolic/actions/list-add-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="paper-symbolic.svg">icons/hicolor/symbolic/actions/paper-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="info-symbolic.svg">icons/hicolor/symbolic/actions/info-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="library-symbolic.svg">icons/hicolor/symbolic/actions/library-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="warning-symbolic.svg">icons/hicolor/symbolic/actions/warning-symbolic.svg</file>
+  </gresource>
+  <gresource prefix="/com/usebottles/bottles/images/images">
+    <file preprocess="xml-stripblanks" alias="bottles-welcome.svg">images/bottles-welcome.svg</file>
+    <file preprocess="xml-stripblanks" alias="bottles-welcome-night.svg">images/bottles-welcome-night.svg</file>
+  </gresource>
+</gresources>
diff --git a/data/icons/hicolor/48/apps/com.usebottles.bottles.Devel.svg b/data/icons/hicolor/48/apps/com.usebottles.bottles.Devel.svg
deleted file mode 100644
index 08f715d2ee9..00000000000
--- a/data/icons/hicolor/48/apps/com.usebottles.bottles.Devel.svg
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="49" x2="79" y1="67.999878" y2="67.999878">
-        <stop offset="0" stop-color="#deddda"/>
-        <stop offset="0.25" stop-color="#f6f5f4"/>
-        <stop offset="0.75" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#deddda" stop-opacity="0.854902"/>
-    </linearGradient>
-    <linearGradient id="b" gradientTransform="matrix(1.002882 0 0 1 -0.141199 0)" gradientUnits="userSpaceOnUse" x1="49" x2="79" y1="31.453125" y2="31.453125">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.25" stop-color="#deddda"/>
-        <stop offset="0.75" stop-color="#f6f5f4"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="12" x2="49" y1="42.916992" y2="42.916992">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.25" stop-color="#deddda"/>
-        <stop offset="0.75" stop-color="#deddda"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="d" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#1a5fb4"/>
-        <stop offset="0.25" stop-color="#1c71d8"/>
-        <stop offset="0.75" stop-color="#3584e4"/>
-        <stop offset="1" stop-color="#1a5fb4"/>
-    </linearGradient>
-    <linearGradient id="e" x1="49.000001" x2="78.999997" xlink:href="#d" y1="21.471176" y2="21.471176"/>
-    <linearGradient id="f" x1="49.000114" x2="79.000107" xlink:href="#d" y1="67.999875" y2="67.999875"/>
-    <linearGradient id="g" gradientUnits="userSpaceOnUse" x1="12.000113" x2="49.000111" y1="74.969727" y2="74.969727">
-        <stop offset="0" stop-color="#ffa348"/>
-        <stop offset="0.25" stop-color="#ffbe6f"/>
-        <stop offset="0.75" stop-color="#ffbe6f"/>
-        <stop offset="1" stop-color="#ffa348"/>
-    </linearGradient>
-    <linearGradient id="h" gradientUnits="userSpaceOnUse" x1="79.00045" x2="116.000443" y1="75.564209" y2="75.564209">
-        <stop offset="0" stop-color="#e01b24"/>
-        <stop offset="0.25" stop-color="#ed333b"/>
-        <stop offset="0.75" stop-color="#f66151"/>
-        <stop offset="1" stop-color="#e01b24"/>
-    </linearGradient>
-    <linearGradient id="i" gradientUnits="userSpaceOnUse" x1="24" x2="37" y1="14" y2="14">
-        <stop offset="0" stop-color="#33d17a"/>
-        <stop offset="0.388454" stop-color="#57e389"/>
-        <stop offset="0.75" stop-color="#57e389"/>
-        <stop offset="1" stop-color="#2ec27e" stop-opacity="0.854902"/>
-    </linearGradient>
-    <linearGradient id="j" gradientUnits="userSpaceOnUse" x1="79" x2="116" y1="35.961914" y2="35.961914">
-        <stop offset="0" stop-color="#3d3846"/>
-        <stop offset="0.25" stop-color="#5e5c64"/>
-        <stop offset="0.75" stop-color="#77767b"/>
-        <stop offset="1" stop-color="#77767b"/>
-    </linearGradient>
-    <linearGradient id="k" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#9a9996"/>
-        <stop offset="0.25" stop-color="#c0bfbc"/>
-        <stop offset="0.75" stop-color="#deddda"/>
-        <stop offset="1" stop-color="#9a9996"/>
-    </linearGradient>
-    <linearGradient id="l" x1="79" x2="116" xlink:href="#k" y1="31.472427" y2="31.472427"/>
-    <linearGradient id="m" gradientTransform="matrix(0.999963 0 0 0.814473 0.003815 -120.794434)" x1="78.999084" x2="116.000443" xlink:href="#k" y1="273.23233" y2="273.23233"/>
-    <clipPath id="n">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="o">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <filter id="p" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="q">
-        <g clip-path="url(#o)" filter="url(#p)">
-            <g clip-path="url(#n)">
-                <path d="m 54.546875 24 s -5.546875 13.609375 -5.546875 14.515625 v 73.484375 h 30 v -73.488281 c 0 0.003906 -5 -14.511719 -5 -14.511719 z m 0 0" fill="url(#a)"/>
-                <path d="m 54 24 s -5 13.609375 -5 14.511719 h 30 c 0 -0.488281 -5 -14.511719 -5 -14.511719 z m 0 0" fill="url(#b)"/>
-                <path d="m 12 47.894531 c 0.496094 0.015625 37 0 37 0 c 0 -12.816406 -11.84375 -23.894531 -12 -31.894531 h -13 c 0 8 -12.003906 19.078125 -12 31.894531 z m 0 0" fill="url(#c)"/>
-                <path d="m 79 112 h -30 v 4 h 30 z m 0 0" fill="#c0bfbc"/>
-                <path d="m 54 18.941406 v 5.058594 h 20 v -5.058594 z m 0 0" fill="url(#e)"/>
-                <path d="m 64 56.035156 c -7.5 0 -7.5 9.457032 -7.5 9.457032 h -7.5 v 14.46875 h 30 v -14.46875 h -7.5 s 0 -9.457032 -7.5 -9.457032 z m 0 2 s 5.453125 6.652344 3.457031 9.941406 c -1.996093 3.289063 -4.921875 3.289063 -6.917969 0 c -1.996093 -3.289062 3.460938 -9.941406 3.460938 -9.941406 z m 0 0" fill="url(#f)"/>
-                <path d="m 49 112 h -29.574219 c -0.125 0 -0.253906 -0.003906 -0.378906 -0.011719 c -0.128906 -0.003906 -0.253906 -0.015625 -0.378906 -0.03125 c -0.128907 -0.011719 -0.25 -0.027343 -0.375 -0.050781 c -0.125 -0.019531 -0.242188 -0.042969 -0.367188 -0.070312 c -0.121093 -0.023438 -0.242187 -0.054688 -0.359375 -0.089844 c -0.117187 -0.03125 -0.234375 -0.066406 -0.351562 -0.105469 c -0.234375 -0.078125 -0.460938 -0.167969 -0.683594 -0.269531 c -0.222656 -0.097656 -0.441406 -0.210938 -0.652344 -0.335938 c -0.207031 -0.121094 -0.410156 -0.253906 -0.609375 -0.398437 s -0.390625 -0.296875 -0.570312 -0.460938 c -0.183594 -0.160156 -0.363281 -0.332031 -0.527344 -0.515625 c -0.167969 -0.179687 -0.328125 -0.371094 -0.480469 -0.566406 c -0.152344 -0.199219 -0.292968 -0.402344 -0.425781 -0.617188 c -0.132813 -0.210937 -0.257813 -0.429687 -0.371094 -0.65625 c -0.113281 -0.226562 -0.21875 -0.460937 -0.3125 -0.703124 c -0.09375 -0.238282 -0.179687 -0.480469 -0.25 -0.734376 c -0.070312 -0.25 -0.132812 -0.503906 -0.179687 -0.765624 c -0.050782 -0.261719 -0.089844 -0.527344 -0.113282 -0.796876 c -0.023437 -0.269531 -0.039062 -0.542968 -0.039062 -0.820312 v 3.582031 v 0.003907 c 0 0.289062 0.015625 0.578124 0.042969 0.859374 v 0.003907 c 0.027343 0.28125 0.070312 0.558593 0.125 0.832031 c 0.050781 0.273438 0.121093 0.542969 0.199219 0.804688 v 0.003906 c 0.078124 0.261718 0.171874 0.515625 0.273437 0.769531 c 0.101563 0.25 0.21875 0.496094 0.347656 0.734375 c 0.375 0.710938 0.851563 1.363281 1.40625 1.933594 c 1.480469 1.519531 3.527344 2.460937 5.800781 2.472656 h 28.804688 z m 0 0" fill="#e66100"/>
-                <path d="m 21.40625 24 c -0.003906 0.003906 -0.007812 0.007812 -0.011719 0.011719 c -3.53125 6.804687 -9.398437 14.914062 -9.394531 23.878906 v 56.109375 c 0 0.277344 0.015625 0.550781 0.039062 0.820312 c 0.023438 0.269532 0.0625 0.535157 0.109376 0.796876 c 0.050781 0.261718 0.113281 0.515624 0.183593 0.769531 c 0.070313 0.25 0.15625 0.492187 0.25 0.730469 c 0.09375 0.242187 0.199219 0.476562 0.3125 0.703124 c 0.113281 0.226563 0.238281 0.445313 0.371094 0.660157 c 0.132813 0.210937 0.273437 0.414062 0.425781 0.613281 s 0.3125 0.386719 0.476563 0.570312 c 0.167969 0.179688 0.347656 0.351563 0.527343 0.511719 c 0.183594 0.164063 0.375 0.316407 0.574219 0.460938 s 0.402344 0.277343 0.609375 0.402343 c 0.210938 0.121094 0.429688 0.234376 0.652344 0.335938 c 0.222656 0.097656 0.449219 0.1875 0.683594 0.265625 c 0.117187 0.039063 0.234375 0.074219 0.351562 0.109375 c 0.117188 0.03125 0.238282 0.0625 0.359375 0.085938 c 0.125 0.027343 0.242188 0.050781 0.367188 0.070312 c 0.125 0.023438 0.246093 0.039062 0.371093 0.050781 c 0.128907 0.015625 0.253907 0.027344 0.378907 0.03125 c 0.128906 0.007813 0.257812 0.011719 0.382812 0.011719 h 29.574219 v -64.109375 c 0 -8.964844 -5.789062 -17.074219 -9.324219 -23.878906 c -0.003906 -0.003907 -0.007812 -0.007813 -0.011719 -0.011719 z m 0 0" fill="url(#g)"/>
-                <path d="m 87 36.945312 c -4.253906 2.078126 -8 6.710938 -8 11.527344 v 67.527344 h 28.804688 c 4.542968 -0.019531 8.195312 -3.765625 8.195312 -8.414062 v -59.113282 c 0 -4.828125 -3.730469 -9.453125 -8 -11.527344 z m 0 0" fill="url(#h)"/>
-                <path d="m 24 12 h 13 v 4 h -13 z m 0 0" fill="url(#i)"/>
-                <path d="m 116 104 c 0 4.433594 -3.3125 8 -7.425781 8 h -29.574219 v 4 h 28.804688 c 4.542968 -0.019531 8.195312 -3.765625 8.195312 -8.414062 z m 0 0" fill="#c01c28"/>
-                <path d="m 87 34.945312 h 21 v 2.03125 h -21 z m 0 0" fill="url(#j)"/>
-                <path d="m 87 28 h 21 v 6.945312 h -21 z m 0 0" fill="url(#l)"/>
-                <path d="m 104 99.492188 h 12 v 4.507812 h -12 z m 0 0" fill="url(#m)"/>
-                <path d="m 30.5 54 c -5.523438 0 -10 4.476562 -10 10 s 4.476562 10 10 10 s 10 -4.476562 10 -10 s -4.476562 -10 -10 -10 z m 0 0" fill="#33d17a" fill-opacity="0.854902"/>
-            </g>
-        </g>
-    </mask>
-    <mask id="r">
-        <g filter="url(#p)">
-            <rect fill-opacity="0.8" height="128" width="128"/>
-        </g>
-    </mask>
-    <linearGradient id="s" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
-        <stop offset="0" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#f5c211"/>
-    </linearGradient>
-    <clipPath id="t">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="u">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <path d="m 54.546875 24 s -5.546875 13.609375 -5.546875 14.515625 v 73.484375 h 30 v -73.488281 c 0 0.003906 -5 -14.511719 -5 -14.511719 z m 0 0" fill="url(#a)"/>
-    <path d="m 54 24 s -5 13.609375 -5 14.511719 h 30 c 0 -0.488281 -5 -14.511719 -5 -14.511719 z m 0 0" fill="url(#b)"/>
-    <path d="m 12 47.894531 c 0.496094 0.015625 37 0 37 0 c 0 -12.816406 -11.84375 -23.894531 -12 -31.894531 h -13 c 0 8 -12.003906 19.078125 -12 31.894531 z m 0 0" fill="url(#c)"/>
-    <path d="m 79 112 h -30 v 4 h 30 z m 0 0" fill="#c0bfbc"/>
-    <path d="m 54 18.941406 v 5.058594 h 20 v -5.058594 z m 0 0" fill="url(#e)"/>
-    <path d="m 64 56.035156 c -7.5 0 -7.5 9.457032 -7.5 9.457032 h -7.5 v 14.46875 h 30 v -14.46875 h -7.5 s 0 -9.457032 -7.5 -9.457032 z m 0 2 s 5.453125 6.652344 3.457031 9.941406 c -1.996093 3.289063 -4.921875 3.289063 -6.917969 0 c -1.996093 -3.289062 3.460938 -9.941406 3.460938 -9.941406 z m 0 0" fill="url(#f)"/>
-    <path d="m 49 112 h -29.574219 c -0.125 0 -0.253906 -0.003906 -0.378906 -0.011719 c -0.128906 -0.003906 -0.253906 -0.015625 -0.378906 -0.03125 c -0.128907 -0.011719 -0.25 -0.027343 -0.375 -0.050781 c -0.125 -0.019531 -0.242188 -0.042969 -0.367188 -0.070312 c -0.121093 -0.023438 -0.242187 -0.054688 -0.359375 -0.089844 c -0.117187 -0.03125 -0.234375 -0.066406 -0.351562 -0.105469 c -0.234375 -0.078125 -0.460938 -0.167969 -0.683594 -0.269531 c -0.222656 -0.097656 -0.441406 -0.210938 -0.652344 -0.335938 c -0.207031 -0.121094 -0.410156 -0.253906 -0.609375 -0.398437 s -0.390625 -0.296875 -0.570312 -0.460938 c -0.183594 -0.160156 -0.363281 -0.332031 -0.527344 -0.515625 c -0.167969 -0.179687 -0.328125 -0.371094 -0.480469 -0.566406 c -0.152344 -0.199219 -0.292968 -0.402344 -0.425781 -0.617188 c -0.132813 -0.210937 -0.257813 -0.429687 -0.371094 -0.65625 c -0.113281 -0.226562 -0.21875 -0.460937 -0.3125 -0.703124 c -0.09375 -0.238282 -0.179687 -0.480469 -0.25 -0.734376 c -0.070312 -0.25 -0.132812 -0.503906 -0.179687 -0.765624 c -0.050782 -0.261719 -0.089844 -0.527344 -0.113282 -0.796876 c -0.023437 -0.269531 -0.039062 -0.542968 -0.039062 -0.820312 v 3.582031 v 0.003907 c 0 0.289062 0.015625 0.578124 0.042969 0.859374 v 0.003907 c 0.027343 0.28125 0.070312 0.558593 0.125 0.832031 c 0.050781 0.273438 0.121093 0.542969 0.199219 0.804688 v 0.003906 c 0.078124 0.261718 0.171874 0.515625 0.273437 0.769531 c 0.101563 0.25 0.21875 0.496094 0.347656 0.734375 c 0.375 0.710938 0.851563 1.363281 1.40625 1.933594 c 1.480469 1.519531 3.527344 2.460937 5.800781 2.472656 h 28.804688 z m 0 0" fill="#e66100"/>
-    <path d="m 21.40625 24 c -0.003906 0.003906 -0.007812 0.007812 -0.011719 0.011719 c -3.53125 6.804687 -9.398437 14.914062 -9.394531 23.878906 v 56.109375 c 0 0.277344 0.015625 0.550781 0.039062 0.820312 c 0.023438 0.269532 0.0625 0.535157 0.109376 0.796876 c 0.050781 0.261718 0.113281 0.515624 0.183593 0.769531 c 0.070313 0.25 0.15625 0.492187 0.25 0.730469 c 0.09375 0.242187 0.199219 0.476562 0.3125 0.703124 c 0.113281 0.226563 0.238281 0.445313 0.371094 0.660157 c 0.132813 0.210937 0.273437 0.414062 0.425781 0.613281 s 0.3125 0.386719 0.476563 0.570312 c 0.167969 0.179688 0.347656 0.351563 0.527343 0.511719 c 0.183594 0.164063 0.375 0.316407 0.574219 0.460938 s 0.402344 0.277343 0.609375 0.402343 c 0.210938 0.121094 0.429688 0.234376 0.652344 0.335938 c 0.222656 0.097656 0.449219 0.1875 0.683594 0.265625 c 0.117187 0.039063 0.234375 0.074219 0.351562 0.109375 c 0.117188 0.03125 0.238282 0.0625 0.359375 0.085938 c 0.125 0.027343 0.242188 0.050781 0.367188 0.070312 c 0.125 0.023438 0.246093 0.039062 0.371093 0.050781 c 0.128907 0.015625 0.253907 0.027344 0.378907 0.03125 c 0.128906 0.007813 0.257812 0.011719 0.382812 0.011719 h 29.574219 v -64.109375 c 0 -8.964844 -5.789062 -17.074219 -9.324219 -23.878906 c -0.003906 -0.003907 -0.007812 -0.007813 -0.011719 -0.011719 z m 0 0" fill="url(#g)"/>
-    <path d="m 87 36.945312 c -4.253906 2.078126 -8 6.710938 -8 11.527344 v 67.527344 h 28.804688 c 4.542968 -0.019531 8.195312 -3.765625 8.195312 -8.414062 v -59.113282 c 0 -4.828125 -3.730469 -9.453125 -8 -11.527344 z m 0 0" fill="url(#h)"/>
-    <path d="m 24 12 h 13 v 4 h -13 z m 0 0" fill="url(#i)"/>
-    <path d="m 116 104 c 0 4.433594 -3.3125 8 -7.425781 8 h -29.574219 v 4 h 28.804688 c 4.542968 -0.019531 8.195312 -3.765625 8.195312 -8.414062 z m 0 0" fill="#c01c28"/>
-    <path d="m 87 34.945312 h 21 v 2.03125 h -21 z m 0 0" fill="url(#j)"/>
-    <path d="m 87 28 h 21 v 6.945312 h -21 z m 0 0" fill="url(#l)"/>
-    <path d="m 104 99.492188 h 12 v 4.507812 h -12 z m 0 0" fill="url(#m)"/>
-    <path d="m 30.5 54 c -5.523438 0 -10 4.476562 -10 10 s 4.476562 10 10 10 s 10 -4.476562 10 -10 s -4.476562 -10 -10 -10 z m 0 0" fill="#33d17a" fill-opacity="0.854902"/>
-    <g clip-path="url(#u)" mask="url(#q)">
-        <g clip-path="url(#t)" mask="url(#r)">
-            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#s)"/>
-            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/icons/hicolor/48/apps/com.usebottles.bottles.svg b/data/icons/hicolor/48/apps/com.usebottles.bottles.svg
deleted file mode 100644
index 55e6ad5c40b..00000000000
--- a/data/icons/hicolor/48/apps/com.usebottles.bottles.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="49" x2="79" y1="67.999878" y2="67.999878">
-        <stop offset="0" stop-color="#deddda"/>
-        <stop offset="0.25" stop-color="#f6f5f4"/>
-        <stop offset="0.75" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#deddda" stop-opacity="0.854902"/>
-    </linearGradient>
-    <linearGradient id="b" gradientTransform="matrix(1.002882 0 0 1 -0.141199 0)" gradientUnits="userSpaceOnUse" x1="49" x2="79" y1="31.453125" y2="31.453125">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.25" stop-color="#deddda"/>
-        <stop offset="0.75" stop-color="#f6f5f4"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="12" x2="49" y1="42.916992" y2="42.916992">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.25" stop-color="#deddda"/>
-        <stop offset="0.75" stop-color="#deddda"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="d" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#1a5fb4"/>
-        <stop offset="0.25" stop-color="#1c71d8"/>
-        <stop offset="0.75" stop-color="#3584e4"/>
-        <stop offset="1" stop-color="#1a5fb4"/>
-    </linearGradient>
-    <linearGradient id="e" x1="49.000001" x2="78.999997" xlink:href="#d" y1="21.471176" y2="21.471176"/>
-    <linearGradient id="f" x1="49.000114" x2="79.000107" xlink:href="#d" y1="67.999875" y2="67.999875"/>
-    <linearGradient id="g" gradientUnits="userSpaceOnUse" x1="12.000113" x2="49.000111" y1="74.969727" y2="74.969727">
-        <stop offset="0" stop-color="#ffa348"/>
-        <stop offset="0.25" stop-color="#ffbe6f"/>
-        <stop offset="0.75" stop-color="#ffbe6f"/>
-        <stop offset="1" stop-color="#ffa348"/>
-    </linearGradient>
-    <linearGradient id="h" gradientUnits="userSpaceOnUse" x1="79.00045" x2="116.000443" y1="75.564209" y2="75.564209">
-        <stop offset="0" stop-color="#e01b24"/>
-        <stop offset="0.25" stop-color="#ed333b"/>
-        <stop offset="0.75" stop-color="#f66151"/>
-        <stop offset="1" stop-color="#e01b24"/>
-    </linearGradient>
-    <linearGradient id="i" gradientUnits="userSpaceOnUse" x1="24" x2="37" y1="14" y2="14">
-        <stop offset="0" stop-color="#33d17a"/>
-        <stop offset="0.388454" stop-color="#57e389"/>
-        <stop offset="0.75" stop-color="#57e389"/>
-        <stop offset="1" stop-color="#2ec27e" stop-opacity="0.854902"/>
-    </linearGradient>
-    <linearGradient id="j" gradientUnits="userSpaceOnUse" x1="79" x2="116" y1="35.961914" y2="35.961914">
-        <stop offset="0" stop-color="#3d3846"/>
-        <stop offset="0.25" stop-color="#5e5c64"/>
-        <stop offset="0.75" stop-color="#77767b"/>
-        <stop offset="1" stop-color="#77767b"/>
-    </linearGradient>
-    <linearGradient id="k" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#9a9996"/>
-        <stop offset="0.25" stop-color="#c0bfbc"/>
-        <stop offset="0.75" stop-color="#deddda"/>
-        <stop offset="1" stop-color="#9a9996"/>
-    </linearGradient>
-    <linearGradient id="l" x1="79" x2="116" xlink:href="#k" y1="31.472427" y2="31.472427"/>
-    <linearGradient id="m" gradientTransform="matrix(0.999963 0 0 0.814473 0.003815 -120.794434)" x1="78.999084" x2="116.000443" xlink:href="#k" y1="273.23233" y2="273.23233"/>
-    <path d="m 54.546875 24 s -5.546875 13.609375 -5.546875 14.515625 v 73.484375 h 30 v -73.488281 c 0 0.003906 -5 -14.511719 -5 -14.511719 z m 0 0" fill="url(#a)"/>
-    <path d="m 54 24 s -5 13.609375 -5 14.511719 h 30 c 0 -0.488281 -5 -14.511719 -5 -14.511719 z m 0 0" fill="url(#b)"/>
-    <path d="m 12 47.894531 c 0.496094 0.015625 37 0 37 0 c 0 -12.816406 -11.84375 -23.894531 -12 -31.894531 h -13 c 0 8 -12.003906 19.078125 -12 31.894531 z m 0 0" fill="url(#c)"/>
-    <path d="m 79 112 h -30 v 4 h 30 z m 0 0" fill="#c0bfbc"/>
-    <path d="m 54 18.941406 v 5.058594 h 20 v -5.058594 z m 0 0" fill="url(#e)"/>
-    <path d="m 64 56.035156 c -7.5 0 -7.5 9.457032 -7.5 9.457032 h -7.5 v 14.46875 h 30 v -14.46875 h -7.5 s 0 -9.457032 -7.5 -9.457032 z m 0 2 s 5.453125 6.652344 3.457031 9.941406 c -1.996093 3.289063 -4.921875 3.289063 -6.917969 0 c -1.996093 -3.289062 3.460938 -9.941406 3.460938 -9.941406 z m 0 0" fill="url(#f)"/>
-    <path d="m 49 112 h -29.574219 c -0.125 0 -0.253906 -0.003906 -0.378906 -0.011719 c -0.128906 -0.003906 -0.253906 -0.015625 -0.378906 -0.03125 c -0.128907 -0.011719 -0.25 -0.027343 -0.375 -0.050781 c -0.125 -0.019531 -0.242188 -0.042969 -0.367188 -0.070312 c -0.121093 -0.023438 -0.242187 -0.054688 -0.359375 -0.089844 c -0.117187 -0.03125 -0.234375 -0.066406 -0.351562 -0.105469 c -0.234375 -0.078125 -0.460938 -0.167969 -0.683594 -0.269531 c -0.222656 -0.097656 -0.441406 -0.210938 -0.652344 -0.335938 c -0.207031 -0.121094 -0.410156 -0.253906 -0.609375 -0.398437 s -0.390625 -0.296875 -0.570312 -0.460938 c -0.183594 -0.160156 -0.363281 -0.332031 -0.527344 -0.515625 c -0.167969 -0.179687 -0.328125 -0.371094 -0.480469 -0.566406 c -0.152344 -0.199219 -0.292968 -0.402344 -0.425781 -0.617188 c -0.132813 -0.210937 -0.257813 -0.429687 -0.371094 -0.65625 c -0.113281 -0.226562 -0.21875 -0.460937 -0.3125 -0.703124 c -0.09375 -0.238282 -0.179687 -0.480469 -0.25 -0.734376 c -0.070312 -0.25 -0.132812 -0.503906 -0.179687 -0.765624 c -0.050782 -0.261719 -0.089844 -0.527344 -0.113282 -0.796876 c -0.023437 -0.269531 -0.039062 -0.542968 -0.039062 -0.820312 v 3.582031 v 0.003907 c 0 0.289062 0.015625 0.578124 0.042969 0.859374 v 0.003907 c 0.027343 0.28125 0.070312 0.558593 0.125 0.832031 c 0.050781 0.273438 0.121093 0.542969 0.199219 0.804688 v 0.003906 c 0.078124 0.261718 0.171874 0.515625 0.273437 0.769531 c 0.101563 0.25 0.21875 0.496094 0.347656 0.734375 c 0.375 0.710938 0.851563 1.363281 1.40625 1.933594 c 1.480469 1.519531 3.527344 2.460937 5.800781 2.472656 h 28.804688 z m 0 0" fill="#e66100"/>
-    <path d="m 21.40625 24 c -0.003906 0.003906 -0.007812 0.007812 -0.011719 0.011719 c -3.53125 6.804687 -9.398437 14.914062 -9.394531 23.878906 v 56.109375 c 0 0.277344 0.015625 0.550781 0.039062 0.820312 c 0.023438 0.269532 0.0625 0.535157 0.109376 0.796876 c 0.050781 0.261718 0.113281 0.515624 0.183593 0.769531 c 0.070313 0.25 0.15625 0.492187 0.25 0.730469 c 0.09375 0.242187 0.199219 0.476562 0.3125 0.703124 c 0.113281 0.226563 0.238281 0.445313 0.371094 0.660157 c 0.132813 0.210937 0.273437 0.414062 0.425781 0.613281 s 0.3125 0.386719 0.476563 0.570312 c 0.167969 0.179688 0.347656 0.351563 0.527343 0.511719 c 0.183594 0.164063 0.375 0.316407 0.574219 0.460938 s 0.402344 0.277343 0.609375 0.402343 c 0.210938 0.121094 0.429688 0.234376 0.652344 0.335938 c 0.222656 0.097656 0.449219 0.1875 0.683594 0.265625 c 0.117187 0.039063 0.234375 0.074219 0.351562 0.109375 c 0.117188 0.03125 0.238282 0.0625 0.359375 0.085938 c 0.125 0.027343 0.242188 0.050781 0.367188 0.070312 c 0.125 0.023438 0.246093 0.039062 0.371093 0.050781 c 0.128907 0.015625 0.253907 0.027344 0.378907 0.03125 c 0.128906 0.007813 0.257812 0.011719 0.382812 0.011719 h 29.574219 v -64.109375 c 0 -8.964844 -5.789062 -17.074219 -9.324219 -23.878906 c -0.003906 -0.003907 -0.007812 -0.007813 -0.011719 -0.011719 z m 0 0" fill="url(#g)"/>
-    <path d="m 87 36.945312 c -4.253906 2.078126 -8 6.710938 -8 11.527344 v 67.527344 h 28.804688 c 4.542968 -0.019531 8.195312 -3.765625 8.195312 -8.414062 v -59.113282 c 0 -4.828125 -3.730469 -9.453125 -8 -11.527344 z m 0 0" fill="url(#h)"/>
-    <path d="m 24 12 h 13 v 4 h -13 z m 0 0" fill="url(#i)"/>
-    <path d="m 116 104 c 0 4.433594 -3.3125 8 -7.425781 8 h -29.574219 v 4 h 28.804688 c 4.542968 -0.019531 8.195312 -3.765625 8.195312 -8.414062 z m 0 0" fill="#c01c28"/>
-    <path d="m 87 34.945312 h 21 v 2.03125 h -21 z m 0 0" fill="url(#j)"/>
-    <path d="m 87 28 h 21 v 6.945312 h -21 z m 0 0" fill="url(#l)"/>
-    <path d="m 104 99.492188 h 12 v 4.507812 h -12 z m 0 0" fill="url(#m)"/>
-    <path d="m 30.5 54 c -5.523438 0 -10 4.476562 -10 10 s 4.476562 10 10 10 s 10 -4.476562 10 -10 s -4.476562 -10 -10 -10 z m 0 0" fill="#33d17a" fill-opacity="0.854902"/>
-</svg>
diff --git a/data/icons/hicolor/48/apps/com.usebottles.bottles_old.svg b/data/icons/hicolor/48/apps/com.usebottles.bottles_old.svg
deleted file mode 100644
index c6620b530a4..00000000000
--- a/data/icons/hicolor/48/apps/com.usebottles.bottles_old.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="52" x2="76" y1="76.608017" y2="76.576218">
-        <stop offset="0" stop-color="#e66100"/>
-        <stop offset="0.133866" stop-color="#ff7800"/>
-        <stop offset="0.73326" stop-color="#ffbe6f"/>
-        <stop offset="1" stop-color="#ffa348"/>
-    </linearGradient>
-    <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="58" x2="71" y1="30" y2="30">
-        <stop offset="0" stop-color="#deddda"/>
-        <stop offset="0.388454" stop-color="#deddda"/>
-        <stop offset="0.75" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#deddda"/>
-    </linearGradient>
-    <linearGradient id="c" gradientTransform="matrix(1 0 0 1.5 -4 -273.999992)" gradientUnits="userSpaceOnUse" x1="55.071999" x2="80" y1="232.13208" y2="232">
-        <stop offset="0" stop-color="#9a9996"/>
-        <stop offset="0.15611" stop-color="#c0bfbc"/>
-        <stop offset="0.356461" stop-color="#deddda"/>
-        <stop offset="0.650737" stop-color="#deddda"/>
-        <stop offset="0.910869" stop-color="#c0bfbc"/>
-        <stop offset="1" stop-color="#9a9996"/>
-    </linearGradient>
-    <linearGradient id="d" gradientUnits="userSpaceOnUse" x1="22" x2="52" y1="84" y2="84">
-        <stop offset="0" stop-color="#a51d2d"/>
-        <stop offset="0.4" stop-color="#c01c28"/>
-        <stop offset="0.679906" stop-color="#ed333b"/>
-        <stop offset="1" stop-color="#c01c28"/>
-    </linearGradient>
-    <linearGradient id="e" gradientTransform="matrix(1.125 0 0 1 -2 -172)" gradientUnits="userSpaceOnUse" x1="35" x2="48" y1="255" y2="255">
-        <stop offset="0"/>
-        <stop offset="1" stop-color="#241f31"/>
-    </linearGradient>
-    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="83.998185" x2="107.007043" y1="64" y2="63.881378">
-        <stop offset="0" stop-color="#26a269"/>
-        <stop offset="0.724253" stop-color="#33d17a"/>
-        <stop offset="1" stop-color="#26a269"/>
-    </linearGradient>
-    <linearGradient id="g" gradientUnits="userSpaceOnUse" x1="76" x2="108" y1="92" y2="92">
-        <stop offset="0" stop-color="#e5a50a"/>
-        <stop offset="0.375" stop-color="#f6d32d"/>
-        <stop offset="0.753674" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#e5a50a"/>
-    </linearGradient>
-    <linearGradient id="h" gradientUnits="userSpaceOnUse" x1="86" x2="98" y1="40" y2="40">
-        <stop offset="0" stop-color="#e5a50a"/>
-        <stop offset="0.43357" stop-color="#f6d32d"/>
-        <stop offset="0.753674" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#e5a50a"/>
-    </linearGradient>
-    <linearGradient id="i" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#241f31" stop-opacity="0"/>
-        <stop offset="0.666667" stop-color="#77767b"/>
-        <stop offset="1" stop-color="#241f31" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient id="j" x1="28" x2="42" xlink:href="#i" y1="37" y2="37"/>
-    <linearGradient id="k" x1="28" x2="42" xlink:href="#i" y1="41" y2="41"/>
-    <linearGradient id="l" x1="28" x2="42" xlink:href="#i" y1="45" y2="45"/>
-    <linearGradient id="m" x1="28" x2="42" xlink:href="#i" y1="49" y2="49"/>
-    <linearGradient id="n" x1="28" x2="42" xlink:href="#i" y1="53" y2="53"/>
-    <path d="m 60 25.828125 c -0.046875 0.507813 -0.125 0.976563 -0.203125 1.433594 c 0.082031 -0.453125 0.15625 -0.925781 0.203125 -1.433594 z m 8 0 c 0.046875 0.496094 0.117188 0.957031 0.199219 1.402344 c -0.078125 -0.449219 -0.152344 -0.90625 -0.199219 -1.402344 z m -8.277344 1.839844 c -0.066406 0.328125 -0.152344 0.640625 -0.234375 0.945312 c 0.085938 -0.304687 0.164063 -0.617187 0.234375 -0.945312 z m -4.613281 7.707031 c -1.660156 1.523438 -3.109375 2.671875 -3.109375 4.625 v 76 h 24 v -76 c 0 -1.953125 -1.449219 -3.101562 -3.109375 -4.625 z m 0 0" fill="url(#a)"/>
-    <path d="m 60 22 v 3.828125 c -0.503906 5.253906 -3.652344 8.207031 -5.5625 10.160156 l 19.105469 -0.019531 c -1.847657 -1.988281 -5.039063 -4.886719 -5.542969 -10.140625 v -3.828125 z m 0 0" fill="url(#b)"/>
-    <path d="m 52 112 h 24 v 4 h -24 z m 0 0" fill="#c64600"/>
-    <path d="m 60 8 v 14 h 8 v -14 z m 0 0" fill="#a51d2d"/>
-    <path d="m 60 4.496094 v 4 h 8 v -4 z m 0 0"/>
-    <path d="m 52 56 h 24 v 36 h -24 z m 0 0" fill="url(#c)"/>
-    <path d="m 56 64 v 12 h 16 v -4 h -4 v -4 h -4 v -4 z m 0 0" fill-opacity="0.386307"/>
-    <path d="m 30 32 v 24 h -3 c -3.324219 0 -6 2.429688 -6 5.445312 v 54.554688 h 31 v -54.554688 c 0 -3.015624 -2.675781 -5.445312 -6 -5.445312 h -4 v -24 z m 0 0" fill="url(#d)"/>
-    <path d="m 21 112 h 31 v 4 h -31 z m 0 0" fill="#72141f"/>
-    <path d="m 30 32 h 12 v 24 h -12 z m 0 0" fill="#3d3846"/>
-    <path d="m 34 72 h 18 v 24 h -18 z m 0 0" fill="url(#e)"/>
-    <path d="m 30 30 h 12 v 4 h -12 z m 0 0" fill="#241f31"/>
-    <path d="m 76 72 h 24 v 44 h -24 z m 0 0" fill="#2ec27e"/>
-    <path d="m 88 52 s -12 2 -12 20 h 32 c 0 -18 -12 -20 -12 -20 z m -12 60 v 4 h 32 v -4 z m 0 0" fill="#26a269"/>
-    <path d="m 88 52 s -12 2 -12 20 h 32 c 0 -18 -12 -20 -12 -20 z m -12 60 v 4 h 32 v -4 z m 0 0" fill="url(#f)"/>
-    <path d="m 76 72 h 32 v 40 h -32 z m 0 0" fill="url(#g)"/>
-    <path d="m 86 24 c -0.148438 7.816406 0.472656 10.894531 2 14 v 14 h 8 v -14 c 1.863281 -3.203125 2.09375 -8.296875 2 -14 z m 0 0" fill="url(#h)"/>
-    <path d="m 30 36 h 12 v 2 h -12 z m 0 0" fill="url(#j)"/>
-    <path d="m 30 40 h 12 v 2 h -12 z m 0 0" fill="url(#k)"/>
-    <path d="m 30 44 h 12 v 2 h -12 z m 0 0" fill="url(#l)"/>
-    <path d="m 30 48 h 12 v 2 h -12 z m 0 0" fill="url(#m)"/>
-    <path d="m 30 52 h 12 v 2 h -12 z m 0 0" fill="url(#n)"/>
-    <path d="m 86 24 v 4 h 12 v -4 z m 0 0" fill="#c89008" fill-opacity="0.545226"/>
-    <path d="m 76 72 v 4 h 32 v -4 z m 0 0" fill="#c89008" fill-opacity="0.545226"/>
-    <path d="m 76 112 h 32 v 4 h -32 z m 0 0" fill="#124e33"/>
-</svg>
diff --git a/data/icons/symbolic/scalable/actions/application-x-addon-symbolic.svg b/data/icons/hicolor/symbolic/actions/application-x-addon-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/application-x-addon-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/application-x-addon-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/applications-system-symbolic.svg b/data/icons/hicolor/symbolic/actions/applications-system-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/applications-system-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/applications-system-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/computer-symbolic.svg b/data/icons/hicolor/symbolic/actions/computer-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/computer-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/computer-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/document-save-symbolic.svg b/data/icons/hicolor/symbolic/actions/document-save-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/document-save-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/document-save-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/external-link-symbolic.svg b/data/icons/hicolor/symbolic/actions/external-link-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/external-link-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/external-link-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/go-next-symbolic.svg b/data/icons/hicolor/symbolic/actions/go-next-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/go-next-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/go-next-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/go-previous-symbolic.svg b/data/icons/hicolor/symbolic/actions/go-previous-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/go-previous-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/go-previous-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/info-symbolic.svg b/data/icons/hicolor/symbolic/actions/info-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/info-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/info-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/library-symbolic.svg b/data/icons/hicolor/symbolic/actions/library-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/library-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/library-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/list-add-symbolic.svg b/data/icons/hicolor/symbolic/actions/list-add-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/list-add-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/list-add-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/media-playback-start-symbolic.svg b/data/icons/hicolor/symbolic/actions/media-playback-start-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/media-playback-start-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/media-playback-start-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/media-playback-stop-symbolic.svg b/data/icons/hicolor/symbolic/actions/media-playback-stop-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/media-playback-stop-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/media-playback-stop-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/open-menu-symbolic.svg b/data/icons/hicolor/symbolic/actions/open-menu-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/open-menu-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/open-menu-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/paper-symbolic.svg b/data/icons/hicolor/symbolic/actions/paper-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/paper-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/paper-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/preferences-desktop-apps-symbolic.svg b/data/icons/hicolor/symbolic/actions/preferences-desktop-apps-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/preferences-desktop-apps-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/preferences-desktop-apps-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/preferences-system-time-symbolic.svg b/data/icons/hicolor/symbolic/actions/preferences-system-time-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/preferences-system-time-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/preferences-system-time-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/selection-mode-symbolic.svg b/data/icons/hicolor/symbolic/actions/selection-mode-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/selection-mode-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/selection-mode-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/system-run-symbolic.svg b/data/icons/hicolor/symbolic/actions/system-run-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/system-run-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/system-run-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/system-search-symbolic.svg b/data/icons/hicolor/symbolic/actions/system-search-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/system-search-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/system-search-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/system-shutdown-symbolic.svg b/data/icons/hicolor/symbolic/actions/system-shutdown-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/system-shutdown-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/system-shutdown-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/system-software-install-symbolic.svg b/data/icons/hicolor/symbolic/actions/system-software-install-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/system-software-install-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/system-software-install-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/view-more-symbolic.svg b/data/icons/hicolor/symbolic/actions/view-more-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/view-more-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/view-more-symbolic.svg
diff --git a/data/icons/symbolic/scalable/actions/warning-symbolic.svg b/data/icons/hicolor/symbolic/actions/warning-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/actions/warning-symbolic.svg
rename to data/icons/hicolor/symbolic/actions/warning-symbolic.svg
diff --git a/data/icons/symbolic/scalable/apps/bottle-symbolic.svg b/data/icons/hicolor/symbolic/apps/bottle-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/apps/bottle-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/bottle-symbolic.svg
diff --git a/data/icons/symbolic/scalable/apps/bottles-steam-symbolic.svg b/data/icons/hicolor/symbolic/apps/bottles-steam-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/apps/bottles-steam-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/bottles-steam-symbolic.svg
diff --git a/data/icons/symbolic/48/apps/com.usebottles.bottles-symbolic.svg b/data/icons/hicolor/symbolic/apps/com.usebottles.bottles-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/48/apps/com.usebottles.bottles-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/com.usebottles.bottles-symbolic.svg
diff --git a/data/icons/symbolic/scalable/apps/com.usebottles.bottles-symbolic.svg b/data/icons/hicolor/symbolic/apps/com.usebottles.bottles.Devel-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/scalable/apps/com.usebottles.bottles-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/com.usebottles.bottles.Devel-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 00000000000..d9f3f0383b8
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1,11 @@
+scalable_dir = 'hicolor' / 'scalable' / 'apps'
+install_data(
+  scalable_dir / ('@0@.svg').format(APP_ID),
+  install_dir: get_option('datadir') / 'icons' / scalable_dir
+)
+
+symbolic_dir = 'hicolor' / 'symbolic' / 'apps'
+install_data(
+  symbolic_dir / ('@0@-symbolic.svg').format(APP_ID),
+  install_dir: get_option('datadir') / 'icons' / symbolic_dir
+)
diff --git a/data/meson.build b/data/meson.build
index 8dd51eaa372..29545befa72 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -36,6 +36,13 @@ appstream_file = i18n.merge_file(
   install_dir: get_option('datadir') / 'metainfo'
 )
 
+gnome.compile_resources('data',
+  'data.gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir
+)
+
 appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
   test('Validate appstream file', appstream_util,
@@ -54,27 +61,4 @@ if compile_schemas.found()
   )
 endif
 
-install_data(
-    join_paths('icons/hicolor/scalable/apps', APP_ID + '.' + 'svg'),
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/scalable/apps')
-)
-
-install_data(
-    join_paths('icons/symbolic/scalable/apps/com.usebottles.bottles-symbolic.svg'),
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/symbolic/apps')
-)
-
-install_data(
-    join_paths('icons/hicolor/scalable/apps/com.usebottles.bottles-program.svg'),
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/scalable/apps')
-)
-
-install_data(
-    join_paths('icons/symbolic/scalable/apps/bottle-symbolic.svg'),
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/symbolic/apps')
-)
-
-install_data(
-    join_paths('icons/symbolic/scalable/apps/bottles-steam-symbolic.svg'),
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/symbolic/apps')
-)
\ No newline at end of file
+subdir('icons')
\ No newline at end of file