From c134b3ede79e21bc7064b7058f9b4c3b41b5433d Mon Sep 17 00:00:00 2001
From: Darin <newhoa@protonmail.com>
Date: Sat, 11 May 2024 22:44:24 -0400
Subject: [PATCH] Improve FreeDesktop Icon Spec compliance

Move some icons from Apps to Categories to more closely
adhere to the FreeDesktop.org Icon Naming Specification.
Adjusted network-offline from symlink to icon for same reason.

Resymlinked symlinks that pointed to the above icons where needed.

Added missing category icons at 96px.
Fixed inconsistencies with system-lock-screen at 22px and software-install symbolic.

https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
---
 .../actions/22/system-lock-screen.svg         | 177 +++++++-
 .../symbolic/process-working-symbolic.svg     |   0
 .../apps/128/org.xfce.settings.manager.svg    |   2 +-
 .../apps/128/org.xfce.settings.mouse.svg      |   2 +-
 .../apps/16/org.xfce.settings.manager.svg     |   2 +-
 .../apps/16/org.xfce.settings.mouse.svg       |   2 +-
 .../apps/22/org.xfce.settings.manager.svg     |   2 +-
 .../apps/22/org.xfce.settings.mouse.svg       |   2 +-
 .../apps/24/org.xfce.settings.manager.svg     |   2 +-
 .../apps/24/org.xfce.settings.mouse.svg       |   2 +-
 .../apps/32/org.xfce.settings.manager.svg     |   2 +-
 .../apps/32/org.xfce.settings.mouse.svg       |   2 +-
 .../apps/48/org.xfce.settings.manager.svg     |   2 +-
 .../apps/48/org.xfce.settings.mouse.svg       |   2 +-
 .../apps/64/org.xfce.settings.manager.svg     |   2 +-
 .../apps/64/org.xfce.settings.mouse.svg       |   1 +
 .../apps/96/org.xfce.settings.manager.svg     |   1 +
 .../apps/96/org.xfce.settings.mouse.svg       |   1 +
 .../system-software-install-symbolic.svg      |  54 ++-
 .../128/applications-engineering.svg          |   1 +
 .../categories/128/gtk-preferences.svg        |   2 +-
 .../128/preferences-desktop-peripherals.svg   |   0
 .../128/preferences-desktop-personal.svg      | 155 +++++++
 .../128/preferences-desktop.svg               |   0
 .../128/preferences-system-network.svg        |   0
 .../16/applications-engineering.svg           |   1 +
 .../categories/16/gtk-preferences.svg         |   2 +-
 .../16/preferences-desktop-peripherals.svg    |   0
 .../16/preferences-desktop-personal.svg       | 148 ++++++
 .../16/preferences-desktop.svg                |   0
 .../16/preferences-system-network.svg         |   0
 .../22/applications-engineering.svg           |   1 +
 .../categories/22/gtk-preferences.svg         |   2 +-
 .../22/preferences-desktop-peripherals.svg    |   0
 .../22/preferences-desktop-personal.svg       | 154 +++++++
 .../22/preferences-desktop.svg                |   0
 .../22/preferences-system-network.svg         |   0
 .../24/applications-engineering.svg           |   1 +
 .../categories/24/gtk-preferences.svg         |   2 +-
 .../24/preferences-desktop-peripherals.svg    |   0
 .../24/preferences-desktop-personal.svg       | 152 +++++++
 .../24/preferences-desktop.svg                |   0
 .../24/preferences-system-network.svg         |   0
 .../32/applications-engineering.svg           |   1 +
 .../categories/32/gtk-preferences.svg         |   2 +-
 .../32/preferences-desktop-peripherals.svg    |   0
 .../32/preferences-desktop-personal.svg       | 152 +++++++
 .../32/preferences-desktop.svg                |   0
 .../32/preferences-system-network.svg         |   0
 .../48/applications-engineering.svg           |   1 +
 .../categories/48/gtk-preferences.svg         |   2 +-
 .../48/preferences-desktop-peripherals.svg    |   0
 .../48/preferences-desktop-personal.svg       | 156 +++++++
 .../48/preferences-desktop.svg                |   0
 .../48/preferences-system-network.svg         |   0
 .../64/applications-engineering.svg           |   1 +
 .../categories/64/gtk-preferences.svg         |   2 +-
 .../64/preferences-desktop-peripherals.svg    |   1 +
 .../64/preferences-desktop-personal.svg       | 164 +++++++
 .../64/preferences-desktop.svg                |   0
 .../64/preferences-system-network.svg         |   0
 .../96/applications-engineering.svg           |   1 +
 .../96/gtk-preferences.svg}                   |   0
 .../96/preferences-desktop-peripherals.svg    |   1 +
 .../96/preferences-desktop-personal.svg       | 154 +++++++
 .../categories/96/preferences-desktop.svg     | 326 ++++++++++++++
 .../96/preferences-system-network.svg         | 423 ++++++++++++++++++
 .../preferences-desktop-personal-symbolic.svg |   7 +
 elementary-xfce/status/128/avatar-default.svg | 156 +------
 elementary-xfce/status/16/avatar-default.svg  | 149 +-----
 elementary-xfce/status/16/network-offline.svg |  58 ++-
 .../status/16/network-wireless-offline.svg    |  58 +--
 elementary-xfce/status/22/avatar-default.svg  | 155 +------
 elementary-xfce/status/24/avatar-default.svg  | 153 +------
 elementary-xfce/status/32/avatar-default.svg  | 153 +------
 elementary-xfce/status/48/avatar-default.svg  | 157 +------
 elementary-xfce/status/64/avatar-default.svg  | 165 +------
 .../symbolic/avatar-default-symbolic.svg      |   8 +-
 .../symbolic/network-offline-symbolic.svg     |  58 ++-
 .../network-wireless-offline-symbolic.svg     |  58 +--
 80 files changed, 2373 insertions(+), 1230 deletions(-)
 mode change 120000 => 100644 elementary-xfce/actions/22/system-lock-screen.svg
 rename elementary-xfce/{status => animations}/symbolic/process-working-symbolic.svg (100%)
 create mode 120000 elementary-xfce/apps/64/org.xfce.settings.mouse.svg
 create mode 120000 elementary-xfce/apps/96/org.xfce.settings.manager.svg
 create mode 120000 elementary-xfce/apps/96/org.xfce.settings.mouse.svg
 create mode 120000 elementary-xfce/categories/128/applications-engineering.svg
 rename elementary-xfce/{apps => categories}/128/preferences-desktop-peripherals.svg (100%)
 create mode 100644 elementary-xfce/categories/128/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/128/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/128/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/16/applications-engineering.svg
 rename elementary-xfce/{apps => categories}/16/preferences-desktop-peripherals.svg (100%)
 create mode 100644 elementary-xfce/categories/16/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/16/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/16/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/22/applications-engineering.svg
 rename elementary-xfce/{apps => categories}/22/preferences-desktop-peripherals.svg (100%)
 create mode 100644 elementary-xfce/categories/22/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/22/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/22/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/24/applications-engineering.svg
 rename elementary-xfce/{apps => categories}/24/preferences-desktop-peripherals.svg (100%)
 create mode 100644 elementary-xfce/categories/24/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/24/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/24/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/32/applications-engineering.svg
 rename elementary-xfce/{apps => categories}/32/preferences-desktop-peripherals.svg (100%)
 create mode 100644 elementary-xfce/categories/32/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/32/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/32/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/48/applications-engineering.svg
 rename elementary-xfce/{apps => categories}/48/preferences-desktop-peripherals.svg (100%)
 create mode 100644 elementary-xfce/categories/48/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/48/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/48/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/64/applications-engineering.svg
 create mode 120000 elementary-xfce/categories/64/preferences-desktop-peripherals.svg
 create mode 100644 elementary-xfce/categories/64/preferences-desktop-personal.svg
 rename elementary-xfce/{apps => categories}/64/preferences-desktop.svg (100%)
 rename elementary-xfce/{apps => categories}/64/preferences-system-network.svg (100%)
 create mode 120000 elementary-xfce/categories/96/applications-engineering.svg
 rename elementary-xfce/{apps/128/administration.svg => categories/96/gtk-preferences.svg} (100%)
 create mode 120000 elementary-xfce/categories/96/preferences-desktop-peripherals.svg
 create mode 100644 elementary-xfce/categories/96/preferences-desktop-personal.svg
 create mode 100644 elementary-xfce/categories/96/preferences-desktop.svg
 create mode 100644 elementary-xfce/categories/96/preferences-system-network.svg
 create mode 100644 elementary-xfce/categories/symbolic/preferences-desktop-personal-symbolic.svg
 mode change 100644 => 120000 elementary-xfce/status/128/avatar-default.svg
 mode change 100644 => 120000 elementary-xfce/status/16/avatar-default.svg
 mode change 120000 => 100644 elementary-xfce/status/16/network-offline.svg
 mode change 100644 => 120000 elementary-xfce/status/16/network-wireless-offline.svg
 mode change 100644 => 120000 elementary-xfce/status/22/avatar-default.svg
 mode change 100644 => 120000 elementary-xfce/status/24/avatar-default.svg
 mode change 100644 => 120000 elementary-xfce/status/32/avatar-default.svg
 mode change 100644 => 120000 elementary-xfce/status/48/avatar-default.svg
 mode change 100644 => 120000 elementary-xfce/status/64/avatar-default.svg
 mode change 100644 => 120000 elementary-xfce/status/symbolic/avatar-default-symbolic.svg
 mode change 120000 => 100644 elementary-xfce/status/symbolic/network-offline-symbolic.svg
 mode change 100644 => 120000 elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg

diff --git a/elementary-xfce/actions/22/system-lock-screen.svg b/elementary-xfce/actions/22/system-lock-screen.svg
deleted file mode 120000
index 24e587731..000000000
--- a/elementary-xfce/actions/22/system-lock-screen.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/22/locked.svg
\ No newline at end of file
diff --git a/elementary-xfce/actions/22/system-lock-screen.svg b/elementary-xfce/actions/22/system-lock-screen.svg
new file mode 100644
index 000000000..6c37b60f2
--- /dev/null
+++ b/elementary-xfce/actions/22/system-lock-screen.svg
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.2"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:docname="system-lock-screen.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1278"
+     inkscape:window-height="1005"
+     id="namedview27"
+     showgrid="false"
+     inkscape:zoom="16.520833"
+     inkscape:cx="11.076923"
+     inkscape:cy="11.137453"
+     inkscape:window-x="457"
+     inkscape:window-y="105"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4011">
+      <stop
+         id="stop4013"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015-3"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.507761" />
+      <stop
+         id="stop4017-2"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456558" />
+      <stop
+         id="stop4019"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       r="62.769119"
+       fy="185.29727"
+       fx="99.189415"
+       cy="185.29727"
+       cx="99.189415"
+       gradientTransform="matrix(0.3823536,7.5555777e-8,-1.8372241e-8,0.1115198,-5.9254271,36.335849)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3300-8"
+       xlink:href="#linearGradient3820-7-2" />
+    <linearGradient
+       id="linearGradient3820-7-2">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3822-2-6" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3824-1-2" />
+    </linearGradient>
+    <radialGradient
+       r="62.769119"
+       fy="185.29727"
+       fx="99.189415"
+       cy="185.29727"
+       cx="99.189415"
+       gradientTransform="matrix(0.2549024,5.3967361e-8,-1.2248161e-8,0.07965545,6.7163816,44.240666)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4192-6"
+       xlink:href="#linearGradient3820-7-2" />
+    <linearGradient
+       gradientTransform="matrix(0.48648649,0,0,0.48648641,-23.89739,-1.335957)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4011"
+       id="linearGradient3019"
+       y2="44.340794"
+       x2="71.204407"
+       y1="6.2375584"
+       x1="71.204407" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient930"
+       id="linearGradient932"
+       x1="10.860361"
+       y1="3.4072304"
+       x2="10.860361"
+       y2="20.630522"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.05,0,0,1.05,-1.6,-1.599999)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient930">
+      <stop
+         style="stop-color:#9bdb4d;stop-opacity:1"
+         offset="0"
+         id="stop926" />
+      <stop
+         style="stop-color:#68b723;stop-opacity:1"
+         offset="1"
+         id="stop928" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="stroke-width:2.86337"
+     transform="matrix(0.34552847,0,0,0.35298856,-0.0569105,-0.65005397)"
+     id="g4198-4">
+    <path
+       style="opacity:0.2;fill:url(#radialGradient3300-8);fill-opacity:1;stroke:none;stroke-width:2.86337"
+       id="path3818-0-6"
+       d="m 55.999998,57.0017 a 24,6.9985714 0 1 1 -47.9999991,0 24,6.9985714 0 1 1 47.9999991,0 z" />
+    <path
+       d="m 47.999998,59.0017 a 16,4.9988822 0 1 1 -31.999999,0 16,4.9988822 0 1 1 31.999999,0 z"
+       id="path4190-2"
+       style="opacity:0.4;fill:url(#radialGradient4192-6);fill-opacity:1;stroke:none;stroke-width:2.86337" />
+  </g>
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient932);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+     id="path2555"
+     d="M 21,11.000002 C 21,5.4823466 16.517656,1 11,1 5.4823457,1 0.99999775,5.4823466 0.99999975,11.000002 0.99999975,16.517654 5.4823457,21.000006 11,21 c 5.517656,0 10,-4.482346 10,-9.999998 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3019);stroke-width:0.999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path8655"
+     d="m 19.999998,10.999676 c 0,4.970722 -4.029734,9.000318 -8.999888,9.000318 -4.9706054,0 -9.000113,-4.029641 -9.000113,-9.000318 0,-4.9704921 4.0295076,-8.999679 9.000113,-8.999679 4.970154,0 8.999888,4.0291869 8.999888,8.999679 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#206b00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;fill-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+     id="path2555-6"
+     d="M 11.000001,1 C 5.4823467,1 0.99999975,5.4823445 0.99999975,10.999999 c 0,5.517656 4.48234695,10.000003 10.00000125,10.000002 5.517653,0 10.000004,-4.482346 9.999999,-10.000002 C 21,5.4823445 16.517654,1 11.000001,1 Z" />
+  <path
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#206b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.15;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 10.5,5 C 8.8380004,5 8.0000004,6.138 8.0000004,7.7999995 v 2.2 h 1.499984 v -2.167984 c 0,-0.738137 0.5938926,-1.332031 1.3320306,-1.332031 h 0.335969 c 0.738138,0 1.332032,0.593894 1.332032,1.332031 v 2.167984 H 14 v -2.2 C 14,6.138 13.161999,5 11.5,5 Z M 6,9.9999995 V 15 c 0,0.554 0.446,1 1.0000004,1 H 15 c 0.553999,0 1,-0.446 1,-1 V 9.9999995 Z"
+     id="path1754"
+     sodipodi:nodetypes="ssccssssccsssccssccc" />
+  <path
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#206b00;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 10.5,6 C 8.8380004,6 8.0000004,7.138 8.0000004,8.8000005 V 11 h 1.499984 V 8.8320155 c 0,-0.738137 0.5938926,-1.332031 1.3320306,-1.332031 h 0.335969 c 0.738138,0 1.332032,0.593894 1.332032,1.332031 V 11 H 14 V 8.8000005 C 14,7.138 13.161999,6 11.5,6 Z M 6,11 v 5 c 0,0.553999 0.446,1 1.0000004,1 H 15 c 0.553999,0 1,-0.446001 1,-1 v -5 z"
+     id="path995"
+     sodipodi:nodetypes="ssccssssccsssccssccc" />
+  <path
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 10.3,5 C 8.6380004,5 8.0000004,6.138 8.0000004,7.7999995 v 2.2 h 1.499984 v -2.167984 c 0,-0.738137 0.393878,-1.332031 1.1320156,-1.332031 h 0.735992 c 0.738138,0 1.132024,0.593894 1.132024,1.332031 v 2.167984 H 14 v -2.2 C 14,6.138 13.362007,5 11.700008,5 Z M 6,9.9999995 V 15 c 0,0.554 0.446,1 1.0000004,1 H 15 c 0.553999,0 1,-0.446 1,-1 V 9.9999995 Z"
+     id="rect4382-7"
+     sodipodi:nodetypes="ssccssssccsssccssccc" />
+</svg>
diff --git a/elementary-xfce/status/symbolic/process-working-symbolic.svg b/elementary-xfce/animations/symbolic/process-working-symbolic.svg
similarity index 100%
rename from elementary-xfce/status/symbolic/process-working-symbolic.svg
rename to elementary-xfce/animations/symbolic/process-working-symbolic.svg
diff --git a/elementary-xfce/apps/128/org.xfce.settings.manager.svg b/elementary-xfce/apps/128/org.xfce.settings.manager.svg
index 0a03fa23c..11d8cd487 120000
--- a/elementary-xfce/apps/128/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/128/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/128/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/128/org.xfce.settings.mouse.svg b/elementary-xfce/apps/128/org.xfce.settings.mouse.svg
index 90ea8e2b2..db1e8929f 120000
--- a/elementary-xfce/apps/128/org.xfce.settings.mouse.svg
+++ b/elementary-xfce/apps/128/org.xfce.settings.mouse.svg
@@ -1 +1 @@
-preferences-desktop-peripherals.svg
\ No newline at end of file
+../../devices/128/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/org.xfce.settings.manager.svg b/elementary-xfce/apps/16/org.xfce.settings.manager.svg
index 0a03fa23c..db3a890db 120000
--- a/elementary-xfce/apps/16/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/16/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/16/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/org.xfce.settings.mouse.svg b/elementary-xfce/apps/16/org.xfce.settings.mouse.svg
index 90ea8e2b2..59b57f4c8 120000
--- a/elementary-xfce/apps/16/org.xfce.settings.mouse.svg
+++ b/elementary-xfce/apps/16/org.xfce.settings.mouse.svg
@@ -1 +1 @@
-preferences-desktop-peripherals.svg
\ No newline at end of file
+../../devices/16/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/22/org.xfce.settings.manager.svg b/elementary-xfce/apps/22/org.xfce.settings.manager.svg
index 0a03fa23c..ccfa9139e 120000
--- a/elementary-xfce/apps/22/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/22/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/22/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/22/org.xfce.settings.mouse.svg b/elementary-xfce/apps/22/org.xfce.settings.mouse.svg
index 90ea8e2b2..3539dad40 120000
--- a/elementary-xfce/apps/22/org.xfce.settings.mouse.svg
+++ b/elementary-xfce/apps/22/org.xfce.settings.mouse.svg
@@ -1 +1 @@
-preferences-desktop-peripherals.svg
\ No newline at end of file
+../../devices/22/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/org.xfce.settings.manager.svg b/elementary-xfce/apps/24/org.xfce.settings.manager.svg
index 0a03fa23c..e3bdf3199 120000
--- a/elementary-xfce/apps/24/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/24/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/24/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/org.xfce.settings.mouse.svg b/elementary-xfce/apps/24/org.xfce.settings.mouse.svg
index 90ea8e2b2..444685844 120000
--- a/elementary-xfce/apps/24/org.xfce.settings.mouse.svg
+++ b/elementary-xfce/apps/24/org.xfce.settings.mouse.svg
@@ -1 +1 @@
-preferences-desktop-peripherals.svg
\ No newline at end of file
+../../devices/24/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/32/org.xfce.settings.manager.svg b/elementary-xfce/apps/32/org.xfce.settings.manager.svg
index 0a03fa23c..154897439 120000
--- a/elementary-xfce/apps/32/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/32/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/32/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/32/org.xfce.settings.mouse.svg b/elementary-xfce/apps/32/org.xfce.settings.mouse.svg
index 90ea8e2b2..485895f43 120000
--- a/elementary-xfce/apps/32/org.xfce.settings.mouse.svg
+++ b/elementary-xfce/apps/32/org.xfce.settings.mouse.svg
@@ -1 +1 @@
-preferences-desktop-peripherals.svg
\ No newline at end of file
+../../devices/32/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/48/org.xfce.settings.manager.svg b/elementary-xfce/apps/48/org.xfce.settings.manager.svg
index 0a03fa23c..13880608a 120000
--- a/elementary-xfce/apps/48/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/48/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/48/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/48/org.xfce.settings.mouse.svg b/elementary-xfce/apps/48/org.xfce.settings.mouse.svg
index 90ea8e2b2..64d8d6acb 120000
--- a/elementary-xfce/apps/48/org.xfce.settings.mouse.svg
+++ b/elementary-xfce/apps/48/org.xfce.settings.mouse.svg
@@ -1 +1 @@
-preferences-desktop-peripherals.svg
\ No newline at end of file
+../../devices/48/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/64/org.xfce.settings.manager.svg b/elementary-xfce/apps/64/org.xfce.settings.manager.svg
index 0a03fa23c..50965f089 120000
--- a/elementary-xfce/apps/64/org.xfce.settings.manager.svg
+++ b/elementary-xfce/apps/64/org.xfce.settings.manager.svg
@@ -1 +1 @@
-preferences-desktop.svg
\ No newline at end of file
+../../categories/64/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/64/org.xfce.settings.mouse.svg b/elementary-xfce/apps/64/org.xfce.settings.mouse.svg
new file mode 120000
index 000000000..c5bcec303
--- /dev/null
+++ b/elementary-xfce/apps/64/org.xfce.settings.mouse.svg
@@ -0,0 +1 @@
+../../devices/64/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/96/org.xfce.settings.manager.svg b/elementary-xfce/apps/96/org.xfce.settings.manager.svg
new file mode 120000
index 000000000..9e1e00aca
--- /dev/null
+++ b/elementary-xfce/apps/96/org.xfce.settings.manager.svg
@@ -0,0 +1 @@
+../../categories/96/preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/96/org.xfce.settings.mouse.svg b/elementary-xfce/apps/96/org.xfce.settings.mouse.svg
new file mode 120000
index 000000000..2294db148
--- /dev/null
+++ b/elementary-xfce/apps/96/org.xfce.settings.mouse.svg
@@ -0,0 +1 @@
+../../devices/96/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/symbolic/system-software-install-symbolic.svg b/elementary-xfce/apps/symbolic/system-software-install-symbolic.svg
index 951460f4c..a66456470 100644
--- a/elementary-xfce/apps/symbolic/system-software-install-symbolic.svg
+++ b/elementary-xfce/apps/symbolic/system-software-install-symbolic.svg
@@ -1,6 +1,50 @@
-<svg height='16' width='16.002' xmlns='http://www.w3.org/2000/svg'>
-    <g color='#000' transform='translate(-932 -523.948)'>
-        <path d='M933 525l-1 3v1c0 2 2 2 2 2 1.108 0 2-.892 2-2 0 1.108.892 2 2 2s2-.892 2-2c0 1.108.892 2 2 2s2-.892 2-2c0 1.108.892 2 2 2 0 0 2 0 2-2v-1l-1-3zm0 7v6s0 1 1 1h12c1 0 1-1 1-1v-6h-1v6h-2v-3.5c0-.831-.669-1.5-1.5-1.5s-1.5.669-1.5 1.5v3.5h-7v-6zm3 1v3h3v-3z' fill='#666' fill-rule='evenodd' style='isolation:auto;mix-blend-mode:normal'/>
-        
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   id="svg3658"
+   version="1.1"
+   sodipodi:docname="system-software-install-symbolic.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview56"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="28.416667"
+     inkscape:cx="6.7038122"
+     inkscape:cy="5.7008797"
+     inkscape:window-width="1317"
+     inkscape:window-height="893"
+     inkscape:window-x="593"
+     inkscape:window-y="122"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3658"
+     width="24px"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs3660" />
+  <metadata
+     id="metadata3663">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="" />
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="rect5505-21"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#555761;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.501961;marker:none;enable-background:accumulate"
+     d="M 3,1 C 1.8920011,1 1,1.8920011 1,3 v 10 c 0,1.107999 0.8920011,2 2,2 h 10 c 1.107999,0 2,-0.892001 2,-2 V 3 C 15,1.8920011 14.107999,1 13,1 Z m 3.5,3 h 3 C 9.7769994,4 10,4.2230006 10,4.5 V 8 h 1.082031 c 1.039326,4.067e-4 1.558878,1.0537307 0.824219,1.7871094 L 8.7246094,12.910156 c -0.4557281,0.45443 -0.9934907,0.45443 -1.4492188,0 L 4.09375,9.7871094 C 3.3590911,9.0537307 3.8805959,8.0004067 4.9199219,8 H 6 V 4.5 C 6,4.2230006 6.2230006,4 6.5,4 Z"
+     sodipodi:nodetypes="ssssssssssssccccccccss" />
 </svg>
diff --git a/elementary-xfce/categories/128/applications-engineering.svg b/elementary-xfce/categories/128/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/128/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/128/gtk-preferences.svg b/elementary-xfce/categories/128/gtk-preferences.svg
index fed6d32ff..0a03fa23c 120000
--- a/elementary-xfce/categories/128/gtk-preferences.svg
+++ b/elementary-xfce/categories/128/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/128/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/128/preferences-desktop-peripherals.svg b/elementary-xfce/categories/128/preferences-desktop-peripherals.svg
similarity index 100%
rename from elementary-xfce/apps/128/preferences-desktop-peripherals.svg
rename to elementary-xfce/categories/128/preferences-desktop-peripherals.svg
diff --git a/elementary-xfce/categories/128/preferences-desktop-personal.svg b/elementary-xfce/categories/128/preferences-desktop-personal.svg
new file mode 100644
index 000000000..d053f3604
--- /dev/null
+++ b/elementary-xfce/categories/128/preferences-desktop-personal.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg5157"
+   height="128"
+   width="128"
+   version="1.1"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview28"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="7.5351066"
+     inkscape:cx="56.004516"
+     inkscape:cy="48.705349"
+     inkscape:window-width="1920"
+     inkscape:window-height="1034"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5157" />
+  <defs
+     id="defs5159">
+    <linearGradient
+       id="linearGradient3820-7-2-8-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-5-0" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-4-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-6-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4806">
+      <stop
+         id="stop4808"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4810"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.42447853" />
+      <stop
+         id="stop4812"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop4814"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="39.994175"
+       x2="71.204407"
+       y1="15.761489"
+       x1="71.204407"
+       gradientTransform="matrix(4.16388,0,0,4.16388,-236.03265,-50.534426)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3118"
+       xlink:href="#linearGradient4806" />
+    <radialGradient
+       r="62.769119"
+       fy="186.17059"
+       fx="99.157013"
+       cy="186.17059"
+       cx="99.157013"
+       gradientTransform="matrix(0.6869404,0,0,-0.21461693,-4.02174,148.48403)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7627119,0,0,1.7627118,8.093219,9.0932259)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata5162">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 107.21186,108.52868 c 0.005,-7.44114 -19.301247,-13.474207 -43.118643,-13.474207 -23.817396,0 -43.123773,6.033067 -43.118643,13.474207 -0.0051,7.44114 19.801244,13.47421 43.61864,13.47421 23.817396,0 42.623776,-6.03307 42.618646,-13.47421 z"
+     id="path3818-0-5-0"
+     style="fill:url(#radialGradient3163);fill-opacity:1;stroke:none" />
+  <g
+     id="g4274"
+     transform="translate(-184.16949,-7.9999975)" />
+  <path
+     d="M 64.500002,13.5 C 35.808201,13.5 12.5,36.80819 12.5,65.499996 12.5,94.191807 35.808201,117.50001 64.500002,117.5 93.191802,117.5 116.50003,94.191807 116.5,65.499996 116.5,36.80819 93.191802,13.5 64.500002,13.5 Z"
+     id="path2555-3"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999998;marker:none;enable-background:accumulate" />
+  <path
+     d="M 64.499997,13.499997 C 93.191809,13.499997 116.5,36.808186 116.5,65.500001 116.5,94.191809 93.191809,117.50001 64.499997,117.5 35.80819,117.5 12.49998,94.191809 12.5,65.500001 12.5,36.808186 35.80819,13.499997 64.499997,13.499997 Z"
+     id="path2555-7-65-3"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#003651;stroke-width:1;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+  <path
+     d="m 115.5,65.500001 c 0,28.166516 -22.833502,50.999989 -51.000026,50.999989 -28.166487,0 -50.999973,-22.833473 -50.999973,-50.999989 0,-28.166517 22.833486,-50.999991 50.999973,-50.999991 28.166524,0 51.000026,22.833474 51.000026,50.999991 z"
+     id="path3019"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3118);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.07000002;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+     id="path4330"
+     d="m 64,36.996094 c -11.909732,0 -21.625,9.317795 -21.625,20.832031 0,11.514237 9.715383,20.830078 21.625,20.830078 11.909618,0 21.625,-9.315841 21.625,-20.830078 C 85.625,46.313889 75.909731,36.996094 64,36.996094 Z m -7.558594,42.976562 c -9.676157,0 -18.04983,5.699183 -22.259765,14.033203 a 1.0030908,1.0030908 0 0 0 0.162109,1.138672 C 41.760296,103.05527 52.304346,108.00391 64,108.00391 c 11.695654,0 22.239704,-4.94864 29.65625,-12.859379 a 1.0030908,1.0030908 0 0 0 0.162109,-1.138672 C 89.608424,85.671839 81.234752,79.972656 71.558594,79.972656 l -15.117188,0 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+     id="rect3049-9"
+     d="m 64,38 c -11.388492,0 -20.620689,8.877113 -20.620689,19.827586 0,10.950474 9.232197,19.827587 20.620689,19.827587 11.388493,0 20.620688,-8.877113 20.620688,-19.827587 C 84.620688,46.877113 75.388491,38 64,38 Z m -7.559267,42.976293 c -9.282797,0 -17.312149,5.461239 -21.364225,13.48276 C 42.3116,102.17625 52.586961,107 64,107 75.413039,107 85.6884,102.17625 92.923492,94.459053 88.871416,86.437532 80.842065,80.976293 71.559267,80.976293 l -15.118534,0 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="rect3049"
+     d="m 64,37 c -11.388492,0 -20.620689,8.877113 -20.620689,19.827586 0,10.950474 9.232197,19.827587 20.620689,19.827587 11.388493,0 20.620688,-8.877113 20.620688,-19.827587 C 84.620688,45.877113 75.388491,37 64,37 Z m -7.559267,42.976293 c -9.282797,0 -17.312149,5.461239 -21.364225,13.48276 C 42.3116,101.17625 52.586961,106 64,106 75.413039,106 85.6884,101.17625 92.923492,93.459053 88.871416,85.437532 80.842065,79.976293 71.559267,79.976293 l -15.118534,0 z" />
+</svg>
diff --git a/elementary-xfce/apps/128/preferences-desktop.svg b/elementary-xfce/categories/128/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/128/preferences-desktop.svg
rename to elementary-xfce/categories/128/preferences-desktop.svg
diff --git a/elementary-xfce/apps/128/preferences-system-network.svg b/elementary-xfce/categories/128/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/128/preferences-system-network.svg
rename to elementary-xfce/categories/128/preferences-system-network.svg
diff --git a/elementary-xfce/categories/16/applications-engineering.svg b/elementary-xfce/categories/16/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/16/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/16/gtk-preferences.svg b/elementary-xfce/categories/16/gtk-preferences.svg
index 987a8a54a..0a03fa23c 120000
--- a/elementary-xfce/categories/16/gtk-preferences.svg
+++ b/elementary-xfce/categories/16/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/16/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/preferences-desktop-peripherals.svg b/elementary-xfce/categories/16/preferences-desktop-peripherals.svg
similarity index 100%
rename from elementary-xfce/apps/16/preferences-desktop-peripherals.svg
rename to elementary-xfce/categories/16/preferences-desktop-peripherals.svg
diff --git a/elementary-xfce/categories/16/preferences-desktop-personal.svg b/elementary-xfce/categories/16/preferences-desktop-personal.svg
new file mode 100644
index 000000000..48acda5e1
--- /dev/null
+++ b/elementary-xfce/categories/16/preferences-desktop-personal.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg4505"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="15.070213"
+     inkscape:cx="10.28519"
+     inkscape:cy="16.224057"
+     inkscape:window-width="1920"
+     inkscape:window-height="1031"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4505" />
+  <defs
+     id="defs4507">
+    <linearGradient
+       id="linearGradient4806-9">
+      <stop
+         id="stop4808-49"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4810-05"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.42447853" />
+      <stop
+         id="stop4812-6"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop4814-7"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3820-7-2-2">
+      <stop
+         id="stop3822-2-6-36"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-6"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-4"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204407"
+       y1="15.369057"
+       x2="71.204407"
+       y2="40.495617"
+       id="linearGradient3028"
+       xlink:href="#linearGradient4806-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.57010515,0,0,0.57010543,-33.147974,-7.8870696)" />
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient3043"
+       xlink:href="#linearGradient3820-7-2-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17524541,0,0,0.05575992,-1.37681,18.119145)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25423729,0,0,0.25423729,-0.13559324,-0.13559262)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4510">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 8.0000006,0.49999981 c -4.1382408,0 -7.5000005,3.36175839 -7.5000005,7.49999999 0,4.1382412 3.3617597,7.5000022 7.5000005,7.5000002 C 12.13824,15.5 15.500005,12.138241 15.5,7.9999998 15.5,3.8617582 12.13824,0.49999981 8.0000006,0.49999981 Z"
+     id="path2555"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8,0.49999992 c -4.1382413,0 -7.5,3.36175808 -7.5,7.49999988 C 0.5,12.138241 3.8617587,15.500002 8,15.5 c 4.138241,0 7.500006,-3.361759 7.5,-7.5000002 C 15.5,3.861758 12.138241,0.49999992 8,0.49999992 Z"
+     id="path2555-7-1-7"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 14.982759,8.0000002 c 0,3.8564708 -3.126295,6.9827588 -6.982759,6.9827588 -3.8564638,0 -6.9827586,-3.126288 -6.9827586,-6.9827588 0,-3.8564707 3.1262948,-6.9827589 6.9827586,-6.9827589 3.856464,0 6.982759,3.1262882 6.982759,6.9827589 z"
+     id="path3421"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3028);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path3840"
+     d="m 8,4.2160218 c -1.7237849,0 -3.1211886,1.3436579 -3.1211886,3.0011434 0,1.6574856 1.3974037,3.0011438 3.1211886,3.0011438 1.723785,0 3.12119,-1.3436582 3.12119,-3.0011438 C 11.12119,5.5596797 9.723785,4.2160218 8,4.2160218 Z M 6.8558146,10.720999 c -1.405063,0 -2.6204018,0.826625 -3.2337324,2.040778 C 4.7172007,13.929867 6.2724997,14.66 8,14.66 c 1.727501,0 3.2828,-0.730133 4.377919,-1.898223 -0.613331,-1.214153 -1.82867,-2.040778 -3.2337329,-2.040778 z" />
+  <path
+     d="m 8,4.0540285 c -1.7237849,0 -3.1211886,1.3436579 -3.1211886,3.0011435 0,1.6574855 1.3974037,3.001143 3.1211886,3.001143 1.723785,0 3.12119,-1.3436575 3.12119,-3.001143 C 11.12119,5.3976864 9.723785,4.0540285 8,4.0540285 Z M 6.8558146,10.559007 c -1.405063,0 -2.6204018,0.826623 -3.2337324,2.040777 1.0951185,1.16809 2.6504175,1.898223 4.3779178,1.898223 1.727501,0 3.2828,-0.730133 4.377919,-1.898223 -0.613331,-1.214154 -1.82867,-2.040777 -3.2337329,-2.040777 z"
+     id="path3070"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="rect3049"
+     d="m 8,3.5367871 c -1.7237849,0 -3.1211886,1.3436579 -3.1211886,3.0011435 0,1.6574856 1.3974037,3.0011435 3.1211886,3.0011435 1.723785,0 3.12119,-1.3436579 3.12119,-3.0011435 C 11.12119,4.880445 9.723785,3.5367871 8,3.5367871 Z M 6.8558146,10.041765 c -1.405063,0 -2.6204018,0.826624 -3.2337324,2.040777 C 4.7172007,13.250633 6.2724997,13.980765 8,13.980765 c 1.727501,0 3.2828,-0.730132 4.377919,-1.898223 -0.613331,-1.214153 -1.82867,-2.040777 -3.2337329,-2.040777 z" />
+</svg>
diff --git a/elementary-xfce/apps/16/preferences-desktop.svg b/elementary-xfce/categories/16/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/16/preferences-desktop.svg
rename to elementary-xfce/categories/16/preferences-desktop.svg
diff --git a/elementary-xfce/apps/16/preferences-system-network.svg b/elementary-xfce/categories/16/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/16/preferences-system-network.svg
rename to elementary-xfce/categories/16/preferences-system-network.svg
diff --git a/elementary-xfce/categories/22/applications-engineering.svg b/elementary-xfce/categories/22/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/22/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/22/gtk-preferences.svg b/elementary-xfce/categories/22/gtk-preferences.svg
index 1870f6461..0a03fa23c 120000
--- a/elementary-xfce/categories/22/gtk-preferences.svg
+++ b/elementary-xfce/categories/22/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/24/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/22/preferences-desktop-peripherals.svg b/elementary-xfce/categories/22/preferences-desktop-peripherals.svg
similarity index 100%
rename from elementary-xfce/apps/22/preferences-desktop-peripherals.svg
rename to elementary-xfce/categories/22/preferences-desktop-peripherals.svg
diff --git a/elementary-xfce/categories/22/preferences-desktop-personal.svg b/elementary-xfce/categories/22/preferences-desktop-personal.svg
new file mode 100644
index 000000000..e8b538362
--- /dev/null
+++ b/elementary-xfce/categories/22/preferences-desktop-personal.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="22"
+   height="22"
+   id="svg3749"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="28.416667"
+     inkscape:cx="9.14956"
+     inkscape:cy="12"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3749"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata148432">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3751">
+    <linearGradient
+       id="linearGradient3820-7-2-2">
+      <stop
+         id="stop3822-2-6-36"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-6"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-4"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4806-9">
+      <stop
+         id="stop4808-49"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4810-05"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.42447853" />
+      <stop
+         id="stop4812-6"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop4814-7"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204407"
+       y1="15.369057"
+       x2="71.204407"
+       y2="40.495617"
+       id="linearGradient3097"
+       xlink:href="#linearGradient4806-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77562456,0,0,0.77562491,-44.981566,-10.614261)" />
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient3108"
+       xlink:href="#linearGradient3820-7-2-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12745121,0,0,0.03186282,-1.6376809,14.068084)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.35593221,0,0,0.35593221,-0.38983063,-0.38982955)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 18.999999,20 A 7.9999997,2 0 0 1 3.0000001,20 7.9999997,2 0 1 1 18.999999,20 Z"
+     id="path3818-0-2"
+     style="fill:url(#radialGradient3108);fill-opacity:1;stroke:none;stroke-width:1" />
+  <path
+     d="M 11.000001,0.4999998 C 5.2064636,0.4999998 0.50000007,5.2064615 0.50000007,11 c 0,5.793538 4.70646353,10.500002 10.50000093,10.5 C 16.793537,21.5 21.500006,16.793538 21.5,11 21.5,5.2064615 16.793537,0.4999998 11.000001,0.4999998 Z"
+     id="path2555"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999998;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="path4100"
+     d="m 11,5.1562499 c -2.8103572,0 -5.15625,2.2348172 -5.15625,5.0000001 0,1.697435 0.9514114,3.099476 2.28125,4 -1.6306,0.438147 -3.0568081,1.379026 -3.8125,2.875 a 1.0212743,1.0212743 0 0 0 0.15625,1.15625 c 1.6332815,1.742116 3.9618924,2.84375 6.53125,2.84375 2.569357,0 4.897969,-1.101634 6.53125,-2.84375 a 1.0212743,1.0212743 0 0 0 0.15625,-1.15625 c -0.755691,-1.495974 -2.1819,-2.436853 -3.8125,-2.875 1.329839,-0.900524 2.28125,-2.302565 2.28125,-4 0,-2.7651829 -2.345893,-5.0000001 -5.15625,-5.0000001 z" />
+  <path
+     d="m 11,6.1869099 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.9692791 0,2.192172 1.848191,3.969279 4.12805,3.969279 2.279859,0 4.12805,-1.777107 4.12805,-3.969279 C 15.12805,7.9640166 13.279859,6.1869099 11,6.1869099 Z M 9.486712,14.790322 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 C 6.6582054,19.034336 8.7152269,20 11,20 c 2.284773,0 4.341795,-0.965664 5.790185,-2.510569 -0.811183,-1.605826 -2.418577,-2.699109 -4.276897,-2.699109 z"
+     id="rect3049-2"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+  <path
+     d="m 11,5.1254682 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.9692787 0,2.1921721 1.848191,3.9692791 4.12805,3.9692791 2.279859,0 4.12805,-1.777107 4.12805,-3.9692791 0,-2.192172 -1.848191,-3.9692787 -4.12805,-3.9692787 z M 9.486712,13.72888 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 1.4483909,1.544905 3.5054124,2.510569 5.7901855,2.510569 2.284773,0 4.341795,-0.965664 5.790186,-2.510569 -0.811184,-1.605826 -2.418578,-2.699109 -4.276898,-2.699109 z"
+     id="rect3049"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+  <path
+     d="M 11,0.5 C 5.206462,0.5 0.49999997,5.2064617 0.49999997,10.999999 0.49999997,16.793538 5.206462,21.500002 11,21.5 16.793538,21.5 21.500007,16.793538 21.5,10.999999 21.5,5.2064617 16.793538,0.5 11,0.5 Z"
+     id="path2555-7-1-7"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 20.500001,11 c 0,5.246706 -4.253305,9.5 -9.500001,9.5 -5.246695,0 -9.5,-4.253294 -9.5,-9.5 0,-5.2467043 4.253305,-9.5000004 9.5,-9.5000004 5.246696,0 9.500001,4.2532961 9.500001,9.5000004 z"
+     id="path3421"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3097);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/apps/22/preferences-desktop.svg b/elementary-xfce/categories/22/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/22/preferences-desktop.svg
rename to elementary-xfce/categories/22/preferences-desktop.svg
diff --git a/elementary-xfce/apps/22/preferences-system-network.svg b/elementary-xfce/categories/22/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/22/preferences-system-network.svg
rename to elementary-xfce/categories/22/preferences-system-network.svg
diff --git a/elementary-xfce/categories/24/applications-engineering.svg b/elementary-xfce/categories/24/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/24/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/24/gtk-preferences.svg b/elementary-xfce/categories/24/gtk-preferences.svg
index 1870f6461..0a03fa23c 120000
--- a/elementary-xfce/categories/24/gtk-preferences.svg
+++ b/elementary-xfce/categories/24/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/24/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/preferences-desktop-peripherals.svg b/elementary-xfce/categories/24/preferences-desktop-peripherals.svg
similarity index 100%
rename from elementary-xfce/apps/24/preferences-desktop-peripherals.svg
rename to elementary-xfce/categories/24/preferences-desktop-peripherals.svg
diff --git a/elementary-xfce/categories/24/preferences-desktop-personal.svg b/elementary-xfce/categories/24/preferences-desktop-personal.svg
new file mode 100644
index 000000000..6d81730f0
--- /dev/null
+++ b/elementary-xfce/categories/24/preferences-desktop-personal.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg3749"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="28.416667"
+     inkscape:cx="11.472141"
+     inkscape:cy="12"
+     inkscape:window-width="1920"
+     inkscape:window-height="1034"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3749" />
+  <metadata
+     id="metadata148432">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3751">
+    <linearGradient
+       id="linearGradient3820-7-2-2">
+      <stop
+         id="stop3822-2-6-36"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-6"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-4"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4806-9">
+      <stop
+         id="stop4808-49"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4810-05"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.42447853" />
+      <stop
+         id="stop4812-6"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop4814-7"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204407"
+       y1="15.369057"
+       x2="71.204407"
+       y2="40.495617"
+       id="linearGradient3097"
+       xlink:href="#linearGradient4806-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77562456,0,0,0.77562491,-43.981566,-9.6142608)" />
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient3108"
+       xlink:href="#linearGradient3820-7-2-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.11151981,0,0,0.03548359,0.942029,15.166729)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.35593221,0,0,0.35593221,0.6101694,0.61017055)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+  </defs>
+  <path
+     d="m 19,21.772727 a 7,2.2272727 0 0 1 -14,0 7,2.2272727 0 1 1 14,0 z"
+     id="path3818-0-2"
+     style="fill:url(#radialGradient3108);fill-opacity:1;stroke:none" />
+  <path
+     d="M 12.000001,1.4999999 C 6.2064636,1.4999999 1.5000001,6.2064616 1.5000001,12 c 0,5.793538 4.7064635,10.500002 10.5000009,10.5 C 17.793537,22.5 22.500006,17.793538 22.5,12 22.5,6.2064616 17.793537,1.4999999 12.000001,1.4999999 Z"
+     id="path2555"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999998;marker:none;enable-background:accumulate" />
+  <path
+     style="opacity:0.07000002000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4100"
+     d="m 12,6.15625 c -2.8103572,0 -5.15625,2.2348172 -5.15625,5 0,1.697435 0.9514114,3.099476 2.28125,4 -1.6306,0.438147 -3.0568081,1.379026 -3.8125,2.875 a 1.0212743,1.0212743 0 0 0 0.15625,1.15625 c 1.6332815,1.742116 3.9618924,2.84375 6.53125,2.84375 2.569357,0 4.897969,-1.101634 6.53125,-2.84375 a 1.0212743,1.0212743 0 0 0 0.15625,-1.15625 c -0.755691,-1.495974 -2.1819,-2.436853 -3.8125,-2.875 1.329839,-0.900524 2.28125,-2.302565 2.28125,-4 0,-2.7651828 -2.345893,-5 -5.15625,-5 z" />
+  <path
+     d="m 12,7.18691 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.969279 0,2.192172 1.848191,3.969279 4.12805,3.969279 2.279859,0 4.12805,-1.777107 4.12805,-3.969279 C 16.12805,8.9640167 14.279859,7.18691 12,7.18691 z m -1.513288,8.603412 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 C 7.6582054,20.034336 9.7152269,21 12,21 c 2.284773,0 4.341795,-0.965664 5.790185,-2.510569 -0.811183,-1.605826 -2.418577,-2.699109 -4.276897,-2.699109 l -3.026576,0 z"
+     id="rect3049-2"
+     style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 12,6.1254683 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.9692787 0,2.192172 1.848191,3.969279 4.12805,3.969279 2.279859,0 4.12805,-1.777107 4.12805,-3.969279 C 16.12805,7.902575 14.279859,6.1254683 12,6.1254683 z M 10.486712,14.72888 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 1.4483909,1.544905 3.5054124,2.510569 5.7901855,2.510569 2.284773,0 4.341795,-0.965664 5.790186,-2.510569 -0.811184,-1.605826 -2.418578,-2.699109 -4.276898,-2.699109 l -3.026576,0 z"
+     id="rect3049"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 12,1.5000001 C 6.206462,1.5000001 1.5,6.2064618 1.5,11.999999 1.5,17.793538 6.206462,22.500002 12,22.5 17.793538,22.5 22.500007,17.793538 22.5,11.999999 22.5,6.2064618 17.793538,1.5000001 12,1.5000001 z"
+     id="path2555-7-1-7"
+     style="opacity:0.50000000000000000;color:#000000;fill:#000000;stroke:#003651;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:0;fill-rule:nonzero" />
+  <path
+     d="m 21.500001,12 c 0,5.246706 -4.253305,9.5 -9.500001,9.5 -5.246695,0 -9.5,-4.253294 -9.5,-9.5 0,-5.2467042 4.253305,-9.5000003 9.5,-9.5000003 5.246696,0 9.500001,4.2532961 9.500001,9.5000003 z"
+     id="path3421"
+     style="color:#000000;fill:none;stroke:url(#linearGradient3097);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5" />
+</svg>
diff --git a/elementary-xfce/apps/24/preferences-desktop.svg b/elementary-xfce/categories/24/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/24/preferences-desktop.svg
rename to elementary-xfce/categories/24/preferences-desktop.svg
diff --git a/elementary-xfce/apps/24/preferences-system-network.svg b/elementary-xfce/categories/24/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/24/preferences-system-network.svg
rename to elementary-xfce/categories/24/preferences-system-network.svg
diff --git a/elementary-xfce/categories/32/applications-engineering.svg b/elementary-xfce/categories/32/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/32/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/32/gtk-preferences.svg b/elementary-xfce/categories/32/gtk-preferences.svg
index 86aae64d1..0a03fa23c 120000
--- a/elementary-xfce/categories/32/gtk-preferences.svg
+++ b/elementary-xfce/categories/32/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/32/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/32/preferences-desktop-peripherals.svg b/elementary-xfce/categories/32/preferences-desktop-peripherals.svg
similarity index 100%
rename from elementary-xfce/apps/32/preferences-desktop-peripherals.svg
rename to elementary-xfce/categories/32/preferences-desktop-peripherals.svg
diff --git a/elementary-xfce/categories/32/preferences-desktop-personal.svg b/elementary-xfce/categories/32/preferences-desktop-personal.svg
new file mode 100644
index 000000000..86755d8c4
--- /dev/null
+++ b/elementary-xfce/categories/32/preferences-desktop-personal.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="32"
+   height="32"
+   id="svg4505"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="15.070213"
+     inkscape:cx="10.28519"
+     inkscape:cy="16.257235"
+     inkscape:window-width="1920"
+     inkscape:window-height="1034"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4505" />
+  <defs
+     id="defs4507">
+    <linearGradient
+       id="linearGradient4806-9">
+      <stop
+         id="stop4808-49"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4810-05"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.42447853" />
+      <stop
+         id="stop4812-6"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop4814-7"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3820-7-2-2">
+      <stop
+         id="stop3822-2-6-36"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-6"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-4"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204407"
+       y1="15.369057"
+       x2="71.204407"
+       y2="40.495617"
+       id="linearGradient3028"
+       xlink:href="#linearGradient4806-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1022033,0,0,1.1022038,-63.55275,-14.715001)" />
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient3043"
+       xlink:href="#linearGradient3820-7-2-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17524541,0,0,0.05575992,-1.37681,18.119145)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49152542,0,0,0.49152542,0.27118635,0.2711875)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4510">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 27.000001,28.499999 a 11,3.4999999 0 1 1 -21.9999996,0 11,3.4999999 0 1 1 21.9999996,0 z"
+     id="path3818-0-2"
+     style="fill:url(#radialGradient3043);fill-opacity:1;stroke:none" />
+  <path
+     d="m 16.000001,1.4999995 c -8.0005987,0 -14.5000007,6.4993994 -14.5000007,14.4999995 0,8.000601 6.499402,14.500003 14.5000007,14.500001 C 24.000598,30.5 30.500008,24.0006 30.5,15.999999 30.5,7.9993989 24.000598,1.4999995 16.000001,1.4999995 Z"
+     id="path2555"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,1.4999996 c -8.0006,0 -14.5,6.499399 -14.5,14.4999994 C 1.5,24.0006 7.9994,30.500003 16,30.5 24.0006,30.5 30.50001,24.0006 30.5,15.999999 30.5,7.9993986 24.0006,1.4999996 16,1.4999996 z"
+     id="path2555-7-1-7"
+     style="opacity:0.5;color:#000000;fill:none;stroke:#003651;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 29.5,16 C 29.5,23.455845 23.45583,29.5 16,29.5 8.54417,29.5 2.5,23.455845 2.5,16 2.5,8.5441566 8.54417,2.4999996 16,2.4999996 c 7.45583,0 13.5,6.044157 13.5,13.5000004 z"
+     id="path3421"
+     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3028);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3840"
+     d="m 16,8.6843084 c -3.332651,0 -6.034298,2.5977386 -6.034298,5.8022106 0,3.204472 2.701647,5.80221 6.034298,5.80221 3.332651,0 6.034299,-2.597738 6.034299,-5.80221 0,-3.204472 -2.701648,-5.8022106 -6.034299,-5.8022106 z M 13.787908,21.260599 c -2.716455,0 -5.06611,1.59814 -6.2518825,3.945503 C 9.6532546,27.46441 12.660166,28.876 16,28.876 c 3.339835,0 6.346746,-1.41159 8.463975,-3.669898 -1.185773,-2.347363 -3.535427,-3.945503 -6.251882,-3.945503 l -4.424185,0 z" />
+  <path
+     d="m 16,8.3711214 c -3.332651,0 -6.034298,2.5977386 -6.034298,5.8022106 0,3.204472 2.701647,5.80221 6.034298,5.80221 3.332651,0 6.034299,-2.597738 6.034299,-5.80221 C 22.034299,10.96886 19.332651,8.3711214 16,8.3711214 z M 13.787908,20.947412 c -2.716455,0 -5.06611,1.59814 -6.2518825,3.945503 2.1172291,2.258308 5.1241405,3.669898 8.4639745,3.669898 3.339835,0 6.346746,-1.41159 8.463975,-3.669898 -1.185773,-2.347363 -3.535427,-3.945503 -6.251882,-3.945503 l -4.424185,0 z"
+     id="path3070"
+     style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3049"
+     d="m 16,7.3711214 c -3.332651,0 -6.034298,2.5977386 -6.034298,5.8022106 0,3.204472 2.701647,5.80221 6.034298,5.80221 3.332651,0 6.034299,-2.597738 6.034299,-5.80221 C 22.034299,9.96886 19.332651,7.3711214 16,7.3711214 z M 13.787908,19.947412 c -2.716455,0 -5.06611,1.59814 -6.2518825,3.945503 2.1172291,2.258308 5.1241405,3.669898 8.4639745,3.669898 3.339835,0 6.346746,-1.41159 8.463975,-3.669898 -1.185773,-2.347363 -3.535427,-3.945503 -6.251882,-3.945503 l -4.424185,0 z" />
+</svg>
diff --git a/elementary-xfce/apps/32/preferences-desktop.svg b/elementary-xfce/categories/32/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/32/preferences-desktop.svg
rename to elementary-xfce/categories/32/preferences-desktop.svg
diff --git a/elementary-xfce/apps/32/preferences-system-network.svg b/elementary-xfce/categories/32/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/32/preferences-system-network.svg
rename to elementary-xfce/categories/32/preferences-system-network.svg
diff --git a/elementary-xfce/categories/48/applications-engineering.svg b/elementary-xfce/categories/48/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/48/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/48/gtk-preferences.svg b/elementary-xfce/categories/48/gtk-preferences.svg
index 13483f60d..0a03fa23c 120000
--- a/elementary-xfce/categories/48/gtk-preferences.svg
+++ b/elementary-xfce/categories/48/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/48/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/48/preferences-desktop-peripherals.svg b/elementary-xfce/categories/48/preferences-desktop-peripherals.svg
similarity index 100%
rename from elementary-xfce/apps/48/preferences-desktop-peripherals.svg
rename to elementary-xfce/categories/48/preferences-desktop-peripherals.svg
diff --git a/elementary-xfce/categories/48/preferences-desktop-personal.svg b/elementary-xfce/categories/48/preferences-desktop-personal.svg
new file mode 100644
index 000000000..7977b2ae7
--- /dev/null
+++ b/elementary-xfce/categories/48/preferences-desktop-personal.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="48"
+   height="48"
+   id="svg4031"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="14.208333"
+     inkscape:cx="22.873901"
+     inkscape:cy="24.000001"
+     inkscape:window-width="1317"
+     inkscape:window-height="893"
+     inkscape:window-x="303"
+     inkscape:window-y="712"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4031" />
+  <defs
+     id="defs4033">
+    <linearGradient
+       id="linearGradient4011">
+      <stop
+         id="stop4013"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.507761" />
+      <stop
+         id="stop4017"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456558" />
+      <stop
+         id="stop4019"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3820-7-2-1">
+      <stop
+         id="stop3822-2-6-3"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204407"
+       y1="6.2375584"
+       x2="71.204407"
+       y2="44.340794"
+       id="linearGradient3012"
+       xlink:href="#linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-47.733513,-1.3572406)" />
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient3018"
+       xlink:href="#linearGradient3820-7-2-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.27083381,0,0,0.08762273,-2.855072,25.187228)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66101694,0,0,0.66101694,2.8474568,2.8474595)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4036">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 40.999999,41.499999 a 17,5.4999999 0 1 1 -33.999999,0 17,5.4999999 0 1 1 33.999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient3018);fill-opacity:1;stroke:none" />
+  <path
+     d="M 24.000001,4.5 C 13.240575,4.5 4.5,13.240571 4.5,23.999999 4.5,34.759427 13.240575,43.500003 24.000001,43.5 34.759425,43.5 43.50001,34.759427 43.5,23.999999 43.5,13.240571 34.759425,4.5 24.000001,4.5 Z"
+     id="path2555"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 24,12.5 c -4.528073,0 -8.1988,3.602306 -8.1988,8.045977 0,4.443669 3.670727,8.045976 8.1988,8.045976 4.528072,0 8.1988,-3.602307 8.1988,-8.045976 C 32.1988,16.102306 28.528072,12.5 24,12.5 Z m -3.00557,17.439654 c -3.690847,0 -6.883322,2.216155 -8.49443,5.471265 2.876677,3.131615 6.962168,5.08908 11.5,5.08908 4.537831,0 8.623322,-1.957465 11.5,-5.08908 -1.611109,-3.25511 -4.803583,-5.471265 -8.494431,-5.471265 z"
+     id="path3070"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path3840"
+     d="m 23.999999,13.499999 c -4.249625,0 -7.694628,3.473653 -7.694628,7.758622 0,4.284967 3.445003,7.75862 7.694628,7.75862 4.249626,0 7.69463,-3.473653 7.69463,-7.75862 0,-4.284969 -3.445004,-7.758622 -7.69463,-7.758622 z M 21.179253,30.31681 c -3.463884,0 -6.460045,2.137006 -7.97208,5.275862 2.699781,3.019772 6.534041,4.907326 10.792826,4.907326 4.258787,0 8.093047,-1.887554 10.792828,-4.907326 -1.512036,-3.138856 -4.508196,-5.275862 -7.97208,-5.275862 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00001;marker:none;enable-background:accumulate"
+     d="m 21.125107,28.999999 c -3.530375,0 -6.584047,2.203491 -8.125107,5.439999 2.751605,3.113722 6.659465,5.060001 11,5.060001 4.340535,0 8.248395,-1.946279 11,-5.060001 -1.541061,-3.236508 -4.594732,-5.439999 -8.125107,-5.439999 z"
+     id="path890" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     d="M 23.999999,12.5 C 19.719792,12.5 16.25,15.857863 16.25,20.000001 16.25,24.142136 19.719792,27.5 23.999999,27.5 28.280207,27.5 31.75,24.142136 31.75,20.000001 31.75,15.857863 28.280207,12.5 23.999999,12.5 Z"
+     id="rect3049" />
+  <path
+     d="M 42.5,23.999344 C 42.5,34.216942 34.216658,42.5 24.000234,42.5 13.782875,42.5 5.4999995,34.216848 5.4999995,23.999344 5.4999995,13.782218 13.782875,5.4999995 24.000234,5.4999995 34.216658,5.4999995 42.5,13.782218 42.5,23.999344 Z"
+     id="path8655"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3012);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 24.000003,4.5 C 13.240575,4.5 4.5,13.240571 4.5,23.999999 4.5,34.759427 13.240575,43.500003 24.000003,43.5 34.759425,43.5 43.50001,34.759427 43.499999,23.999999 43.499999,13.240571 34.759425,4.5 24.000003,4.5 Z"
+     id="path2555-6"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/apps/48/preferences-desktop.svg b/elementary-xfce/categories/48/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/48/preferences-desktop.svg
rename to elementary-xfce/categories/48/preferences-desktop.svg
diff --git a/elementary-xfce/apps/48/preferences-system-network.svg b/elementary-xfce/categories/48/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/48/preferences-system-network.svg
rename to elementary-xfce/categories/48/preferences-system-network.svg
diff --git a/elementary-xfce/categories/64/applications-engineering.svg b/elementary-xfce/categories/64/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/64/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/64/gtk-preferences.svg b/elementary-xfce/categories/64/gtk-preferences.svg
index 006a9ead4..0a03fa23c 120000
--- a/elementary-xfce/categories/64/gtk-preferences.svg
+++ b/elementary-xfce/categories/64/gtk-preferences.svg
@@ -1 +1 @@
-../../apps/64/preferences-desktop.svg
\ No newline at end of file
+preferences-desktop.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/64/preferences-desktop-peripherals.svg b/elementary-xfce/categories/64/preferences-desktop-peripherals.svg
new file mode 120000
index 000000000..c5bcec303
--- /dev/null
+++ b/elementary-xfce/categories/64/preferences-desktop-peripherals.svg
@@ -0,0 +1 @@
+../../devices/64/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/64/preferences-desktop-personal.svg b/elementary-xfce/categories/64/preferences-desktop-personal.svg
new file mode 100644
index 000000000..3e2812048
--- /dev/null
+++ b/elementary-xfce/categories/64/preferences-desktop-personal.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="64"
+   height="64"
+   id="svg3489"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview29"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="15.070213"
+     inkscape:cx="4.7776365"
+     inkscape:cy="32.514471"
+     inkscape:window-width="1396"
+     inkscape:window-height="896"
+     inkscape:window-x="109"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3489" />
+  <defs
+     id="defs3491">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#4eb6e9;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#328be6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4806">
+      <stop
+         id="stop4808"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4810"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.42447853" />
+      <stop
+         id="stop4812"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop4814"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3820-7-2">
+      <stop
+         id="stop3822-2-6"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3824-1-2"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4806"
+       id="linearGradient3293"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3268746,0,0,2.3268746,-135.94475,-32.842783)"
+       x1="71.204407"
+       y1="15.369057"
+       x2="71.204407"
+       y2="40.495617" />
+    <radialGradient
+       xlink:href="#linearGradient3820-7-2"
+       id="radialGradient3300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3823536,7.5555777e-8,-1.8372241e-8,0.1115198,-5.9254271,36.335849)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <radialGradient
+       xlink:href="#linearGradient3820-7-2"
+       id="radialGradient4192"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,5.3967361e-8,-1.2248161e-8,0.07965545,6.7163816,44.240666)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata3494">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4198">
+    <path
+       d="m 55.999998,57.0017 a 24,6.9985714 0 1 1 -47.9999991,0 24,6.9985714 0 1 1 47.9999991,0 z"
+       id="path3818-0"
+       style="opacity:0.2;fill:url(#radialGradient3300);fill-opacity:1;stroke:none" />
+    <path
+       style="opacity:0.4;fill:url(#radialGradient4192);fill-opacity:1;stroke:none"
+       id="path4190"
+       d="m 47.999998,59.0017 a 16,4.9988822 0 1 1 -31.999999,0 16,4.9988822 0 1 1 31.999999,0 z" />
+  </g>
+  <path
+     d="M 32.000004,2.4999968 C 15.722922,2.4999968 2.5,15.722913 2.5,31.999997 2.5,48.277081 15.722922,61.500004 32.000004,61.5 48.27708,61.5 61.500016,48.277081 61.5,31.999997 61.5,15.722913 48.27708,2.4999968 32.000004,2.4999968 z"
+     id="path2555"
+     style="color:#000000;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="opacity:0.5;color:#000000;fill:#000000;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:0;fill-rule:nonzero"
+     id="path2555-7-1"
+     d="m 32,2.499999 c -16.277082,0 -29.5,13.222915 -29.5,29.499998 0,16.277083 13.222918,29.500005 29.5,29.5 16.27708,0 29.50001,-13.222917 29.5,-29.5 C 61.5,15.722914 48.27708,2.499999 32,2.499999 z" />
+  <path
+     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3293);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3019"
+     d="m 60.50001,31.999999 c 0,15.740115 -12.7599,28.499999 -28.50002,28.499999 -15.740099,0 -28.499991,-12.759884 -28.499991,-28.499999 0,-15.740116 12.759892,-28.5000013 28.499991,-28.5000013 15.74012,0 28.50002,12.7598853 28.50002,28.5000013 z" />
+  <path
+     id="path4321"
+     d="m 32.000002,15 c -6.892513,0 -12.4875,5.372581 -12.4875,12 0,6.627419 5.594987,12 12.4875,12 6.892519,0 12.487495,-5.372581 12.487495,-12 0,-6.627419 -5.594976,-12 -12.487495,-12 z m -4.5375,27.046447 c -5.564604,0 -10.358471,3.645027 -12.7875,8.453553 4.337101,4.626099 10.483418,7.5 17.325,7.5 6.841591,0 12.987895,-2.873901 17.324996,-7.5 -2.429028,-4.808526 -7.222896,-8.453553 -12.787501,-8.453553 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate;opacity:0.15" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;marker:none;enable-background:accumulate;opacity:0.05;stroke-opacity:1;stroke-linejoin:round"
+     d="m 32.000002,15 c -6.892513,0 -12.4875,5.372581 -12.4875,12 0,6.627419 5.594987,12 12.4875,12 6.892519,0 12.487495,-5.372581 12.487495,-12 0,-6.627419 -5.594976,-12 -12.487495,-12 z m -4.5375,27.046447 c -5.564604,0 -10.358471,3.645027 -12.7875,8.453553 4.337101,4.626099 10.483418,7.5 17.325,7.5 6.841591,0 12.987895,-2.873901 17.324996,-7.5 -2.429028,-4.808526 -7.222896,-8.453553 -12.787501,-8.453553 z"
+     id="path4323" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     d="m 32.000002,14 c -6.892513,0 -12.4875,5.372581 -12.4875,12 0,6.627419 5.594987,12 12.4875,12 6.892519,0 12.487495,-5.372581 12.487495,-12 0,-6.627419 -5.594976,-12 -12.487495,-12 z m -4.5375,27.046447 c -5.564604,0 -10.358471,3.645027 -12.7875,8.453553 4.337101,4.626099 10.483418,7.5 17.325,7.5 6.841591,0 12.987895,-2.873901 17.324996,-7.5 -2.429028,-4.808526 -7.222896,-8.453553 -12.787501,-8.453553 z"
+     id="path3224" />
+</svg>
diff --git a/elementary-xfce/apps/64/preferences-desktop.svg b/elementary-xfce/categories/64/preferences-desktop.svg
similarity index 100%
rename from elementary-xfce/apps/64/preferences-desktop.svg
rename to elementary-xfce/categories/64/preferences-desktop.svg
diff --git a/elementary-xfce/apps/64/preferences-system-network.svg b/elementary-xfce/categories/64/preferences-system-network.svg
similarity index 100%
rename from elementary-xfce/apps/64/preferences-system-network.svg
rename to elementary-xfce/categories/64/preferences-system-network.svg
diff --git a/elementary-xfce/categories/96/applications-engineering.svg b/elementary-xfce/categories/96/applications-engineering.svg
new file mode 120000
index 000000000..8f0029392
--- /dev/null
+++ b/elementary-xfce/categories/96/applications-engineering.svg
@@ -0,0 +1 @@
+applications-development.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/128/administration.svg b/elementary-xfce/categories/96/gtk-preferences.svg
similarity index 100%
rename from elementary-xfce/apps/128/administration.svg
rename to elementary-xfce/categories/96/gtk-preferences.svg
diff --git a/elementary-xfce/categories/96/preferences-desktop-peripherals.svg b/elementary-xfce/categories/96/preferences-desktop-peripherals.svg
new file mode 120000
index 000000000..2294db148
--- /dev/null
+++ b/elementary-xfce/categories/96/preferences-desktop-peripherals.svg
@@ -0,0 +1 @@
+../../devices/96/input-mouse.svg
\ No newline at end of file
diff --git a/elementary-xfce/categories/96/preferences-desktop-personal.svg b/elementary-xfce/categories/96/preferences-desktop-personal.svg
new file mode 100644
index 000000000..310549a1f
--- /dev/null
+++ b/elementary-xfce/categories/96/preferences-desktop-personal.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg4031"
+   sodipodi:docname="preferences-desktop-personal.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="14.208333"
+     inkscape:cx="35.260998"
+     inkscape:cy="68.586512"
+     inkscape:window-width="1802"
+     inkscape:window-height="964"
+     inkscape:window-x="167"
+     inkscape:window-y="91"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4031"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs4033">
+    <linearGradient
+       id="linearGradient4011">
+      <stop
+         id="stop4013"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.507761" />
+      <stop
+         id="stop4017"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456558" />
+      <stop
+         id="stop4019"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204407"
+       y1="7.0495539"
+       x2="71.204407"
+       y2="43.691185"
+       id="linearGradient3012"
+       xlink:href="#linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1891892,0,0,2.1891892,-109.03823,-7.5117951)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1040"
+       id="linearGradient1044"
+       x1="32"
+       y1="4.4437337"
+       x2="32"
+       y2="59.678059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4067796,0,0,1.4067796,2.9830502,2.983056)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1040">
+      <stop
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0"
+         id="stop1036" />
+      <stop
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="1"
+         id="stop1038" />
+    </linearGradient>
+    <radialGradient
+       r="10.625"
+       fy="4.625"
+       fx="62.625"
+       cy="4.625"
+       cx="62.625"
+       gradientTransform="matrix(4.4235297,0,0,1.5058804,-229.02353,72.035294)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3950"
+       xlink:href="#linearGradient8838" />
+    <linearGradient
+       id="linearGradient8838">
+      <stop
+         id="stop8840"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4036">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#radialGradient3950);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.999998;marker:none"
+     id="path8836"
+     d="m 95.000003,79 c 0,8.836555 -21.042621,16 -47.000001,16 C 22.042622,95 1,87.836555 1,79 1,70.163442 22.042623,63 48.000002,63 c 25.95738,0 47.000001,7.163442 47.000001,16 z" />
+  <path
+     d="m 48.000002,6.5000012 c -22.898265,0 -41.5000009,18.6017268 -41.5000009,41.4999968 0,22.898269 18.6017359,41.500008 41.5000009,41.500001 22.898261,0 41.500018,-18.601732 41.499997,-41.500001 0,-22.89827 -18.601736,-41.4999968 -41.499997,-41.4999968 z"
+     id="path2555"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#002e99;fill-opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:2.00002;marker:none;enable-background:accumulate"
+     d="M 41.727507,60 C 34.02487,60 27.362313,64.616838 23.999999,71.398093 30.003501,77.922082 38.529741,82 48,82 57.470258,82 65.996499,77.922082 72.000001,71.398093 68.637686,64.616838 61.975132,60 54.272494,60 Z"
+     id="path2025" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00002;marker:none;enable-background:accumulate"
+     d="M 41.727507,59 C 34.02487,59 27.362313,63.616838 23.999999,70.398093 30.003501,76.922082 38.529741,81 48,81 57.470258,81 65.996499,76.922082 72.000001,70.398093 68.637686,63.616838 61.975132,59 54.272494,59 Z"
+     id="path890" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#002e99;fill-opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     d="M 47.999998,24 C 38.887299,24 31.5,31.3873 31.5,40.500003 c 0,9.112699 7.387299,16.499998 16.499998,16.499998 C 57.1127,57.000001 64.5,49.612702 64.5,40.500003 64.5,31.3873 57.1127,24 47.999998,24 Z"
+     id="path1467" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     d="M 47.999998,23 C 38.887299,23 31.5,30.3873 31.5,39.500003 c 0,9.112699 7.387299,16.499998 16.499998,16.499998 C 57.1127,56.000001 64.5,48.612702 64.5,39.500003 64.5,30.3873 57.1127,23 47.999998,23 Z"
+     id="rect3049" />
+  <path
+     d="m 88.499999,47.998563 c 0,22.368254 -18.133803,40.501436 -40.499488,40.501436 -22.36773,0 -40.5005104,-18.133387 -40.5005104,-40.501436 0,-22.36722 18.1327804,-40.4985621 40.5005104,-40.4985621 22.365685,0 40.499488,18.1313421 40.499488,40.4985621 z"
+     id="path8655"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3012);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 48.000006,6.5 C 25.101738,6.5 6.5000017,25.101727 6.5000017,47.999996 c 0,22.89827 18.6017363,41.500008 41.5000043,41.500002 22.898258,0 41.500015,-18.601732 41.499992,-41.500002 C 89.499998,25.101727 70.898264,6.5 48.000006,6.5 Z"
+     id="path2555-6"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#002e99;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/categories/96/preferences-desktop.svg b/elementary-xfce/categories/96/preferences-desktop.svg
new file mode 100644
index 000000000..1ed44300d
--- /dev/null
+++ b/elementary-xfce/categories/96/preferences-desktop.svg
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg6649"
+   sodipodi:docname="preferences-desktop.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview111598"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="3.4766084"
+     inkscape:cx="1.4381833"
+     inkscape:cy="107.00083"
+     inkscape:window-width="1278"
+     inkscape:window-height="1005"
+     inkscape:window-x="450"
+     inkscape:window-y="14"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6649" />
+  <defs
+     id="defs6651">
+    <linearGradient
+       id="linearGradient3688-166-749">
+      <stop
+         id="stop2883"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702-501-757">
+      <stop
+         id="stop2895"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3702-501-757"
+       id="linearGradient1191"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="matrix(2.2857142,0,0,1.2857142,-6.857138,32.071432)" />
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3013-6-5-76"
+       xlink:href="#linearGradient3688-166-749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.007568,0,0,1.7999999,59.97626,9.700006)" />
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3015-1-6-9"
+       xlink:href="#linearGradient3688-166-749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.007568,0,0,1.7999999,-36.02374,-166.3)" />
+    <radialGradient
+       r="27.5"
+       fy="4.3419166"
+       fx="31.999998"
+       cy="4.3419166"
+       cx="31.999998"
+       gradientTransform="matrix(1.4525582e-8,3.3371521,-3.337152,1.4525582e-8,62.48964,-96.013051)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3044"
+       xlink:href="#linearGradient4632-92-3-0-8-1-9" />
+    <linearGradient
+       id="linearGradient4632-92-3-0-8-1-9">
+      <stop
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1"
+         id="stop4634-68-8-0-2-9-4" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1"
+         id="stop4636-8-21-7-1-4-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient27416-1-2-0">
+      <stop
+         offset="0"
+         style="stop-color:#55c1ec;stop-opacity:1"
+         id="stop27420-2-0-8" />
+      <stop
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1"
+         id="stop27422-3-5-3" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(2.0810812,0,0,2.0810812,-1.9459412,0.05407344)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924"
+       id="linearGradient4136"
+       y2="42.261559"
+       x2="23.99999"
+       y1="5.5907431"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient3924">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3926" />
+      <stop
+         offset="0.03750312"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop3928" />
+      <stop
+         offset="0.96667296"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop3930" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop3932" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4215-8-4-07-7">
+      <stop
+         id="stop4217-1-2-1-2"
+         offset="0"
+         style="stop-color:#e9e9e9;stop-opacity:1;" />
+      <stop
+         id="stop4219-3-4-0-96"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4011-9-9-70-61-7">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop4013-5-4-3-8-3" />
+      <stop
+         id="stop4015-1-5-70-9-5"
+         style="stop-color:#ffffff;stop-opacity:0.23529412;"
+         offset="0.507761" />
+      <stop
+         offset="0.83456558"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         id="stop4017-7-0-13-0-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687;"
+         id="stop4019-1-12-7-0-7" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.5746654,0,0,1.7248804,-2.3892835,-5.1961711)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient27416-1-2-0"
+       id="linearGradient3913-9-3"
+       y2="55.052982"
+       x2="30.271185"
+       y1="10.028973"
+       x1="30.271185" />
+    <linearGradient
+       y2="8.0928917"
+       x2="38.976662"
+       y1="59.967686"
+       x1="38.976662"
+       gradientTransform="matrix(-0.50980393,0,0,0.50980393,78.313722,32.666667)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3885-5"
+       xlink:href="#linearGradient4215-8-4-07-7" />
+    <linearGradient
+       y2="44.340794"
+       x2="71.204407"
+       y1="6.2375584"
+       x1="71.204407"
+       gradientTransform="matrix(-0.6756757,0,0,0.6756757,110.46861,32.866727)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3882-6"
+       xlink:href="#linearGradient4011-9-9-70-61-7" />
+  </defs>
+  <metadata
+     id="metadata6654">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="opacity:0.4;fill:url(#radialGradient3013-6-5-76);fill-opacity:1;stroke:none;stroke-width:0.862764"
+     id="rect2801-3-7-7-2"
+     y="83.5"
+     x="80"
+     height="8.999999"
+     width="10" />
+  <rect
+     style="opacity:0.4;fill:url(#radialGradient3015-1-6-9);fill-opacity:1;stroke:none;stroke-width:0.862764"
+     id="rect3696-6-3-5-0"
+     transform="scale(-1)"
+     y="-92.5"
+     x="-16"
+     height="8.999999"
+     width="10" />
+  <rect
+     style="opacity:0.4;fill:url(#linearGradient1191);fill-opacity:1;stroke:none;stroke-width:0.862764"
+     id="rect3700-4-6-9-6"
+     y="83.5"
+     x="16"
+     height="9"
+     width="64" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect5505-21-3"
+     y="11"
+     x="9"
+     ry="7.5"
+     rx="7.5"
+     height="78"
+     width="78" />
+  <rect
+     style="fill:none;stroke:url(#linearGradient4136);stroke-width:0.999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect6741-7"
+     y="11.499999"
+     x="9.499999"
+     ry="6.8613863"
+     rx="6.8613863"
+     height="77"
+     width="77" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect5505-21-3-1"
+     y="10.5"
+     x="8.5"
+     ry="8"
+     rx="8"
+     height="79"
+     width="79" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="rect3979-9"
+     y="37"
+     x="20"
+     ry="14"
+     rx="14.378378"
+     height="28"
+     width="56" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3913-9-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="rect3979"
+     y="36"
+     x="20"
+     ry="14"
+     rx="14.378378"
+     height="28"
+     width="56" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#0e4774;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.51065;marker:none;enable-background:accumulate"
+     id="rect3979-7-6"
+     d="m 34.378422,36.000003 c -7.965633,0 -14.378398,6.518461 -14.378398,14.615384 0,0.130684 0.02036,0.254774 0.02361,0.384616 0.202418,-7.914842 6.517683,-14.230769 14.35475,-14.230769 h 27.243281 c 7.837067,0 14.152332,6.315927 14.354749,14.230769 0.003,-0.129842 0.02361,-0.253932 0.02361,-0.384616 0,-8.096923 -6.412766,-14.615384 -14.378398,-14.615384 h -27.24328 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#0e4774;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.07449;marker:none;enable-background:accumulate"
+     id="rect3979-8"
+     d="m 34.366863,37.000004 c -7.84368,0 -14.164274,5.991596 -14.366863,13.5 0.202589,7.508404 6.523183,13.5 14.366863,13.5 h 0.757396 c -7.972354,0 -14.390532,-5.85827 -14.390532,-13.135135 0,-7.276865 6.418178,-13.135135 14.390532,-13.135135 h 25.75148 c 7.972355,0 14.390532,5.85827 14.390532,13.135135 0,7.276865 -6.418177,13.135135 -14.390532,13.135135 h 0.757396 c 7.843682,0 14.164276,-5.991596 14.366864,-13.5 -0.202588,-7.508404 -6.523182,-13.5 -14.366864,-13.5 z" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+     id="rect3979-5"
+     y="36.5"
+     x="20.500023"
+     ry="13.5"
+     rx="14.121622"
+     height="27"
+     width="55" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="path2555-7-1-9-4-9-1"
+     d="m 62,36 c 8.276483,0 15,6.723515 15,15.000004 0,8.276484 -6.723517,14.999999 -15,14.999999 -8.276482,0 -15.000015,-6.723515 -15,-14.999999 C 47,42.723515 53.723518,36 62,36 Z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     id="path2555-7-1-9-4-9"
+     d="m 62,37.000002 c 7.724714,0 14,6.275279 14,14.000002 0,7.724719 -6.275286,13.999998 -14,13.999998 -7.724728,0 -14.000015,-6.275279 -14,-13.999998 0,-7.724723 6.275272,-14.000002 14,-14.000002 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3885-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="path2555-7-1-9-4"
+     d="m 62,37 c 7.172952,0 13,5.827046 13,13.000001 C 75,57.172954 69.172952,63 62,63 54.827041,63 48.999985,57.172954 49,50.000001 49,42.827046 54.827041,37 62,37 Z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient3882-6);stroke-width:0.999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path8655-6-0-5-2"
+     d="m 49.5,49.999553 c 0,6.903793 5.596858,12.500449 12.499852,12.500449 6.903614,0 12.500151,-5.596725 12.500151,-12.500449 0,-6.903463 -5.596537,-12.499555 -12.500151,-12.499555 C 55.096858,37.499998 49.5,43.09609 49.5,49.999553 Z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#656565;stroke-width:0.999993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path2555-7-1-9-9-41"
+     d="m 62.000001,36.499997 c 7.448834,0 13.500002,6.051165 13.500002,13.500006 0,7.448837 -6.051168,13.500001 -13.500002,13.500001 -7.448841,0 -13.500016,-6.051164 -13.500001,-13.500001 0,-7.448841 6.05116,-13.500006 13.500001,-13.500006 z" />
+</svg>
diff --git a/elementary-xfce/categories/96/preferences-system-network.svg b/elementary-xfce/categories/96/preferences-system-network.svg
new file mode 100644
index 000000000..5830e7356
--- /dev/null
+++ b/elementary-xfce/categories/96/preferences-system-network.svg
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg4518"
+   height="96"
+   width="96"
+   version="1.1"
+   sodipodi:docname="preferences-system-network.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview3930"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="6.28125"
+     inkscape:cx="35.104478"
+     inkscape:cy="42.666667"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4518" />
+  <defs
+     id="defs4520">
+    <linearGradient
+       id="linearGradient898">
+      <stop
+         id="stop894"
+         offset="0"
+         style="stop-color:#cd9ef7;stop-opacity:1" />
+      <stop
+         id="stop896"
+         offset="1"
+         style="stop-color:#a56de2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4335">
+      <stop
+         id="stop4337"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4339"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(3.3583442,0,0,3.3583446,-194.39221,-45.586657)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4806-2-9"
+       id="linearGradient3549"
+       y2="40.495617"
+       x2="71.204407"
+       y1="15.369057"
+       x1="71.204407" />
+    <linearGradient
+       id="linearGradient4806-2-9">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4808-4-5" />
+      <stop
+         offset="0.42447853"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4810-0-5" />
+      <stop
+         offset="0.82089913"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4812-8-4" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4814-0-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3820-7-2-7">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3822-2-6-8" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3824-1-2-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1.8653444,1.8702655,0,5.1044048,-0.28262771)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4804"
+       id="linearGradient4362"
+       y2="23"
+       x2="47.5"
+       y1="23"
+       x1="3.5" />
+    <linearGradient
+       id="linearGradient4804">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4806" />
+      <stop
+         id="stop4808"
+         style="stop-color:#ffffff;stop-opacity:0.85098039;"
+         offset="0.29193082" />
+      <stop
+         offset="0.45720881"
+         style="stop-color:#ffffff;stop-opacity:0.12682927"
+         id="stop4812" />
+      <stop
+         id="stop4818"
+         style="stop-color:#ffffff;stop-opacity:0.27317074"
+         offset="0.72528207" />
+      <stop
+         id="stop4816"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.83954281" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4810" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.3224775,1.3189977,-1.3224775,1.3189977,44.814326,-16.687733)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4820"
+       id="linearGradient4355"
+       y2="27.242641"
+       x2="4.2867966"
+       y1="27.262068"
+       x1="47.09993" />
+    <linearGradient
+       id="linearGradient4820">
+      <stop
+         id="stop4822"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         offset="0.14318481"
+         style="stop-color:#ffffff;stop-opacity:0.85098039;"
+         id="stop4824" />
+      <stop
+         id="stop4826"
+         style="stop-color:#ffffff;stop-opacity:0.12682927"
+         offset="0.34591126" />
+      <stop
+         offset="0.43638432"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4928" />
+      <stop
+         id="stop4930"
+         style="stop-color:#ffffff;stop-opacity:0.20487805"
+         offset="0.58131737" />
+      <stop
+         offset="0.72528207"
+         style="stop-color:#ffffff;stop-opacity:0.27317074"
+         id="stop4828" />
+      <stop
+         offset="0.83954281"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4830" />
+      <stop
+         id="stop4832"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.8702655,0,0,-1.8653444,0.42874857,90.186587)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4834"
+       id="linearGradient4344"
+       y2="23"
+       x2="47.500416"
+       y1="23"
+       x1="4.4897356" />
+    <linearGradient
+       id="linearGradient4834">
+      <stop
+         id="stop4836"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         offset="0.16829832"
+         style="stop-color:#ffffff;stop-opacity:0.85098039;"
+         id="stop4838" />
+      <stop
+         id="stop4840"
+         style="stop-color:#ffffff;stop-opacity:0.12682927"
+         offset="0.45720881" />
+      <stop
+         offset="0.60839313"
+         style="stop-color:#ffffff;stop-opacity:0.27317074"
+         id="stop4842" />
+      <stop
+         offset="0.69343168"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4844" />
+      <stop
+         id="stop4846"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="22.179625"
+       x2="44.628685"
+       y1="58.276134"
+       x1="5.5509381"
+       gradientTransform="matrix(0,1.8653444,1.8702655,0,-19.289686,-0.28262771)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4898"
+       xlink:href="#linearGradient4914" />
+    <linearGradient
+       id="linearGradient4914">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4916" />
+      <stop
+         id="stop4918"
+         style="stop-color:#ffffff;stop-opacity:0.85098039;"
+         offset="0.14318481" />
+      <stop
+         offset="0.34591126"
+         style="stop-color:#ffffff;stop-opacity:0.12682927"
+         id="stop4920" />
+      <stop
+         id="stop4922"
+         style="stop-color:#ffffff;stop-opacity:0.27317074"
+         offset="0.64451498" />
+      <stop
+         id="stop4924"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.72840828" />
+      <stop
+         offset="0.80897337"
+         style="stop-color:#ffffff;stop-opacity:0.2292683"
+         id="stop4932" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4926" />
+    </linearGradient>
+    <linearGradient
+       y2="22.179625"
+       x2="44.628685"
+       y1="58.276134"
+       x1="5.5509381"
+       gradientTransform="matrix(0,-1.8653444,-1.8702655,0,81.850892,96.251387)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4946"
+       xlink:href="#linearGradient4914" />
+    <linearGradient
+       y2="17.055471"
+       x2="40.761398"
+       y1="48.221191"
+       x1="25.177414"
+       gradientTransform="matrix(0,1.8653444,1.8702655,0,1.3656003,9.7649974)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4950"
+       xlink:href="#linearGradient4952" />
+    <linearGradient
+       id="linearGradient4952">
+      <stop
+         id="stop4954"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         offset="0.44845921"
+         style="stop-color:#ffffff;stop-opacity:0.27317074"
+         id="stop4960" />
+      <stop
+         offset="0.54972553"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4962" />
+      <stop
+         id="stop4964"
+         style="stop-color:#ffffff;stop-opacity:0.2292683"
+         offset="0.72087312" />
+      <stop
+         id="stop4966"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4067793,0,0,1.4030776,2.9845716,2.9955854)"
+       r="3.6355374"
+       fy="21.303997"
+       fx="46.262897"
+       cy="21.303997"
+       cx="46.262897"
+       id="radialGradient4341"
+       xlink:href="#linearGradient4335" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4067793,0,0,1.4030776,2.9845716,2.9994193)"
+       r="3.6355374"
+       fy="43.294788"
+       fx="25.176781"
+       cy="43.294788"
+       cx="25.176781"
+       id="radialGradient4343"
+       xlink:href="#linearGradient4335" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4067793,0,0,1.4030776,2.9845716,3.0009069)"
+       r="3.6355374"
+       fy="51.827377"
+       fx="41.149601"
+       cy="51.827377"
+       cx="41.149601"
+       id="radialGradient4345"
+       xlink:href="#linearGradient4335" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4067793,0,0,1.4030776,2.9845716,2.9958209)"
+       r="3.6355374"
+       fy="22.655815"
+       fx="13.973961"
+       cy="22.655815"
+       cx="13.973961"
+       id="radialGradient4347"
+       xlink:href="#linearGradient4335" />
+    <linearGradient
+       gradientTransform="matrix(0,1.4067796,-1.4067793,0,93.016933,2.9831291)"
+       gradientUnits="userSpaceOnUse"
+       y2="31.999996"
+       x2="61.499943"
+       y1="31.999996"
+       x1="2.4999421"
+       id="linearGradient900"
+       xlink:href="#linearGradient898" />
+    <radialGradient
+       r="10.625"
+       fy="4.625"
+       fx="62.625"
+       cy="4.625"
+       cx="62.625"
+       gradientTransform="matrix(4.4235297,0,0,1.5058804,-229.02354,72.035294)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3950"
+       xlink:href="#linearGradient3820-7-2-7" />
+  </defs>
+  <metadata
+     id="metadata4523">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#radialGradient3950);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.999998;marker:none"
+     id="path8836"
+     d="m 95.000003,79 c 0,8.836555 -21.042621,16 -47.000001,16 C 22.042622,95 1,87.836555 1,79 1,70.163442 22.042623,63 48.000002,63 c 25.95738,0 47.000001,7.163442 47.000001,16 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient900);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;marker:none;enable-background:accumulate"
+     id="path2555"
+     d="m 89.499991,48.000002 c 0,-22.898269 -18.601725,-41.5000051 -41.499987,-41.5000051 -22.898269,0 -41.5000002,18.6017361 -41.4999946,41.5000051 0,22.89826 18.6017256,41.500013 41.4999946,41.499993 22.898262,0 41.499987,-18.601733 41.499987,-41.499993 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#7239b3;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path2555-7-1"
+     d="m 47.999999,6.4999998 c -22.898262,0 -41.4999885,18.6017302 -41.4999885,41.5000012 0,22.898271 18.6017265,41.50001 41.4999885,41.500003 22.89826,0 41.500004,-18.601732 41.49999,-41.500003 0,-22.898271 -18.60173,-41.5000012 -41.49999,-41.5000012 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3549);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path3026-5"
+     d="m 88.5,48.000002 c 0,22.367531 -18.132492,40.499996 -40.500019,40.499996 -22.367506,0 -40.4999814,-18.132465 -40.4999814,-40.499996 0,-22.367531 18.1324754,-40.5000025 40.4999814,-40.5000025 C 70.367508,7.4999995 88.5,25.632471 88.5,48.000002 Z" />
+  <path
+     d="M 51.487792,88.662495 C 80.542992,60.120556 69.353311,5.1061093 48.077846,7.1788656"
+     id="path3609"
+     style="opacity:1;fill:none;stroke:url(#linearGradient4362);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     d="M 76.553787,75.642109 C 61.329985,90.316882 6.2498278,47.979633 25.906624,13.518579"
+     id="path3611"
+     style="opacity:1;fill:none;stroke:url(#linearGradient4355);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     d="M 87.432168,39.441064 C 65.664548,23.847778 6.0112311,29.82453 7.9537954,48.112291"
+     id="path2835"
+     style="fill:none;stroke:url(#linearGradient4344);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     d="m 73.180655,32.886747 a 5.114399,5.1009415 0 0 1 -10.228798,0 5.114399,5.1009415 0 1 1 10.228798,0 z"
+     id="path3781-5-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4341);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00043;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.521277;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4345);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00043;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.521277;marker:none;enable-background:accumulate"
+     id="path4886"
+     d="m 65.987377,75.720817 a 5.1143986,5.1009411 0 0 1 -10.228796,0 5.1143986,5.1009411 0 1 1 10.228796,0 z" />
+  <path
+     d="m 27.757248,34.785763 a 5.1143986,5.1009411 0 0 1 -10.228796,0 5.1143986,5.1009411 0 1 1 10.228796,0 z"
+     id="path4892"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4347);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00043;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.521277;marker:none;enable-background:accumulate" />
+  <path
+     style="opacity:1;fill:none;stroke:url(#linearGradient4898);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path4896"
+     d="M 15.842025,71.829389 C 44.706672,66.779612 66.951135,38.772322 68.179024,31.918432" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4343);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00043;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.521277;marker:none;enable-background:accumulate"
+     id="path4936"
+     d="m 43.517142,63.747443 a 5.1143986,5.1009411 0 0 1 -10.228796,0 5.1143986,5.1009411 0 1 1 10.228796,0 z" />
+  <path
+     d="M 52.867106,6.8262014 C 21.020942,13.362813 9.0256855,64.573231 14.634167,70.723111"
+     id="path4944"
+     style="opacity:1;fill:none;stroke:url(#linearGradient4946);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:none;stroke:url(#linearGradient4950);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path4948"
+     d="m 30.739849,83.730449 c 8.4986,1.623109 49.119365,-6.028734 57.35209,-35.056269" />
+</svg>
diff --git a/elementary-xfce/categories/symbolic/preferences-desktop-personal-symbolic.svg b/elementary-xfce/categories/symbolic/preferences-desktop-personal-symbolic.svg
new file mode 100644
index 000000000..fe5ec5e34
--- /dev/null
+++ b/elementary-xfce/categories/symbolic/preferences-desktop-personal-symbolic.svg
@@ -0,0 +1,7 @@
+<svg height='16' width='16' xmlns='http://www.w3.org/2000/svg'>
+    <g transform='translate(-593 171)'>
+        <path color='#000' d='M601-171a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 1a7 7 0 0 1 7 7c0 1.972-.844 3.728-2.156 5-.443-1.727-1.975-3-3.844-3h-2c-1.869 0-3.4 1.273-3.844 3-1.312-1.272-2.156-3.028-2.156-5a7 7 0 0 1 7-7z' fill='#666' overflow='visible' style='marker:none'/>
+        <path color='#000' d='M601-167.75c-1.795 0-3.25 1.4-3.25 3.125 0 1.726 1.455 3.125 3.25 3.125s3.25-1.4 3.25-3.125c0-1.726-1.455-3.125-3.25-3.125z' fill='#666' overflow='visible' style='marker:none'/>
+        
+    </g>
+</svg>
diff --git a/elementary-xfce/status/128/avatar-default.svg b/elementary-xfce/status/128/avatar-default.svg
deleted file mode 100644
index 7075b9214..000000000
--- a/elementary-xfce/status/128/avatar-default.svg
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="svg5157"
-   height="128"
-   width="128"
-   version="1.1"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview28"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="7.5351066"
-     inkscape:cx="56.004516"
-     inkscape:cy="48.705349"
-     inkscape:window-width="1920"
-     inkscape:window-height="1034"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5157" />
-  <defs
-     id="defs5159">
-    <linearGradient
-       id="linearGradient3820-7-2-8-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-5-0" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-4-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-6-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4806">
-      <stop
-         id="stop4808"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4810"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.42447853" />
-      <stop
-         id="stop4812"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.82089913" />
-      <stop
-         id="stop4814"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="39.994175"
-       x2="71.204407"
-       y1="15.761489"
-       x1="71.204407"
-       gradientTransform="matrix(4.16388,0,0,4.16388,-236.03265,-50.534426)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3118"
-       xlink:href="#linearGradient4806" />
-    <radialGradient
-       r="62.769119"
-       fy="186.17059"
-       fx="99.157013"
-       cy="186.17059"
-       cx="99.157013"
-       gradientTransform="matrix(0.6869404,0,0,-0.21461693,-4.02174,148.48403)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3163"
-       xlink:href="#linearGradient3820-7-2-8-6" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7627119,0,0,1.7627118,8.093219,9.0932259)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata5162">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     d="m 107.21186,108.52868 c 0.005,-7.44114 -19.301247,-13.474207 -43.118643,-13.474207 -23.817396,0 -43.123773,6.033067 -43.118643,13.474207 -0.0051,7.44114 19.801244,13.47421 43.61864,13.47421 23.817396,0 42.623776,-6.03307 42.618646,-13.47421 z"
-     id="path3818-0-5-0"
-     style="fill:url(#radialGradient3163);fill-opacity:1;stroke:none" />
-  <g
-     id="g4274"
-     transform="translate(-184.16949,-7.9999975)" />
-  <path
-     d="M 64.500002,13.5 C 35.808201,13.5 12.5,36.80819 12.5,65.499996 12.5,94.191807 35.808201,117.50001 64.500002,117.5 93.191802,117.5 116.50003,94.191807 116.5,65.499996 116.5,36.80819 93.191802,13.5 64.500002,13.5 Z"
-     id="path2555-3"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999998;marker:none;enable-background:accumulate" />
-  <path
-     d="M 64.499997,13.499997 C 93.191809,13.499997 116.5,36.808186 116.5,65.500001 116.5,94.191809 93.191809,117.50001 64.499997,117.5 35.80819,117.5 12.49998,94.191809 12.5,65.500001 12.5,36.808186 35.80819,13.499997 64.499997,13.499997 Z"
-     id="path2555-7-65-3"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#003651;stroke-width:1;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-  <path
-     d="m 115.5,65.500001 c 0,28.166516 -22.833502,50.999989 -51.000026,50.999989 -28.166487,0 -50.999973,-22.833473 -50.999973,-50.999989 0,-28.166517 22.833486,-50.999991 50.999973,-50.999991 28.166524,0 51.000026,22.833474 51.000026,50.999991 z"
-     id="path3019"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3118);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.07000002;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
-     id="path4330"
-     d="m 64,36.996094 c -11.909732,0 -21.625,9.317795 -21.625,20.832031 0,11.514237 9.715383,20.830078 21.625,20.830078 11.909618,0 21.625,-9.315841 21.625,-20.830078 C 85.625,46.313889 75.909731,36.996094 64,36.996094 Z m -7.558594,42.976562 c -9.676157,0 -18.04983,5.699183 -22.259765,14.033203 a 1.0030908,1.0030908 0 0 0 0.162109,1.138672 C 41.760296,103.05527 52.304346,108.00391 64,108.00391 c 11.695654,0 22.239704,-4.94864 29.65625,-12.859379 a 1.0030908,1.0030908 0 0 0 0.162109,-1.138672 C 89.608424,85.671839 81.234752,79.972656 71.558594,79.972656 l -15.117188,0 z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-     id="rect3049-9"
-     d="m 64,38 c -11.388492,0 -20.620689,8.877113 -20.620689,19.827586 0,10.950474 9.232197,19.827587 20.620689,19.827587 11.388493,0 20.620688,-8.877113 20.620688,-19.827587 C 84.620688,46.877113 75.388491,38 64,38 Z m -7.559267,42.976293 c -9.282797,0 -17.312149,5.461239 -21.364225,13.48276 C 42.3116,102.17625 52.586961,107 64,107 75.413039,107 85.6884,102.17625 92.923492,94.459053 88.871416,86.437532 80.842065,80.976293 71.559267,80.976293 l -15.118534,0 z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-     id="rect3049"
-     d="m 64,37 c -11.388492,0 -20.620689,8.877113 -20.620689,19.827586 0,10.950474 9.232197,19.827587 20.620689,19.827587 11.388493,0 20.620688,-8.877113 20.620688,-19.827587 C 84.620688,45.877113 75.388491,37 64,37 Z m -7.559267,42.976293 c -9.282797,0 -17.312149,5.461239 -21.364225,13.48276 C 42.3116,101.17625 52.586961,106 64,106 75.413039,106 85.6884,101.17625 92.923492,93.459053 88.871416,85.437532 80.842065,79.976293 71.559267,79.976293 l -15.118534,0 z" />
-</svg>
diff --git a/elementary-xfce/status/128/avatar-default.svg b/elementary-xfce/status/128/avatar-default.svg
new file mode 120000
index 000000000..e108ff3cb
--- /dev/null
+++ b/elementary-xfce/status/128/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/128/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/16/avatar-default.svg b/elementary-xfce/status/16/avatar-default.svg
deleted file mode 100644
index 25088d8d1..000000000
--- a/elementary-xfce/status/16/avatar-default.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg4505"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview27"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="15.070213"
-     inkscape:cx="10.28519"
-     inkscape:cy="16.224057"
-     inkscape:window-width="1920"
-     inkscape:window-height="1031"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4505" />
-  <defs
-     id="defs4507">
-    <linearGradient
-       id="linearGradient4806-9">
-      <stop
-         id="stop4808-49"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4810-05"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.42447853" />
-      <stop
-         id="stop4812-6"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.82089913" />
-      <stop
-         id="stop4814-7"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3820-7-2-2">
-      <stop
-         id="stop3822-2-6-36"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-6"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-4"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="71.204407"
-       y1="15.369057"
-       x2="71.204407"
-       y2="40.495617"
-       id="linearGradient3028"
-       xlink:href="#linearGradient4806-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.57010515,0,0,0.57010543,-33.147974,-7.8870696)" />
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient3043"
-       xlink:href="#linearGradient3820-7-2-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.17524541,0,0,0.05575992,-1.37681,18.119145)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.25423729,0,0,0.25423729,-0.13559324,-0.13559262)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4510">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     d="m 8.0000006,0.49999981 c -4.1382408,0 -7.5000005,3.36175839 -7.5000005,7.49999999 0,4.1382412 3.3617597,7.5000022 7.5000005,7.5000002 C 12.13824,15.5 15.500005,12.138241 15.5,7.9999998 15.5,3.8617582 12.13824,0.49999981 8.0000006,0.49999981 Z"
-     id="path2555"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 8,0.49999992 c -4.1382413,0 -7.5,3.36175808 -7.5,7.49999988 C 0.5,12.138241 3.8617587,15.500002 8,15.5 c 4.138241,0 7.500006,-3.361759 7.5,-7.5000002 C 15.5,3.861758 12.138241,0.49999992 8,0.49999992 Z"
-     id="path2555-7-1-7"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 14.982759,8.0000002 c 0,3.8564708 -3.126295,6.9827588 -6.982759,6.9827588 -3.8564638,0 -6.9827586,-3.126288 -6.9827586,-6.9827588 0,-3.8564707 3.1262948,-6.9827589 6.9827586,-6.9827589 3.856464,0 6.982759,3.1262882 6.982759,6.9827589 z"
-     id="path3421"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3028);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3840"
-     d="m 8,4.2160218 c -1.7237849,0 -3.1211886,1.3436579 -3.1211886,3.0011434 0,1.6574856 1.3974037,3.0011438 3.1211886,3.0011438 1.723785,0 3.12119,-1.3436582 3.12119,-3.0011438 C 11.12119,5.5596797 9.723785,4.2160218 8,4.2160218 Z M 6.8558146,10.720999 c -1.405063,0 -2.6204018,0.826625 -3.2337324,2.040778 C 4.7172007,13.929867 6.2724997,14.66 8,14.66 c 1.727501,0 3.2828,-0.730133 4.377919,-1.898223 -0.613331,-1.214153 -1.82867,-2.040778 -3.2337329,-2.040778 z" />
-  <path
-     d="m 8,4.0540285 c -1.7237849,0 -3.1211886,1.3436579 -3.1211886,3.0011435 0,1.6574855 1.3974037,3.001143 3.1211886,3.001143 1.723785,0 3.12119,-1.3436575 3.12119,-3.001143 C 11.12119,5.3976864 9.723785,4.0540285 8,4.0540285 Z M 6.8558146,10.559007 c -1.405063,0 -2.6204018,0.826623 -3.2337324,2.040777 1.0951185,1.16809 2.6504175,1.898223 4.3779178,1.898223 1.727501,0 3.2828,-0.730133 4.377919,-1.898223 -0.613331,-1.214154 -1.82867,-2.040777 -3.2337329,-2.040777 z"
-     id="path3070"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-     id="rect3049"
-     d="m 8,3.5367871 c -1.7237849,0 -3.1211886,1.3436579 -3.1211886,3.0011435 0,1.6574856 1.3974037,3.0011435 3.1211886,3.0011435 1.723785,0 3.12119,-1.3436579 3.12119,-3.0011435 C 11.12119,4.880445 9.723785,3.5367871 8,3.5367871 Z M 6.8558146,10.041765 c -1.405063,0 -2.6204018,0.826624 -3.2337324,2.040777 C 4.7172007,13.250633 6.2724997,13.980765 8,13.980765 c 1.727501,0 3.2828,-0.730132 4.377919,-1.898223 -0.613331,-1.214153 -1.82867,-2.040777 -3.2337329,-2.040777 z" />
-</svg>
diff --git a/elementary-xfce/status/16/avatar-default.svg b/elementary-xfce/status/16/avatar-default.svg
new file mode 120000
index 000000000..24616f008
--- /dev/null
+++ b/elementary-xfce/status/16/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/16/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/16/network-offline.svg b/elementary-xfce/status/16/network-offline.svg
deleted file mode 120000
index 776c5ad44..000000000
--- a/elementary-xfce/status/16/network-offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-network-wireless-offline.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/16/network-offline.svg b/elementary-xfce/status/16/network-offline.svg
new file mode 100644
index 000000000..0ab680ad7
--- /dev/null
+++ b/elementary-xfce/status/16/network-offline.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   sodipodi:docname="network-offline.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview245"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="22.627417"
+     inkscape:cx="11.159029"
+     inkscape:cy="8.1759222"
+     inkscape:window-width="1278"
+     inkscape:window-height="1005"
+     inkscape:window-x="640"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     showguides="true" />
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <path
+     id="path6-3"
+     style="stroke-width:1;marker:none;fill:#33a4ff;fill-opacity:1"
+     d="M 8 1.625 C 5.7343723 1.625 2.1674648 2.240655 0 4.1894531 L 7.25 14.375 L 8.75 14.375 L 9.9121094 12.740234 L 9.5859375 12.414062 C 9.4505432 12.278668 9.3398845 12.126119 9.2519531 11.964844 L 8.25 13.375 L 7.75 13.375 L 1.4394531 4.4863281 C 3.2890513 3.1081961 5.5978694 2.625 8 2.625 C 10.403199 2.625 12.712016 3.1081961 14.560547 4.4863281 L 11.333984 9.03125 C 11.671916 9.0887325 11.99072 9.2292831 12.257812 9.4453125 L 16 4.1894531 C 13.833602 2.2417217 10.265628 1.625 8 1.625 z " />
+  <path
+     d="m 15,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 0.390625,0.390625 0.390625,1.023437 0,1.414062 L 14.414062,13 l 1.292969,1.292969 c 0.390625,0.390625 0.390625,1.023437 0,1.414062 -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 L 13,14.414062 11.707031,15.707031 c -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 L 11.585938,13 10.292969,11.707031 c -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 C 10.480469,10.105469 10.734375,10 11,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 L 13,11.585938 14.292969,10.292969 C 14.480469,10.105469 14.734375,10 15,10 Z m 0,0"
+     id="path2"
+     style="fill:#ed5353;fill-opacity:1" />
+</svg>
diff --git a/elementary-xfce/status/16/network-wireless-offline.svg b/elementary-xfce/status/16/network-wireless-offline.svg
deleted file mode 100644
index db08ba600..000000000
--- a/elementary-xfce/status/16/network-wireless-offline.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1"
-   sodipodi:docname="network-wireless-offline.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview245"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="22.627417"
-     inkscape:cx="11.159029"
-     inkscape:cy="8.1759222"
-     inkscape:window-width="1278"
-     inkscape:window-height="1005"
-     inkscape:window-x="640"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2"
-     showguides="true" />
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <path
-     id="path6-3"
-     style="stroke-width:1;marker:none;fill:#33a4ff;fill-opacity:1"
-     d="M 8 1.625 C 5.7343723 1.625 2.1674648 2.240655 0 4.1894531 L 7.25 14.375 L 8.75 14.375 L 9.9121094 12.740234 L 9.5859375 12.414062 C 9.4505432 12.278668 9.3398845 12.126119 9.2519531 11.964844 L 8.25 13.375 L 7.75 13.375 L 1.4394531 4.4863281 C 3.2890513 3.1081961 5.5978694 2.625 8 2.625 C 10.403199 2.625 12.712016 3.1081961 14.560547 4.4863281 L 11.333984 9.03125 C 11.671916 9.0887325 11.99072 9.2292831 12.257812 9.4453125 L 16 4.1894531 C 13.833602 2.2417217 10.265628 1.625 8 1.625 z " />
-  <path
-     d="m 15,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 0.390625,0.390625 0.390625,1.023437 0,1.414062 L 14.414062,13 l 1.292969,1.292969 c 0.390625,0.390625 0.390625,1.023437 0,1.414062 -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 L 13,14.414062 11.707031,15.707031 c -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 L 11.585938,13 10.292969,11.707031 c -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 C 10.480469,10.105469 10.734375,10 11,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 L 13,11.585938 14.292969,10.292969 C 14.480469,10.105469 14.734375,10 15,10 Z m 0,0"
-     id="path2"
-     style="fill:#ed5353;fill-opacity:1" />
-</svg>
diff --git a/elementary-xfce/status/16/network-wireless-offline.svg b/elementary-xfce/status/16/network-wireless-offline.svg
new file mode 120000
index 000000000..af43e27f7
--- /dev/null
+++ b/elementary-xfce/status/16/network-wireless-offline.svg
@@ -0,0 +1 @@
+network-offline.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/22/avatar-default.svg b/elementary-xfce/status/22/avatar-default.svg
deleted file mode 100644
index 30a5a9d4f..000000000
--- a/elementary-xfce/status/22/avatar-default.svg
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="22"
-   height="22"
-   id="svg3749"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview27"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="28.416667"
-     inkscape:cx="9.14956"
-     inkscape:cy="12"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3749"
-     inkscape:showpageshadow="2"
-     inkscape:deskcolor="#d1d1d1" />
-  <metadata
-     id="metadata148432">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3751">
-    <linearGradient
-       id="linearGradient3820-7-2-2">
-      <stop
-         id="stop3822-2-6-36"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-6"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-4"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4806-9">
-      <stop
-         id="stop4808-49"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4810-05"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.42447853" />
-      <stop
-         id="stop4812-6"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.82089913" />
-      <stop
-         id="stop4814-7"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="71.204407"
-       y1="15.369057"
-       x2="71.204407"
-       y2="40.495617"
-       id="linearGradient3097"
-       xlink:href="#linearGradient4806-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.77562456,0,0,0.77562491,-44.981566,-10.614261)" />
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient3108"
-       xlink:href="#linearGradient3820-7-2-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.12745121,0,0,0.03186282,-1.6376809,14.068084)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35593221,0,0,0.35593221,-0.38983063,-0.38982955)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-  </defs>
-  <path
-     d="M 18.999999,20 A 7.9999997,2 0 0 1 3.0000001,20 7.9999997,2 0 1 1 18.999999,20 Z"
-     id="path3818-0-2"
-     style="fill:url(#radialGradient3108);fill-opacity:1;stroke:none;stroke-width:1" />
-  <path
-     d="M 11.000001,0.4999998 C 5.2064636,0.4999998 0.50000007,5.2064615 0.50000007,11 c 0,5.793538 4.70646353,10.500002 10.50000093,10.5 C 16.793537,21.5 21.500006,16.793538 21.5,11 21.5,5.2064615 16.793537,0.4999998 11.000001,0.4999998 Z"
-     id="path2555"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999998;marker:none;enable-background:accumulate" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-     id="path4100"
-     d="m 11,5.1562499 c -2.8103572,0 -5.15625,2.2348172 -5.15625,5.0000001 0,1.697435 0.9514114,3.099476 2.28125,4 -1.6306,0.438147 -3.0568081,1.379026 -3.8125,2.875 a 1.0212743,1.0212743 0 0 0 0.15625,1.15625 c 1.6332815,1.742116 3.9618924,2.84375 6.53125,2.84375 2.569357,0 4.897969,-1.101634 6.53125,-2.84375 a 1.0212743,1.0212743 0 0 0 0.15625,-1.15625 c -0.755691,-1.495974 -2.1819,-2.436853 -3.8125,-2.875 1.329839,-0.900524 2.28125,-2.302565 2.28125,-4 0,-2.7651829 -2.345893,-5.0000001 -5.15625,-5.0000001 z" />
-  <path
-     d="m 11,6.1869099 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.9692791 0,2.192172 1.848191,3.969279 4.12805,3.969279 2.279859,0 4.12805,-1.777107 4.12805,-3.969279 C 15.12805,7.9640166 13.279859,6.1869099 11,6.1869099 Z M 9.486712,14.790322 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 C 6.6582054,19.034336 8.7152269,20 11,20 c 2.284773,0 4.341795,-0.965664 5.790185,-2.510569 -0.811183,-1.605826 -2.418577,-2.699109 -4.276897,-2.699109 z"
-     id="rect3049-2"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-  <path
-     d="m 11,5.1254682 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.9692787 0,2.1921721 1.848191,3.9692791 4.12805,3.9692791 2.279859,0 4.12805,-1.777107 4.12805,-3.9692791 0,-2.192172 -1.848191,-3.9692787 -4.12805,-3.9692787 z M 9.486712,13.72888 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 1.4483909,1.544905 3.5054124,2.510569 5.7901855,2.510569 2.284773,0 4.341795,-0.965664 5.790186,-2.510569 -0.811184,-1.605826 -2.418578,-2.699109 -4.276898,-2.699109 z"
-     id="rect3049"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-  <path
-     d="M 11,0.5 C 5.206462,0.5 0.49999997,5.2064617 0.49999997,10.999999 0.49999997,16.793538 5.206462,21.500002 11,21.5 16.793538,21.5 21.500007,16.793538 21.5,10.999999 21.5,5.2064617 16.793538,0.5 11,0.5 Z"
-     id="path2555-7-1-7"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 20.500001,11 c 0,5.246706 -4.253305,9.5 -9.500001,9.5 -5.246695,0 -9.5,-4.253294 -9.5,-9.5 0,-5.2467043 4.253305,-9.5000004 9.5,-9.5000004 5.246696,0 9.500001,4.2532961 9.500001,9.5000004 z"
-     id="path3421"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3097);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/22/avatar-default.svg b/elementary-xfce/status/22/avatar-default.svg
new file mode 120000
index 000000000..8138dc0b8
--- /dev/null
+++ b/elementary-xfce/status/22/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/22/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/24/avatar-default.svg b/elementary-xfce/status/24/avatar-default.svg
deleted file mode 100644
index 56f697ce5..000000000
--- a/elementary-xfce/status/24/avatar-default.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="24"
-   height="24"
-   id="svg3749"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview27"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="28.416667"
-     inkscape:cx="11.472141"
-     inkscape:cy="12"
-     inkscape:window-width="1920"
-     inkscape:window-height="1034"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3749" />
-  <metadata
-     id="metadata148432">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3751">
-    <linearGradient
-       id="linearGradient3820-7-2-2">
-      <stop
-         id="stop3822-2-6-36"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-6"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-4"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4806-9">
-      <stop
-         id="stop4808-49"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4810-05"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.42447853" />
-      <stop
-         id="stop4812-6"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.82089913" />
-      <stop
-         id="stop4814-7"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="71.204407"
-       y1="15.369057"
-       x2="71.204407"
-       y2="40.495617"
-       id="linearGradient3097"
-       xlink:href="#linearGradient4806-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.77562456,0,0,0.77562491,-43.981566,-9.6142608)" />
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient3108"
-       xlink:href="#linearGradient3820-7-2-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.11151981,0,0,0.03548359,0.942029,15.166729)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35593221,0,0,0.35593221,0.6101694,0.61017055)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 19,21.772727 a 7,2.2272727 0 0 1 -14,0 7,2.2272727 0 1 1 14,0 z"
-     id="path3818-0-2"
-     style="fill:url(#radialGradient3108);fill-opacity:1;stroke:none" />
-  <path
-     d="M 12.000001,1.4999999 C 6.2064636,1.4999999 1.5000001,6.2064616 1.5000001,12 c 0,5.793538 4.7064635,10.500002 10.5000009,10.5 C 17.793537,22.5 22.500006,17.793538 22.5,12 22.5,6.2064616 17.793537,1.4999999 12.000001,1.4999999 Z"
-     id="path2555"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999998;marker:none;enable-background:accumulate" />
-  <path
-     style="opacity:0.07000002000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path4100"
-     d="m 12,6.15625 c -2.8103572,0 -5.15625,2.2348172 -5.15625,5 0,1.697435 0.9514114,3.099476 2.28125,4 -1.6306,0.438147 -3.0568081,1.379026 -3.8125,2.875 a 1.0212743,1.0212743 0 0 0 0.15625,1.15625 c 1.6332815,1.742116 3.9618924,2.84375 6.53125,2.84375 2.569357,0 4.897969,-1.101634 6.53125,-2.84375 a 1.0212743,1.0212743 0 0 0 0.15625,-1.15625 c -0.755691,-1.495974 -2.1819,-2.436853 -3.8125,-2.875 1.329839,-0.900524 2.28125,-2.302565 2.28125,-4 0,-2.7651828 -2.345893,-5 -5.15625,-5 z" />
-  <path
-     d="m 12,7.18691 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.969279 0,2.192172 1.848191,3.969279 4.12805,3.969279 2.279859,0 4.12805,-1.777107 4.12805,-3.969279 C 16.12805,8.9640167 14.279859,7.18691 12,7.18691 z m -1.513288,8.603412 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 C 7.6582054,20.034336 9.7152269,21 12,21 c 2.284773,0 4.341795,-0.965664 5.790185,-2.510569 -0.811183,-1.605826 -2.418577,-2.699109 -4.276897,-2.699109 l -3.026576,0 z"
-     id="rect3049-2"
-     style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 12,6.1254683 c -2.279859,0 -4.12805,1.7771067 -4.12805,3.9692787 0,2.192172 1.848191,3.969279 4.12805,3.969279 2.279859,0 4.12805,-1.777107 4.12805,-3.969279 C 16.12805,7.902575 14.279859,6.1254683 12,6.1254683 z M 10.486712,14.72888 c -1.8583202,0 -3.4657136,1.093283 -4.2768975,2.699109 1.4483909,1.544905 3.5054124,2.510569 5.7901855,2.510569 2.284773,0 4.341795,-0.965664 5.790186,-2.510569 -0.811184,-1.605826 -2.418578,-2.699109 -4.276898,-2.699109 l -3.026576,0 z"
-     id="rect3049"
-     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 12,1.5000001 C 6.206462,1.5000001 1.5,6.2064618 1.5,11.999999 1.5,17.793538 6.206462,22.500002 12,22.5 17.793538,22.5 22.500007,17.793538 22.5,11.999999 22.5,6.2064618 17.793538,1.5000001 12,1.5000001 z"
-     id="path2555-7-1-7"
-     style="opacity:0.50000000000000000;color:#000000;fill:#000000;stroke:#003651;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:0;fill-rule:nonzero" />
-  <path
-     d="m 21.500001,12 c 0,5.246706 -4.253305,9.5 -9.500001,9.5 -5.246695,0 -9.5,-4.253294 -9.5,-9.5 0,-5.2467042 4.253305,-9.5000003 9.5,-9.5000003 5.246696,0 9.500001,4.2532961 9.500001,9.5000003 z"
-     id="path3421"
-     style="color:#000000;fill:none;stroke:url(#linearGradient3097);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5" />
-</svg>
diff --git a/elementary-xfce/status/24/avatar-default.svg b/elementary-xfce/status/24/avatar-default.svg
new file mode 120000
index 000000000..9b19d3cf8
--- /dev/null
+++ b/elementary-xfce/status/24/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/24/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/avatar-default.svg b/elementary-xfce/status/32/avatar-default.svg
deleted file mode 100644
index 1b2ef7222..000000000
--- a/elementary-xfce/status/32/avatar-default.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="32"
-   height="32"
-   id="svg4505"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview27"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="15.070213"
-     inkscape:cx="10.28519"
-     inkscape:cy="16.257235"
-     inkscape:window-width="1920"
-     inkscape:window-height="1034"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4505" />
-  <defs
-     id="defs4507">
-    <linearGradient
-       id="linearGradient4806-9">
-      <stop
-         id="stop4808-49"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4810-05"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.42447853" />
-      <stop
-         id="stop4812-6"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.82089913" />
-      <stop
-         id="stop4814-7"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3820-7-2-2">
-      <stop
-         id="stop3822-2-6-36"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-6"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-4"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="71.204407"
-       y1="15.369057"
-       x2="71.204407"
-       y2="40.495617"
-       id="linearGradient3028"
-       xlink:href="#linearGradient4806-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1022033,0,0,1.1022038,-63.55275,-14.715001)" />
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient3043"
-       xlink:href="#linearGradient3820-7-2-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.17524541,0,0,0.05575992,-1.37681,18.119145)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49152542,0,0,0.49152542,0.27118635,0.2711875)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4510">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     d="m 27.000001,28.499999 a 11,3.4999999 0 1 1 -21.9999996,0 11,3.4999999 0 1 1 21.9999996,0 z"
-     id="path3818-0-2"
-     style="fill:url(#radialGradient3043);fill-opacity:1;stroke:none" />
-  <path
-     d="m 16.000001,1.4999995 c -8.0005987,0 -14.5000007,6.4993994 -14.5000007,14.4999995 0,8.000601 6.499402,14.500003 14.5000007,14.500001 C 24.000598,30.5 30.500008,24.0006 30.5,15.999999 30.5,7.9993989 24.000598,1.4999995 16.000001,1.4999995 Z"
-     id="path2555"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,1.4999996 c -8.0006,0 -14.5,6.499399 -14.5,14.4999994 C 1.5,24.0006 7.9994,30.500003 16,30.5 24.0006,30.5 30.50001,24.0006 30.5,15.999999 30.5,7.9993986 24.0006,1.4999996 16,1.4999996 z"
-     id="path2555-7-1-7"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#003651;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 29.5,16 C 29.5,23.455845 23.45583,29.5 16,29.5 8.54417,29.5 2.5,23.455845 2.5,16 2.5,8.5441566 8.54417,2.4999996 16,2.4999996 c 7.45583,0 13.5,6.044157 13.5,13.5000004 z"
-     id="path3421"
-     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3028);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     style="opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3840"
-     d="m 16,8.6843084 c -3.332651,0 -6.034298,2.5977386 -6.034298,5.8022106 0,3.204472 2.701647,5.80221 6.034298,5.80221 3.332651,0 6.034299,-2.597738 6.034299,-5.80221 0,-3.204472 -2.701648,-5.8022106 -6.034299,-5.8022106 z M 13.787908,21.260599 c -2.716455,0 -5.06611,1.59814 -6.2518825,3.945503 C 9.6532546,27.46441 12.660166,28.876 16,28.876 c 3.339835,0 6.346746,-1.41159 8.463975,-3.669898 -1.185773,-2.347363 -3.535427,-3.945503 -6.251882,-3.945503 l -4.424185,0 z" />
-  <path
-     d="m 16,8.3711214 c -3.332651,0 -6.034298,2.5977386 -6.034298,5.8022106 0,3.204472 2.701647,5.80221 6.034298,5.80221 3.332651,0 6.034299,-2.597738 6.034299,-5.80221 C 22.034299,10.96886 19.332651,8.3711214 16,8.3711214 z M 13.787908,20.947412 c -2.716455,0 -5.06611,1.59814 -6.2518825,3.945503 2.1172291,2.258308 5.1241405,3.669898 8.4639745,3.669898 3.339835,0 6.346746,-1.41159 8.463975,-3.669898 -1.185773,-2.347363 -3.535427,-3.945503 -6.251882,-3.945503 l -4.424185,0 z"
-     id="path3070"
-     style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3049"
-     d="m 16,7.3711214 c -3.332651,0 -6.034298,2.5977386 -6.034298,5.8022106 0,3.204472 2.701647,5.80221 6.034298,5.80221 3.332651,0 6.034299,-2.597738 6.034299,-5.80221 C 22.034299,9.96886 19.332651,7.3711214 16,7.3711214 z M 13.787908,19.947412 c -2.716455,0 -5.06611,1.59814 -6.2518825,3.945503 2.1172291,2.258308 5.1241405,3.669898 8.4639745,3.669898 3.339835,0 6.346746,-1.41159 8.463975,-3.669898 -1.185773,-2.347363 -3.535427,-3.945503 -6.251882,-3.945503 l -4.424185,0 z" />
-</svg>
diff --git a/elementary-xfce/status/32/avatar-default.svg b/elementary-xfce/status/32/avatar-default.svg
new file mode 120000
index 000000000..4e3b57110
--- /dev/null
+++ b/elementary-xfce/status/32/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/32/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/avatar-default.svg b/elementary-xfce/status/48/avatar-default.svg
deleted file mode 100644
index 7def44474..000000000
--- a/elementary-xfce/status/48/avatar-default.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg4031"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview27"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="14.208333"
-     inkscape:cx="22.873901"
-     inkscape:cy="24.000001"
-     inkscape:window-width="1317"
-     inkscape:window-height="893"
-     inkscape:window-x="303"
-     inkscape:window-y="712"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4031" />
-  <defs
-     id="defs4033">
-    <linearGradient
-       id="linearGradient4011">
-      <stop
-         id="stop4013"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4015"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.507761" />
-      <stop
-         id="stop4017"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.83456558" />
-      <stop
-         id="stop4019"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3820-7-2-1">
-      <stop
-         id="stop3822-2-6-3"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="71.204407"
-       y1="6.2375584"
-       x2="71.204407"
-       y2="44.340794"
-       id="linearGradient3012"
-       xlink:href="#linearGradient4011"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-47.733513,-1.3572406)" />
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient3018"
-       xlink:href="#linearGradient3820-7-2-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.27083381,0,0,0.08762273,-2.855072,25.187228)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66101694,0,0,0.66101694,2.8474568,2.8474595)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4036">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     d="m 40.999999,41.499999 a 17,5.4999999 0 1 1 -33.999999,0 17,5.4999999 0 1 1 33.999999,0 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient3018);fill-opacity:1;stroke:none" />
-  <path
-     d="M 24.000001,4.5 C 13.240575,4.5 4.5,13.240571 4.5,23.999999 4.5,34.759427 13.240575,43.500003 24.000001,43.5 34.759425,43.5 43.50001,34.759427 43.5,23.999999 43.5,13.240571 34.759425,4.5 24.000001,4.5 Z"
-     id="path2555"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 24,12.5 c -4.528073,0 -8.1988,3.602306 -8.1988,8.045977 0,4.443669 3.670727,8.045976 8.1988,8.045976 4.528072,0 8.1988,-3.602307 8.1988,-8.045976 C 32.1988,16.102306 28.528072,12.5 24,12.5 Z m -3.00557,17.439654 c -3.690847,0 -6.883322,2.216155 -8.49443,5.471265 2.876677,3.131615 6.962168,5.08908 11.5,5.08908 4.537831,0 8.623322,-1.957465 11.5,-5.08908 -1.611109,-3.25511 -4.803583,-5.471265 -8.494431,-5.471265 z"
-     id="path3070"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3840"
-     d="m 23.999999,13.499999 c -4.249625,0 -7.694628,3.473653 -7.694628,7.758622 0,4.284967 3.445003,7.75862 7.694628,7.75862 4.249626,0 7.69463,-3.473653 7.69463,-7.75862 0,-4.284969 -3.445004,-7.758622 -7.69463,-7.758622 z M 21.179253,30.31681 c -3.463884,0 -6.460045,2.137006 -7.97208,5.275862 2.699781,3.019772 6.534041,4.907326 10.792826,4.907326 4.258787,0 8.093047,-1.887554 10.792828,-4.907326 -1.512036,-3.138856 -4.508196,-5.275862 -7.97208,-5.275862 z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00001;marker:none;enable-background:accumulate"
-     d="m 21.125107,28.999999 c -3.530375,0 -6.584047,2.203491 -8.125107,5.439999 2.751605,3.113722 6.659465,5.060001 11,5.060001 4.340535,0 8.248395,-1.946279 11,-5.060001 -1.541061,-3.236508 -4.594732,-5.439999 -8.125107,-5.439999 z"
-     id="path890" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-     d="M 23.999999,12.5 C 19.719792,12.5 16.25,15.857863 16.25,20.000001 16.25,24.142136 19.719792,27.5 23.999999,27.5 28.280207,27.5 31.75,24.142136 31.75,20.000001 31.75,15.857863 28.280207,12.5 23.999999,12.5 Z"
-     id="rect3049" />
-  <path
-     d="M 42.5,23.999344 C 42.5,34.216942 34.216658,42.5 24.000234,42.5 13.782875,42.5 5.4999995,34.216848 5.4999995,23.999344 5.4999995,13.782218 13.782875,5.4999995 24.000234,5.4999995 34.216658,5.4999995 42.5,13.782218 42.5,23.999344 Z"
-     id="path8655"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3012);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 24.000003,4.5 C 13.240575,4.5 4.5,13.240571 4.5,23.999999 4.5,34.759427 13.240575,43.500003 24.000003,43.5 34.759425,43.5 43.50001,34.759427 43.499999,23.999999 43.499999,13.240571 34.759425,4.5 24.000003,4.5 Z"
-     id="path2555-6"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/48/avatar-default.svg b/elementary-xfce/status/48/avatar-default.svg
new file mode 120000
index 000000000..a6c88273e
--- /dev/null
+++ b/elementary-xfce/status/48/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/48/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/64/avatar-default.svg b/elementary-xfce/status/64/avatar-default.svg
deleted file mode 100644
index 034ca5d01..000000000
--- a/elementary-xfce/status/64/avatar-default.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="64"
-   height="64"
-   id="svg3489"
-   sodipodi:docname="avatar-default.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview29"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="15.070213"
-     inkscape:cx="4.7776365"
-     inkscape:cy="32.514471"
-     inkscape:window-width="1396"
-     inkscape:window-height="896"
-     inkscape:window-x="109"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3489" />
-  <defs
-     id="defs3491">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1040">
-      <stop
-         style="stop-color:#4eb6e9;stop-opacity:1"
-         offset="0"
-         id="stop1036" />
-      <stop
-         style="stop-color:#328be6;stop-opacity:1"
-         offset="1"
-         id="stop1038" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4806">
-      <stop
-         id="stop4808"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4810"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.42447853" />
-      <stop
-         id="stop4812"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.82089913" />
-      <stop
-         id="stop4814"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3820-7-2">
-      <stop
-         id="stop3822-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3824-1-2"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient4806"
-       id="linearGradient3293"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3268746,0,0,2.3268746,-135.94475,-32.842783)"
-       x1="71.204407"
-       y1="15.369057"
-       x2="71.204407"
-       y2="40.495617" />
-    <radialGradient
-       xlink:href="#linearGradient3820-7-2"
-       id="radialGradient3300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3823536,7.5555777e-8,-1.8372241e-8,0.1115198,-5.9254271,36.335849)"
-       cx="99.189415"
-       cy="185.29727"
-       fx="99.189415"
-       fy="185.29727"
-       r="62.769119" />
-    <radialGradient
-       xlink:href="#linearGradient3820-7-2"
-       id="radialGradient4192"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,5.3967361e-8,-1.2248161e-8,0.07965545,6.7163816,44.240666)"
-       cx="99.189415"
-       cy="185.29727"
-       fx="99.189415"
-       fy="185.29727"
-       r="62.769119" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1040"
-       id="linearGradient1044"
-       x1="32"
-       y1="4.4437337"
-       x2="32"
-       y2="59.678059"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata3494">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g4198">
-    <path
-       d="m 55.999998,57.0017 a 24,6.9985714 0 1 1 -47.9999991,0 24,6.9985714 0 1 1 47.9999991,0 z"
-       id="path3818-0"
-       style="opacity:0.2;fill:url(#radialGradient3300);fill-opacity:1;stroke:none" />
-    <path
-       style="opacity:0.4;fill:url(#radialGradient4192);fill-opacity:1;stroke:none"
-       id="path4190"
-       d="m 47.999998,59.0017 a 16,4.9988822 0 1 1 -31.999999,0 16,4.9988822 0 1 1 31.999999,0 z" />
-  </g>
-  <path
-     d="M 32.000004,2.4999968 C 15.722922,2.4999968 2.5,15.722913 2.5,31.999997 2.5,48.277081 15.722922,61.500004 32.000004,61.5 48.27708,61.5 61.500016,48.277081 61.5,31.999997 61.5,15.722913 48.27708,2.4999968 32.000004,2.4999968 z"
-     id="path2555"
-     style="color:#000000;fill:url(#linearGradient1044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     style="opacity:0.5;color:#000000;fill:#000000;stroke:#003651;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:0;fill-rule:nonzero"
-     id="path2555-7-1"
-     d="m 32,2.499999 c -16.277082,0 -29.5,13.222915 -29.5,29.499998 0,16.277083 13.222918,29.500005 29.5,29.5 16.27708,0 29.50001,-13.222917 29.5,-29.5 C 61.5,15.722914 48.27708,2.499999 32,2.499999 z" />
-  <path
-     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3293);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3019"
-     d="m 60.50001,31.999999 c 0,15.740115 -12.7599,28.499999 -28.50002,28.499999 -15.740099,0 -28.499991,-12.759884 -28.499991,-28.499999 0,-15.740116 12.759892,-28.5000013 28.499991,-28.5000013 15.74012,0 28.50002,12.7598853 28.50002,28.5000013 z" />
-  <path
-     id="path4321"
-     d="m 32.000002,15 c -6.892513,0 -12.4875,5.372581 -12.4875,12 0,6.627419 5.594987,12 12.4875,12 6.892519,0 12.487495,-5.372581 12.487495,-12 0,-6.627419 -5.594976,-12 -12.487495,-12 z m -4.5375,27.046447 c -5.564604,0 -10.358471,3.645027 -12.7875,8.453553 4.337101,4.626099 10.483418,7.5 17.325,7.5 6.841591,0 12.987895,-2.873901 17.324996,-7.5 -2.429028,-4.808526 -7.222896,-8.453553 -12.787501,-8.453553 z"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate;opacity:0.15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;marker:none;enable-background:accumulate;opacity:0.05;stroke-opacity:1;stroke-linejoin:round"
-     d="m 32.000002,15 c -6.892513,0 -12.4875,5.372581 -12.4875,12 0,6.627419 5.594987,12 12.4875,12 6.892519,0 12.487495,-5.372581 12.487495,-12 0,-6.627419 -5.594976,-12 -12.487495,-12 z m -4.5375,27.046447 c -5.564604,0 -10.358471,3.645027 -12.7875,8.453553 4.337101,4.626099 10.483418,7.5 17.325,7.5 6.841591,0 12.987895,-2.873901 17.324996,-7.5 -2.429028,-4.808526 -7.222896,-8.453553 -12.787501,-8.453553 z"
-     id="path4323" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-     d="m 32.000002,14 c -6.892513,0 -12.4875,5.372581 -12.4875,12 0,6.627419 5.594987,12 12.4875,12 6.892519,0 12.487495,-5.372581 12.487495,-12 0,-6.627419 -5.594976,-12 -12.487495,-12 z m -4.5375,27.046447 c -5.564604,0 -10.358471,3.645027 -12.7875,8.453553 4.337101,4.626099 10.483418,7.5 17.325,7.5 6.841591,0 12.987895,-2.873901 17.324996,-7.5 -2.429028,-4.808526 -7.222896,-8.453553 -12.787501,-8.453553 z"
-     id="path3224" />
-</svg>
diff --git a/elementary-xfce/status/64/avatar-default.svg b/elementary-xfce/status/64/avatar-default.svg
new file mode 120000
index 000000000..b62ef87e9
--- /dev/null
+++ b/elementary-xfce/status/64/avatar-default.svg
@@ -0,0 +1 @@
+../../categories/64/preferences-desktop-personal.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/symbolic/avatar-default-symbolic.svg b/elementary-xfce/status/symbolic/avatar-default-symbolic.svg
deleted file mode 100644
index fe5ec5e34..000000000
--- a/elementary-xfce/status/symbolic/avatar-default-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg height='16' width='16' xmlns='http://www.w3.org/2000/svg'>
-    <g transform='translate(-593 171)'>
-        <path color='#000' d='M601-171a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 1a7 7 0 0 1 7 7c0 1.972-.844 3.728-2.156 5-.443-1.727-1.975-3-3.844-3h-2c-1.869 0-3.4 1.273-3.844 3-1.312-1.272-2.156-3.028-2.156-5a7 7 0 0 1 7-7z' fill='#666' overflow='visible' style='marker:none'/>
-        <path color='#000' d='M601-167.75c-1.795 0-3.25 1.4-3.25 3.125 0 1.726 1.455 3.125 3.25 3.125s3.25-1.4 3.25-3.125c0-1.726-1.455-3.125-3.25-3.125z' fill='#666' overflow='visible' style='marker:none'/>
-        
-    </g>
-</svg>
diff --git a/elementary-xfce/status/symbolic/avatar-default-symbolic.svg b/elementary-xfce/status/symbolic/avatar-default-symbolic.svg
new file mode 120000
index 000000000..22a17ddc0
--- /dev/null
+++ b/elementary-xfce/status/symbolic/avatar-default-symbolic.svg
@@ -0,0 +1 @@
+../../categories/symbolic/preferences-desktop-personal-symbolic.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/symbolic/network-offline-symbolic.svg b/elementary-xfce/status/symbolic/network-offline-symbolic.svg
deleted file mode 120000
index c0bead26e..000000000
--- a/elementary-xfce/status/symbolic/network-offline-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-network-wireless-offline-symbolic.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/symbolic/network-offline-symbolic.svg b/elementary-xfce/status/symbolic/network-offline-symbolic.svg
new file mode 100644
index 000000000..38526c450
--- /dev/null
+++ b/elementary-xfce/status/symbolic/network-offline-symbolic.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   sodipodi:docname="network-offline-symbolic.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview245"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="22.627417"
+     inkscape:cx="12.750019"
+     inkscape:cy="8.1759222"
+     inkscape:window-width="1278"
+     inkscape:window-height="1005"
+     inkscape:window-x="1088"
+     inkscape:window-y="98"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     showguides="true" />
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <path
+     id="path6-3"
+     style="stroke-width:1;marker:none;fill:#555761"
+     d="M 8 1.625 C 5.7343723 1.625 2.1674648 2.240655 0 4.1894531 L 7.25 14.375 L 8.75 14.375 L 9.9121094 12.740234 L 9.5859375 12.414062 C 9.4505432 12.278668 9.3398845 12.126119 9.2519531 11.964844 L 8.25 13.375 L 7.75 13.375 L 1.4394531 4.4863281 C 3.2890513 3.1081961 5.5978694 2.625 8 2.625 C 10.403199 2.625 12.712016 3.1081961 14.560547 4.4863281 L 11.333984 9.03125 C 11.671916 9.0887325 11.99072 9.2292831 12.257812 9.4453125 L 16 4.1894531 C 13.833602 2.2417217 10.265628 1.625 8 1.625 z " />
+  <path
+     d="m 15,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 0.390625,0.390625 0.390625,1.023437 0,1.414062 L 14.414062,13 l 1.292969,1.292969 c 0.390625,0.390625 0.390625,1.023437 0,1.414062 -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 L 13,14.414062 11.707031,15.707031 c -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 L 11.585938,13 10.292969,11.707031 c -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 C 10.480469,10.105469 10.734375,10 11,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 L 13,11.585938 14.292969,10.292969 C 14.480469,10.105469 14.734375,10 15,10 Z m 0,0"
+     id="path2"
+     style="fill:#555761;fill-opacity:1" />
+</svg>
diff --git a/elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg b/elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg
deleted file mode 100644
index da8775986..000000000
--- a/elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1"
-   sodipodi:docname="network-wireless-offline-symbolic.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview245"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="22.627417"
-     inkscape:cx="12.750019"
-     inkscape:cy="8.1759222"
-     inkscape:window-width="1278"
-     inkscape:window-height="1005"
-     inkscape:window-x="1088"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2"
-     showguides="true" />
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <path
-     id="path6-3"
-     style="stroke-width:1;marker:none;fill:#555761"
-     d="M 8 1.625 C 5.7343723 1.625 2.1674648 2.240655 0 4.1894531 L 7.25 14.375 L 8.75 14.375 L 9.9121094 12.740234 L 9.5859375 12.414062 C 9.4505432 12.278668 9.3398845 12.126119 9.2519531 11.964844 L 8.25 13.375 L 7.75 13.375 L 1.4394531 4.4863281 C 3.2890513 3.1081961 5.5978694 2.625 8 2.625 C 10.403199 2.625 12.712016 3.1081961 14.560547 4.4863281 L 11.333984 9.03125 C 11.671916 9.0887325 11.99072 9.2292831 12.257812 9.4453125 L 16 4.1894531 C 13.833602 2.2417217 10.265628 1.625 8 1.625 z " />
-  <path
-     d="m 15,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 0.390625,0.390625 0.390625,1.023437 0,1.414062 L 14.414062,13 l 1.292969,1.292969 c 0.390625,0.390625 0.390625,1.023437 0,1.414062 -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 L 13,14.414062 11.707031,15.707031 c -0.390625,0.390625 -1.023437,0.390625 -1.414062,0 -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 L 11.585938,13 10.292969,11.707031 c -0.3906252,-0.390625 -0.3906252,-1.023437 0,-1.414062 C 10.480469,10.105469 10.734375,10 11,10 c 0.265625,0 0.519531,0.105469 0.707031,0.292969 L 13,11.585938 14.292969,10.292969 C 14.480469,10.105469 14.734375,10 15,10 Z m 0,0"
-     id="path2"
-     style="fill:#555761;fill-opacity:1" />
-</svg>
diff --git a/elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg b/elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg
new file mode 120000
index 000000000..34be65b54
--- /dev/null
+++ b/elementary-xfce/status/symbolic/network-wireless-offline-symbolic.svg
@@ -0,0 +1 @@
+network-offline-symbolic.svg
\ No newline at end of file