diff --git a/categories/128/applications-internet.svg b/categories/128/applications-internet.svg
deleted file mode 120000
index a6b406092..000000000
--- a/categories/128/applications-internet.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts.svg
\ No newline at end of file
diff --git a/categories/128/applications-internet.svg b/categories/128/applications-internet.svg
new file mode 100644
index 000000000..060d0b525
--- /dev/null
+++ b/categories/128/applications-internet.svg
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg4082"
+   height="128"
+   width="128"
+   version="1.1">
+  <defs
+     id="defs4084">
+    <linearGradient
+       id="linearGradient860">
+      <stop
+         id="stop856"
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1" />
+      <stop
+         id="stop858"
+         offset="1"
+         style="stop-color:#d4d4d4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-5-1">
+      <stop
+         offset="0"
+         style="stop-color:#acb9bf;stop-opacity:1"
+         id="stop9167-7-12" />
+      <stop
+         offset="1"
+         style="stop-color:#acb9bf;stop-opacity:0"
+         id="stop9169-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-59">
+      <stop
+         offset="0"
+         style="stop-color:#b6c5cc;stop-opacity:1"
+         id="stop9167-6" />
+      <stop
+         offset="1"
+         style="stop-color:#e5f0f6;stop-opacity:0"
+         id="stop9169-9" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(1.9849597,0,0,1.9712634,-1314.7319,-668.37231)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-5-1"
+       id="radialGradient3030"
+       fy="354.21619"
+       fx="681.32629"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <radialGradient
+       gradientTransform="matrix(2.6547671,0,0,2.6364491,-1732.0007,-917.86229)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-59"
+       id="radialGradient3033"
+       fy="355.25784"
+       fx="680.60205"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <linearGradient
+       id="linearGradient4017-9-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4019-8-8" />
+      <stop
+         offset="0.49550432"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4021-9-8" />
+      <stop
+         offset="0.88038814"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4023-5-3" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4025-8-0" />
+    </linearGradient>
+    <linearGradient
+       y2="26.666777"
+       x2="20.153708"
+       y1="3.0216999"
+       x1="20.153708"
+       gradientTransform="matrix(4.031746,0,0,4.0392156,-0.50793648,7.4117726)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3862"
+       xlink:href="#linearGradient4017-9-5" />
+    <linearGradient
+       id="linearGradient3688-166-749-5">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2883-0" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2885-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702-501-757-0">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2895-0" />
+      <stop
+         offset="0.5"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2897-2" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2899-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3811">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3813" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3815" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-166-749-5"
+       id="radialGradient4093-5"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-166-749-5"
+       id="radialGradient4095-5"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <radialGradient
+       gradientTransform="matrix(1.3955634,0,0,0.16978827,69.62241,102.1321)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3811"
+       id="radialGradient4432"
+       fy="93.467628"
+       fx="-4.0287771"
+       r="35.338131"
+       cy="93.467628"
+       cx="-4.0287771" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4218"
+       xlink:href="#linearGradient3702-501-757-0" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="128.34285"
+       x2="74.8125"
+       y1="17.5"
+       x1="74.8125"
+       id="linearGradient862"
+       xlink:href="#linearGradient860" />
+  </defs>
+  <metadata
+     id="metadata4087">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 113.3166,118.00181 a 49.316602,6 0 0 1 -98.633201,0 49.316602,6 0 1 1 98.633201,0 z"
+     id="path3041-8"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient4432);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <g
+     transform="matrix(2.4209959,0,0,0.55555607,5.8960682,94.890693)"
+     id="g2036-8"
+     style="display:inline">
+    <g
+       transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+       id="g3712-2"
+       style="opacity:0.4">
+      <rect
+         width="5"
+         height="7"
+         x="38"
+         y="40"
+         id="rect2801-9"
+         style="fill:url(#radialGradient4093-5);fill-opacity:1;stroke:none" />
+      <rect
+         width="5"
+         height="7"
+         x="-10"
+         y="-47"
+         transform="scale(-1,-1)"
+         id="rect3696-3"
+         style="fill:url(#radialGradient4095-5);fill-opacity:1;stroke:none" />
+      <rect
+         width="28"
+         height="7.0000005"
+         x="10"
+         y="40"
+         id="rect3700-7"
+         style="fill:url(#linearGradient4218);fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+  <path
+     style="color:#000000;fill:url(#linearGradient862);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4519"
+     d="M 74.723436,17 C 62.788244,17 52.451931,24.028526 47.328487,34.229773 44.007793,32.05998 40.076824,30.783885 35.851085,30.783885 c -11.844703,0 -21.44678,9.87374 -21.44678,22.054033 0,1.936491 0.297831,3.809974 0.753974,5.599536 C 6.6036059,64.370712 1,74.464598 1,85.918798 1,104.2457 15.347918,119 33.170191,119 l 61.659639,0 C 112.65212,119 127,104.2457 127,85.918798 c 0,-14.634774 -9.18767,-26.97327 -21.94951,-31.358078 0.34626,-1.902028 0.50266,-3.852521 0.50266,-5.857911 C 105.55315,31.193702 91.75026,17 74.723436,17 z" />
+  <path
+     style="opacity:0.5;color:#000000;fill:none;stroke:#555761;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+     id="rect4519-6"
+     d="m 74.808516,16.500009 c -12.029892,0 -22.44824,7.097405 -27.612362,17.398696 -3.347049,-2.191093 -7.309191,-3.479684 -11.56847,-3.479684 -11.938738,0 -21.617042,9.970546 -21.617042,22.270252 0,1.955475 0.300281,3.847355 0.759979,5.654462 C 6.1480746,64.335111 0.50000002,74.527979 0.50000002,86.094516 0.50000002,104.6011 14.961768,119.5 32.925527,119.5 l 62.148981,0 C 113.03823,119.5 127.5,104.6011 127.5,86.094516 c 0,-14.778275 -9.2606,-27.237733 -22.12368,-31.665533 0.34901,-1.920695 0.50662,-3.890309 0.50662,-5.91533 0,-17.680763 -13.912455,-32.013644 -31.074424,-32.013644 z" />
+  <path
+     style="opacity:0.15;color:#000000;fill:url(#radialGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9151"
+     d="m 74.708345,17.029763 c -12.299954,0 -22.76831,7.534737 -27.130326,18.194354 6.018751,4.634241 9.901012,11.903754 9.901012,20.052496 0,4.3361 -1.029201,8.432046 -2.962502,12.00053 5.264377,4.979582 12.347656,8.05198 20.191816,8.05198 16.205232,0 29.391195,-13.094975 29.391195,-29.188391 0,-16.09341 -13.185963,-29.110969 -29.391195,-29.110969 z" />
+  <path
+     style="opacity:0.15;color:#000000;fill:url(#radialGradient3030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.1760155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9151-6"
+     d="m 58.1028,52.435717 a 21.939035,21.787656 0 0 1 -43.87807,0 21.939035,21.787656 0 1 1 43.87807,0 z" />
+  <path
+     d="m 74.8125,17.5 c -11.635516,0 -21.7141,6.86057 -26.71875,16.84375 A 1.0017171,1.0017171 0 0 1 46.625,34.75 c -3.197379,-2.093114 -6.945924,-3.34375 -11,-3.34375 -11.380461,0 -20.625,9.507406 -20.625,21.28125 0,1.845673 0.304006,3.653013 0.75,5.40625 a 1.0017171,1.0017171 0 0 1 -0.40625,1.0625 C 6.9896933,64.961066 1.5,74.853894 1.5,86.09375 1.5,104.0781 15.527588,118.5 32.9375,118.5 l 62.125,0 C 112.47237,118.5 126.5,104.07809 126.5,86.09375 126.5,71.733968 117.51912,59.662885 105.0625,55.375 A 1.0017171,1.0017171 0 0 1 104.375,54.25 c 0.33632,-1.850849 0.5,-3.774768 0.5,-5.75 0,-17.155785 -13.45767,-31 -30.0625,-31 z"
+     id="path3860"
+     style="opacity:1;color:#000000;fill:none;stroke:url(#linearGradient3862);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" />
+</svg>
diff --git a/categories/128/preferences-desktop-online-accounts.svg b/categories/128/preferences-desktop-online-accounts.svg
deleted file mode 100644
index 060d0b525..000000000
--- a/categories/128/preferences-desktop-online-accounts.svg
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg4082"
-   height="128"
-   width="128"
-   version="1.1">
-  <defs
-     id="defs4084">
-    <linearGradient
-       id="linearGradient860">
-      <stop
-         id="stop856"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop858"
-         offset="1"
-         style="stop-color:#d4d4d4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-5-1">
-      <stop
-         offset="0"
-         style="stop-color:#acb9bf;stop-opacity:1"
-         id="stop9167-7-12" />
-      <stop
-         offset="1"
-         style="stop-color:#acb9bf;stop-opacity:0"
-         id="stop9169-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-59">
-      <stop
-         offset="0"
-         style="stop-color:#b6c5cc;stop-opacity:1"
-         id="stop9167-6" />
-      <stop
-         offset="1"
-         style="stop-color:#e5f0f6;stop-opacity:0"
-         id="stop9169-9" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.9849597,0,0,1.9712634,-1314.7319,-668.37231)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-5-1"
-       id="radialGradient3030"
-       fy="354.21619"
-       fx="681.32629"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <radialGradient
-       gradientTransform="matrix(2.6547671,0,0,2.6364491,-1732.0007,-917.86229)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-59"
-       id="radialGradient3033"
-       fy="355.25784"
-       fx="680.60205"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <linearGradient
-       id="linearGradient4017-9-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4019-8-8" />
-      <stop
-         offset="0.49550432"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4021-9-8" />
-      <stop
-         offset="0.88038814"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4023-5-3" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4025-8-0" />
-    </linearGradient>
-    <linearGradient
-       y2="26.666777"
-       x2="20.153708"
-       y1="3.0216999"
-       x1="20.153708"
-       gradientTransform="matrix(4.031746,0,0,4.0392156,-0.50793648,7.4117726)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3862"
-       xlink:href="#linearGradient4017-9-5" />
-    <linearGradient
-       id="linearGradient3688-166-749-5">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2883-0" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2885-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3702-501-757-0">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2895-0" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2897-2" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2899-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3811">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3813" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3815" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-5"
-       id="radialGradient4093-5"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-5"
-       id="radialGradient4095-5"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <radialGradient
-       gradientTransform="matrix(1.3955634,0,0,0.16978827,69.62241,102.1321)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3811"
-       id="radialGradient4432"
-       fy="93.467628"
-       fx="-4.0287771"
-       r="35.338131"
-       cy="93.467628"
-       cx="-4.0287771" />
-    <linearGradient
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4218"
-       xlink:href="#linearGradient3702-501-757-0" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="128.34285"
-       x2="74.8125"
-       y1="17.5"
-       x1="74.8125"
-       id="linearGradient862"
-       xlink:href="#linearGradient860" />
-  </defs>
-  <metadata
-     id="metadata4087">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     d="m 113.3166,118.00181 a 49.316602,6 0 0 1 -98.633201,0 49.316602,6 0 1 1 98.633201,0 z"
-     id="path3041-8"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient4432);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <g
-     transform="matrix(2.4209959,0,0,0.55555607,5.8960682,94.890693)"
-     id="g2036-8"
-     style="display:inline">
-    <g
-       transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
-       id="g3712-2"
-       style="opacity:0.4">
-      <rect
-         width="5"
-         height="7"
-         x="38"
-         y="40"
-         id="rect2801-9"
-         style="fill:url(#radialGradient4093-5);fill-opacity:1;stroke:none" />
-      <rect
-         width="5"
-         height="7"
-         x="-10"
-         y="-47"
-         transform="scale(-1,-1)"
-         id="rect3696-3"
-         style="fill:url(#radialGradient4095-5);fill-opacity:1;stroke:none" />
-      <rect
-         width="28"
-         height="7.0000005"
-         x="10"
-         y="40"
-         id="rect3700-7"
-         style="fill:url(#linearGradient4218);fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-  <path
-     style="color:#000000;fill:url(#linearGradient862);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect4519"
-     d="M 74.723436,17 C 62.788244,17 52.451931,24.028526 47.328487,34.229773 44.007793,32.05998 40.076824,30.783885 35.851085,30.783885 c -11.844703,0 -21.44678,9.87374 -21.44678,22.054033 0,1.936491 0.297831,3.809974 0.753974,5.599536 C 6.6036059,64.370712 1,74.464598 1,85.918798 1,104.2457 15.347918,119 33.170191,119 l 61.659639,0 C 112.65212,119 127,104.2457 127,85.918798 c 0,-14.634774 -9.18767,-26.97327 -21.94951,-31.358078 0.34626,-1.902028 0.50266,-3.852521 0.50266,-5.857911 C 105.55315,31.193702 91.75026,17 74.723436,17 z" />
-  <path
-     style="opacity:0.5;color:#000000;fill:none;stroke:#555761;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-     id="rect4519-6"
-     d="m 74.808516,16.500009 c -12.029892,0 -22.44824,7.097405 -27.612362,17.398696 -3.347049,-2.191093 -7.309191,-3.479684 -11.56847,-3.479684 -11.938738,0 -21.617042,9.970546 -21.617042,22.270252 0,1.955475 0.300281,3.847355 0.759979,5.654462 C 6.1480746,64.335111 0.50000002,74.527979 0.50000002,86.094516 0.50000002,104.6011 14.961768,119.5 32.925527,119.5 l 62.148981,0 C 113.03823,119.5 127.5,104.6011 127.5,86.094516 c 0,-14.778275 -9.2606,-27.237733 -22.12368,-31.665533 0.34901,-1.920695 0.50662,-3.890309 0.50662,-5.91533 0,-17.680763 -13.912455,-32.013644 -31.074424,-32.013644 z" />
-  <path
-     style="opacity:0.15;color:#000000;fill:url(#radialGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path9151"
-     d="m 74.708345,17.029763 c -12.299954,0 -22.76831,7.534737 -27.130326,18.194354 6.018751,4.634241 9.901012,11.903754 9.901012,20.052496 0,4.3361 -1.029201,8.432046 -2.962502,12.00053 5.264377,4.979582 12.347656,8.05198 20.191816,8.05198 16.205232,0 29.391195,-13.094975 29.391195,-29.188391 0,-16.09341 -13.185963,-29.110969 -29.391195,-29.110969 z" />
-  <path
-     style="opacity:0.15;color:#000000;fill:url(#radialGradient3030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.1760155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path9151-6"
-     d="m 58.1028,52.435717 a 21.939035,21.787656 0 0 1 -43.87807,0 21.939035,21.787656 0 1 1 43.87807,0 z" />
-  <path
-     d="m 74.8125,17.5 c -11.635516,0 -21.7141,6.86057 -26.71875,16.84375 A 1.0017171,1.0017171 0 0 1 46.625,34.75 c -3.197379,-2.093114 -6.945924,-3.34375 -11,-3.34375 -11.380461,0 -20.625,9.507406 -20.625,21.28125 0,1.845673 0.304006,3.653013 0.75,5.40625 a 1.0017171,1.0017171 0 0 1 -0.40625,1.0625 C 6.9896933,64.961066 1.5,74.853894 1.5,86.09375 1.5,104.0781 15.527588,118.5 32.9375,118.5 l 62.125,0 C 112.47237,118.5 126.5,104.07809 126.5,86.09375 126.5,71.733968 117.51912,59.662885 105.0625,55.375 A 1.0017171,1.0017171 0 0 1 104.375,54.25 c 0.33632,-1.850849 0.5,-3.774768 0.5,-5.75 0,-17.155785 -13.45767,-31 -30.0625,-31 z"
-     id="path3860"
-     style="opacity:1;color:#000000;fill:none;stroke:url(#linearGradient3862);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" />
-</svg>
diff --git a/categories/16/applications-internet.svg b/categories/16/applications-internet.svg
deleted file mode 120000
index a6b406092..000000000
--- a/categories/16/applications-internet.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts.svg
\ No newline at end of file
diff --git a/categories/16/applications-internet.svg b/categories/16/applications-internet.svg
new file mode 100644
index 000000000..45c5433c1
--- /dev/null
+++ b/categories/16/applications-internet.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg4157"
+   height="16"
+   width="16"
+   version="1.1">
+  <defs
+     id="defs4159">
+    <linearGradient
+       id="linearGradient1050">
+      <stop
+         id="stop1046"
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1" />
+      <stop
+         id="stop1048"
+         offset="1"
+         style="stop-color:#d4d4d4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-59">
+      <stop
+         offset="0"
+         style="stop-color:#b6c5cc;stop-opacity:1"
+         id="stop9167-6" />
+      <stop
+         offset="1"
+         style="stop-color:#e5f0f6;stop-opacity:0"
+         id="stop9169-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-5-1">
+      <stop
+         offset="0"
+         style="stop-color:#acb9bf;stop-opacity:1"
+         id="stop9167-7-12" />
+      <stop
+         offset="1"
+         style="stop-color:#acb9bf;stop-opacity:0"
+         id="stop9169-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4017">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4019" />
+      <stop
+         offset="0.49550432"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4021" />
+      <stop
+         offset="0.88038814"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4023" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4025" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.42648682,0,0,0.43892158,1.1762122,1.5644601)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4017"
+       id="linearGradient4015-5-3"
+       y2="25.472973"
+       x2="20.153708"
+       y1="3.0216999"
+       x1="20.153708" />
+    <radialGradient
+       gradientTransform="matrix(0.18941954,0,0,0.18727481,-123.91246,-62.478512)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-5-1"
+       id="radialGradient3182-5"
+       fy="354.21619"
+       fx="681.32629"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="16.065437"
+       x2="10"
+       y1="2"
+       x1="10"
+       id="linearGradient1052"
+       xlink:href="#linearGradient1050" />
+    <radialGradient
+       gradientTransform="matrix(0.26677262,0,0,0.26375204,-171.66643,-91.443342)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-59"
+       id="radialGradient3164-2-9-0"
+       fy="355.25784"
+       fx="680.60205"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+  </defs>
+  <metadata
+     id="metadata4162">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <circle
+     r="0"
+     cy="3.4839716"
+     cx="-24.818802"
+     id="path226-6"
+     style="opacity:1;vector-effect:none;fill:#9bdb4d;fill-opacity:1;stroke:#452981;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+  <path
+     id="path924"
+     d="M 10,1.5 C 8.4162831,1.5021403 7.0313479,2.5674751 6.6230469,4.0976562 6.1703712,3.7116752 5.5948921,3.4997659 5,3.5 3.6192881,3.5 2.5,4.6192881 2.5,6 2.5009622,6.0841939 2.5061771,6.1682854 2.515625,6.2519531 1.2581201,7.084594 0.50134211,8.4918197 0.5,10 c 0,2.485281 2.0147186,4.5 4.5,4.5 h 6 c 2.485281,0 4.5,-2.014719 4.5,-4.5 C 15.498012,8.4169521 14.664361,6.951387 13.304688,6.140625 13.432632,5.773888 13.498638,5.3884119 13.5,5 13.5,3.0670034 11.932997,1.5 10,1.5 Z"
+     style="opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#555761;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal" />
+  <path
+     id="path924-3"
+     d="M 10 2 A 3 3 0 0 0 7.0742188 4.3496094 A 0.5 0.5 0 0 1 6.6445312 4.5976562 A 0.5 0.5 0 0 1 6.3613281 4.5097656 L 6.3496094 4.5273438 A 2 2 0 0 0 5 4 A 2 2 0 0 0 3 6 A 2 2 0 0 0 3.0214844 6.2695312 A 0.5 0.5 0 0 1 2.7773438 6.6835938 C 1.7080485 7.4014882 1 8.6152724 1 10 C 1 12.209139 2.790861 14 5 14 L 11 14 C 13.209139 14 15 12.209139 15 10 C 15 8.5281862 14.195643 7.2570799 13.011719 6.5625 L 13.021484 6.5507812 A 0.5 0.5 0 0 1 12.810547 6.1425781 A 0.5 0.5 0 0 1 12.826172 6.0195312 L 12.818359 6.0175781 A 3 3 0 0 0 13 5 A 3 3 0 0 0 10 2 z "
+     style="opacity:1;vector-effect:none;fill:url(#linearGradient1052);fill-opacity:1;stroke:none;stroke-width:1.125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+  <circle
+     r="3"
+     cy="5"
+     cx="10"
+     id="path924-8-75-2"
+     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3164-2-9-0);fill-opacity:1;stroke:none;stroke-width:1.87944341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal" />
+  <circle
+     r="2"
+     cy="6"
+     cx="5"
+     id="path924-8-7-3-7"
+     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3182-5);fill-opacity:1;stroke:none;stroke-width:0.52312344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal" />
+  <path
+     id="path924-3-0"
+     d="M 9.8571425,2.5 C 8.5523372,2.501232 7.7889374,3.5220798 7.5060602,4.7795229 7.4232201,4.9197042 6.9971761,5.086187 6.8327788,5.0868992 6.7388849,5.0869117 6.6471936,5.1845349 6.5698045,5.1320471 L 6.3417796,5.1481601 C 5.9999337,4.8380578 5.5299718,4.4713111 5.0657141,4.4704762 c -1.0256717,0 -1.5485715,0.7636684 -1.5485714,1.7761905 9.966e-4,0.082707 0.00766,0.1652521 0.01995,0.2470703 -0.00497,0.1564307 -0.090446,0.2995463 -0.226702,0.3795573 C 2.3174735,7.5313642 1.5,8.5639997 1.5,9.8333334 1.5,11.858377 3.1629422,13.5 5.2142855,13.5 H 10.785714 C 12.837057,13.5 14.5,11.858377 14.5,9.8333334 14.5,8.4841707 13.524525,7.341847 12.425168,6.7051488 l 0.0091,-0.010742 c -0.122917,-0.085974 -0.19594,-0.2254748 -0.19587,-0.3741862 7.8e-5,-0.038047 0.005,-0.075936 0.01452,-0.112793 l -0.0073,-0.00179 C 12.356086,5.9066864 12.527441,5.4425043 12.52857,5.1242857 12.52857,3.6055029 11.39565,2.5000004 9.8571425,2.5 Z"
+     style="opacity:0.8;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient4015-5-3);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+</svg>
diff --git a/categories/16/config-language.svg b/categories/16/config-language.svg
deleted file mode 120000
index c0bcf8bca..000000000
--- a/categories/16/config-language.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-locale.svg
\ No newline at end of file
diff --git a/categories/16/gnome-power-manager.svg b/categories/16/gnome-power-manager.svg
deleted file mode 120000
index e7a4d9f1f..000000000
--- a/categories/16/gnome-power-manager.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-system-power.svg
\ No newline at end of file
diff --git a/categories/16/preferences-desktop-sound.svg b/categories/16/multimedia-volume-control.svg
similarity index 100%
rename from categories/16/preferences-desktop-sound.svg
rename to categories/16/multimedia-volume-control.svg
diff --git a/categories/16/preferences-desktop-online-accounts.svg b/categories/16/preferences-desktop-online-accounts.svg
deleted file mode 100644
index 45c5433c1..000000000
--- a/categories/16/preferences-desktop-online-accounts.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg4157"
-   height="16"
-   width="16"
-   version="1.1">
-  <defs
-     id="defs4159">
-    <linearGradient
-       id="linearGradient1050">
-      <stop
-         id="stop1046"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop1048"
-         offset="1"
-         style="stop-color:#d4d4d4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-59">
-      <stop
-         offset="0"
-         style="stop-color:#b6c5cc;stop-opacity:1"
-         id="stop9167-6" />
-      <stop
-         offset="1"
-         style="stop-color:#e5f0f6;stop-opacity:0"
-         id="stop9169-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-5-1">
-      <stop
-         offset="0"
-         style="stop-color:#acb9bf;stop-opacity:1"
-         id="stop9167-7-12" />
-      <stop
-         offset="1"
-         style="stop-color:#acb9bf;stop-opacity:0"
-         id="stop9169-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4017">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4019" />
-      <stop
-         offset="0.49550432"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4021" />
-      <stop
-         offset="0.88038814"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4023" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4025" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.42648682,0,0,0.43892158,1.1762122,1.5644601)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4017"
-       id="linearGradient4015-5-3"
-       y2="25.472973"
-       x2="20.153708"
-       y1="3.0216999"
-       x1="20.153708" />
-    <radialGradient
-       gradientTransform="matrix(0.18941954,0,0,0.18727481,-123.91246,-62.478512)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-5-1"
-       id="radialGradient3182-5"
-       fy="354.21619"
-       fx="681.32629"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="16.065437"
-       x2="10"
-       y1="2"
-       x1="10"
-       id="linearGradient1052"
-       xlink:href="#linearGradient1050" />
-    <radialGradient
-       gradientTransform="matrix(0.26677262,0,0,0.26375204,-171.66643,-91.443342)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-59"
-       id="radialGradient3164-2-9-0"
-       fy="355.25784"
-       fx="680.60205"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-  </defs>
-  <metadata
-     id="metadata4162">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <circle
-     r="0"
-     cy="3.4839716"
-     cx="-24.818802"
-     id="path226-6"
-     style="opacity:1;vector-effect:none;fill:#9bdb4d;fill-opacity:1;stroke:#452981;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-  <path
-     id="path924"
-     d="M 10,1.5 C 8.4162831,1.5021403 7.0313479,2.5674751 6.6230469,4.0976562 6.1703712,3.7116752 5.5948921,3.4997659 5,3.5 3.6192881,3.5 2.5,4.6192881 2.5,6 2.5009622,6.0841939 2.5061771,6.1682854 2.515625,6.2519531 1.2581201,7.084594 0.50134211,8.4918197 0.5,10 c 0,2.485281 2.0147186,4.5 4.5,4.5 h 6 c 2.485281,0 4.5,-2.014719 4.5,-4.5 C 15.498012,8.4169521 14.664361,6.951387 13.304688,6.140625 13.432632,5.773888 13.498638,5.3884119 13.5,5 13.5,3.0670034 11.932997,1.5 10,1.5 Z"
-     style="opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#555761;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal" />
-  <path
-     id="path924-3"
-     d="M 10 2 A 3 3 0 0 0 7.0742188 4.3496094 A 0.5 0.5 0 0 1 6.6445312 4.5976562 A 0.5 0.5 0 0 1 6.3613281 4.5097656 L 6.3496094 4.5273438 A 2 2 0 0 0 5 4 A 2 2 0 0 0 3 6 A 2 2 0 0 0 3.0214844 6.2695312 A 0.5 0.5 0 0 1 2.7773438 6.6835938 C 1.7080485 7.4014882 1 8.6152724 1 10 C 1 12.209139 2.790861 14 5 14 L 11 14 C 13.209139 14 15 12.209139 15 10 C 15 8.5281862 14.195643 7.2570799 13.011719 6.5625 L 13.021484 6.5507812 A 0.5 0.5 0 0 1 12.810547 6.1425781 A 0.5 0.5 0 0 1 12.826172 6.0195312 L 12.818359 6.0175781 A 3 3 0 0 0 13 5 A 3 3 0 0 0 10 2 z "
-     style="opacity:1;vector-effect:none;fill:url(#linearGradient1052);fill-opacity:1;stroke:none;stroke-width:1.125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-  <circle
-     r="3"
-     cy="5"
-     cx="10"
-     id="path924-8-75-2"
-     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3164-2-9-0);fill-opacity:1;stroke:none;stroke-width:1.87944341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal" />
-  <circle
-     r="2"
-     cy="6"
-     cx="5"
-     id="path924-8-7-3-7"
-     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3182-5);fill-opacity:1;stroke:none;stroke-width:0.52312344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal" />
-  <path
-     id="path924-3-0"
-     d="M 9.8571425,2.5 C 8.5523372,2.501232 7.7889374,3.5220798 7.5060602,4.7795229 7.4232201,4.9197042 6.9971761,5.086187 6.8327788,5.0868992 6.7388849,5.0869117 6.6471936,5.1845349 6.5698045,5.1320471 L 6.3417796,5.1481601 C 5.9999337,4.8380578 5.5299718,4.4713111 5.0657141,4.4704762 c -1.0256717,0 -1.5485715,0.7636684 -1.5485714,1.7761905 9.966e-4,0.082707 0.00766,0.1652521 0.01995,0.2470703 -0.00497,0.1564307 -0.090446,0.2995463 -0.226702,0.3795573 C 2.3174735,7.5313642 1.5,8.5639997 1.5,9.8333334 1.5,11.858377 3.1629422,13.5 5.2142855,13.5 H 10.785714 C 12.837057,13.5 14.5,11.858377 14.5,9.8333334 14.5,8.4841707 13.524525,7.341847 12.425168,6.7051488 l 0.0091,-0.010742 c -0.122917,-0.085974 -0.19594,-0.2254748 -0.19587,-0.3741862 7.8e-5,-0.038047 0.005,-0.075936 0.01452,-0.112793 l -0.0073,-0.00179 C 12.356086,5.9066864 12.527441,5.4425043 12.52857,5.1242857 12.52857,3.6055029 11.39565,2.5000004 9.8571425,2.5 Z"
-     style="opacity:0.8;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient4015-5-3);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-</svg>
diff --git a/categories/24/applications-internet.svg b/categories/24/applications-internet.svg
deleted file mode 120000
index a6b406092..000000000
--- a/categories/24/applications-internet.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts.svg
\ No newline at end of file
diff --git a/categories/24/applications-internet.svg b/categories/24/applications-internet.svg
new file mode 100644
index 000000000..973d454c6
--- /dev/null
+++ b/categories/24/applications-internet.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg4157">
+  <defs
+     id="defs4159">
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3082-6"
+       xlink:href="#linearGradient3688-166-749-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749-9">
+      <stop
+         id="stop2883-2"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885-2"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3084-4"
+       xlink:href="#linearGradient3688-464-309-7-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-464-309-7-6">
+      <stop
+         id="stop2889-75"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2891-4-9"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient3086-8"
+       xlink:href="#linearGradient3702-501-757-1"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3702-501-757-1">
+      <stop
+         id="stop2895-2"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897-89"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899-36"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient909">
+      <stop
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1"
+         id="stop905" />
+      <stop
+         offset="1"
+         style="stop-color:#d4d4d4;stop-opacity:1"
+         id="stop907" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-59">
+      <stop
+         id="stop9167-6"
+         style="stop-color:#b6c5cc;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop9169-9"
+         style="stop-color:#e5f0f6;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="680.5658"
+       cy="365.6579"
+       r="12.052631"
+       fx="681.32629"
+       fy="354.21619"
+       id="radialGradient3182"
+       xlink:href="#linearGradient9165-5-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3314842,0,0,0.32773092,-219.09681,-110.3374)" />
+    <linearGradient
+       id="linearGradient9165-5-1">
+      <stop
+         id="stop9167-7-12"
+         style="stop-color:#acb9bf;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop9169-0-4"
+         style="stop-color:#acb9bf;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4017">
+      <stop
+         id="stop4019"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4021"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.49550432" />
+      <stop
+         id="stop4023"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.88038814" />
+      <stop
+         id="stop4025"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20.153708"
+       y1="3.0216999"
+       x2="20.153708"
+       y2="25.472973"
+       id="linearGradient4015-5"
+       xlink:href="#linearGradient4017"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74193563,0,0,0.74000002,0.1290315,1.1499989)" />
+    <linearGradient
+       xlink:href="#linearGradient909"
+       id="linearGradient1112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69230769,0,0,0.69230769,30.923076,-23.076924)"
+       x1="-24.444443"
+       y1="37.666668"
+       x2="-24.444443"
+       y2="68" />
+    <radialGradient
+       cx="680.5658"
+       cy="365.6579"
+       r="12.052631"
+       fx="680.60205"
+       fy="355.25784"
+       id="radialGradient3164-2"
+       xlink:href="#linearGradient9165-59"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.44462103,0,0,0.43958673,-288.77738,-152.7389)" />
+  </defs>
+  <metadata
+     id="metadata4162">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.5789476,0,0,0.42857134,-1.8947379,2.8571464)"
+     id="g3712-8"
+     style="opacity:0.25">
+    <rect
+       width="5"
+       height="7"
+       x="38"
+       y="40"
+       id="rect2801-6"
+       style="fill:url(#radialGradient3082-6);fill-opacity:1;stroke:none" />
+    <rect
+       width="5"
+       height="7"
+       x="-10"
+       y="-47"
+       transform="scale(-1)"
+       id="rect3696-20"
+       style="fill:url(#radialGradient3084-4);fill-opacity:1;stroke:none" />
+    <rect
+       width="28"
+       height="7.0000005"
+       x="10"
+       y="40"
+       id="rect3700-5"
+       style="fill:url(#linearGradient3086-8);fill-opacity:1;stroke:none" />
+  </g>
+  <path
+     style="opacity:1;vector-effect:none;fill:url(#linearGradient1112);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
+     d="M 14 3 C 11.832393 3.0023112 9.9557492 4.3996713 9.2792969 6.4003906 L 9.2695312 6.3984375 A 0.49990073 0.49990073 0 0 1 8.7988281 6.7304688 A 0.49990073 0.49990073 0 0 1 8.5566406 6.6699219 L 8.5546875 6.671875 C 7.961888 6.240283 7.2450851 6.0007147 6.5 6 C 4.5670034 6 3 7.5670034 3 9.5 C 2.9999365 9.8134468 3.0419791 10.125482 3.125 10.427734 C 1.7795998 11.565817 1.0025286 13.237806 1 15 C 0.99999972 18.313708 3.6862913 21 7 21 L 17 21 C 20.313709 21 23 18.313708 23 15 C 22.998956 12.522734 21.468396 10.332144 19.1875 9.4355469 L 19.195312 9.4179688 A 0.49990073 0.49990073 0 0 1 18.908203 8.9648438 A 0.49990073 0.49990073 0 0 1 18.916016 8.8828125 L 18.908203 8.8808594 C 18.961655 8.5897777 18.998816 8.2964917 19 8 C 19 5.2385763 16.761424 3 14 3 z "
+     id="path164" />
+  <circle
+     style="opacity:1;vector-effect:none;fill:#9bdb4d;fill-opacity:1;stroke:#452981;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+     id="path226-6"
+     cx="-24.818802"
+     cy="11.483972"
+     r="0" />
+  <path
+     style="opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#555761;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
+     d="M 14,2.5 C 11.646738,2.5027371 9.5559487,4.0023271 8.7988281,6.2304688 8.1259711,5.7562346 7.3231849,5.5011436 6.5,5.5 c -2.209139,-1e-7 -4.0000001,1.790861 -4,4 0.0012,0.251126 0.026052,0.501581 0.074219,0.748047 C 1.2536376,11.47577 0.50237524,13.196882 0.5,15 c -2.8e-7,3.589851 2.9101489,6.5 6.5,6.5 h 10 c 3.589851,0 6.5,-2.910149 6.5,-6.5 C 23.497473,12.342082 21.876973,9.9534885 19.408203,8.96875 19.467364,8.6491798 19.498083,8.3249946 19.5,8 19.5,4.962434 17.037566,2.5 14,2.5 Z"
+     id="path164-2" />
+  <ellipse
+     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3164-2);fill-opacity:1;stroke:none;stroke-width:1.87944353;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
+     id="path164-6-7-2"
+     cx="14"
+     cy="7.9999995"
+     rx="5"
+     ry="4.9999995" />
+  <circle
+     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3182);fill-opacity:1;stroke:none;stroke-width:0.52312344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
+     id="path1063-6"
+     cx="6.5"
+     cy="9.5"
+     r="3.5" />
+  <path
+     style="opacity:0.8;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient4015-5);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+     d="M 14,3.5 C 11.883347,3.5 10.108017,4.9613778 9.6279338,6.9302104 9,7.4701607 8.3728515,7.1738685 7.867184,6.81162 7.5571666,6.6472876 7.1415574,6.5194998 6.5,6.5 c -1.6568542,0 -3,1.3431458 -3,3 -1.83e-4,0.3770578 0.070717,0.750771 0.2089844,1.101562 C 2.3211055,11.63805 1.502611,13.267803 1.5,15 c -3e-7,3.037566 2.4624337,5.5 5.5,5.5 h 10 c 3.037566,0 5.5,-2.462434 5.5,-5.5 C 22.4976,12.42189 20.704802,10.191402 18.1875,9.6347656 18.392409,9.1140152 18.498388,8.5596126 18.5,8 18.5,5.5147187 16.485282,3.5 14,3.5 Z"
+     id="path164-3" />
+</svg>
diff --git a/categories/24/config-language.svg b/categories/24/config-language.svg
deleted file mode 120000
index c0bcf8bca..000000000
--- a/categories/24/config-language.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-locale.svg
\ No newline at end of file
diff --git a/categories/24/gnome-power-manager.svg b/categories/24/gnome-power-manager.svg
deleted file mode 120000
index e7a4d9f1f..000000000
--- a/categories/24/gnome-power-manager.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-system-power.svg
\ No newline at end of file
diff --git a/categories/24/preferences-desktop-sound.svg b/categories/24/multimedia-volume-control.svg
similarity index 100%
rename from categories/24/preferences-desktop-sound.svg
rename to categories/24/multimedia-volume-control.svg
diff --git a/categories/24/preferences-desktop-online-accounts.svg b/categories/24/preferences-desktop-online-accounts.svg
deleted file mode 100644
index 973d454c6..000000000
--- a/categories/24/preferences-desktop-online-accounts.svg
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="24"
-   height="24"
-   id="svg4157">
-  <defs
-     id="defs4159">
-    <radialGradient
-       cx="4.9929786"
-       cy="43.5"
-       r="2.5"
-       fx="4.9929786"
-       fy="43.5"
-       id="radialGradient3082-6"
-       xlink:href="#linearGradient3688-166-749-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
-    <linearGradient
-       id="linearGradient3688-166-749-9">
-      <stop
-         id="stop2883-2"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2885-2"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="4.9929786"
-       cy="43.5"
-       r="2.5"
-       fx="4.9929786"
-       fy="43.5"
-       id="radialGradient3084-4"
-       xlink:href="#linearGradient3688-464-309-7-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
-    <linearGradient
-       id="linearGradient3688-464-309-7-6">
-      <stop
-         id="stop2889-75"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2891-4-9"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25.058096"
-       y1="47.027729"
-       x2="25.058096"
-       y2="39.999443"
-       id="linearGradient3086-8"
-       xlink:href="#linearGradient3702-501-757-1"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3702-501-757-1">
-      <stop
-         id="stop2895-2"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop2897-89"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop2899-36"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient909">
-      <stop
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1"
-         id="stop905" />
-      <stop
-         offset="1"
-         style="stop-color:#d4d4d4;stop-opacity:1"
-         id="stop907" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-59">
-      <stop
-         id="stop9167-6"
-         style="stop-color:#b6c5cc;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop9169-9"
-         style="stop-color:#e5f0f6;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="680.5658"
-       cy="365.6579"
-       r="12.052631"
-       fx="681.32629"
-       fy="354.21619"
-       id="radialGradient3182"
-       xlink:href="#linearGradient9165-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3314842,0,0,0.32773092,-219.09681,-110.3374)" />
-    <linearGradient
-       id="linearGradient9165-5-1">
-      <stop
-         id="stop9167-7-12"
-         style="stop-color:#acb9bf;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop9169-0-4"
-         style="stop-color:#acb9bf;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4017">
-      <stop
-         id="stop4019"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4021"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.49550432" />
-      <stop
-         id="stop4023"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.88038814" />
-      <stop
-         id="stop4025"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="20.153708"
-       y1="3.0216999"
-       x2="20.153708"
-       y2="25.472973"
-       id="linearGradient4015-5"
-       xlink:href="#linearGradient4017"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.74193563,0,0,0.74000002,0.1290315,1.1499989)" />
-    <linearGradient
-       xlink:href="#linearGradient909"
-       id="linearGradient1112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.69230769,0,0,0.69230769,30.923076,-23.076924)"
-       x1="-24.444443"
-       y1="37.666668"
-       x2="-24.444443"
-       y2="68" />
-    <radialGradient
-       cx="680.5658"
-       cy="365.6579"
-       r="12.052631"
-       fx="680.60205"
-       fy="355.25784"
-       id="radialGradient3164-2"
-       xlink:href="#linearGradient9165-59"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.44462103,0,0,0.43958673,-288.77738,-152.7389)" />
-  </defs>
-  <metadata
-     id="metadata4162">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(0.5789476,0,0,0.42857134,-1.8947379,2.8571464)"
-     id="g3712-8"
-     style="opacity:0.25">
-    <rect
-       width="5"
-       height="7"
-       x="38"
-       y="40"
-       id="rect2801-6"
-       style="fill:url(#radialGradient3082-6);fill-opacity:1;stroke:none" />
-    <rect
-       width="5"
-       height="7"
-       x="-10"
-       y="-47"
-       transform="scale(-1)"
-       id="rect3696-20"
-       style="fill:url(#radialGradient3084-4);fill-opacity:1;stroke:none" />
-    <rect
-       width="28"
-       height="7.0000005"
-       x="10"
-       y="40"
-       id="rect3700-5"
-       style="fill:url(#linearGradient3086-8);fill-opacity:1;stroke:none" />
-  </g>
-  <path
-     style="opacity:1;vector-effect:none;fill:url(#linearGradient1112);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
-     d="M 14 3 C 11.832393 3.0023112 9.9557492 4.3996713 9.2792969 6.4003906 L 9.2695312 6.3984375 A 0.49990073 0.49990073 0 0 1 8.7988281 6.7304688 A 0.49990073 0.49990073 0 0 1 8.5566406 6.6699219 L 8.5546875 6.671875 C 7.961888 6.240283 7.2450851 6.0007147 6.5 6 C 4.5670034 6 3 7.5670034 3 9.5 C 2.9999365 9.8134468 3.0419791 10.125482 3.125 10.427734 C 1.7795998 11.565817 1.0025286 13.237806 1 15 C 0.99999972 18.313708 3.6862913 21 7 21 L 17 21 C 20.313709 21 23 18.313708 23 15 C 22.998956 12.522734 21.468396 10.332144 19.1875 9.4355469 L 19.195312 9.4179688 A 0.49990073 0.49990073 0 0 1 18.908203 8.9648438 A 0.49990073 0.49990073 0 0 1 18.916016 8.8828125 L 18.908203 8.8808594 C 18.961655 8.5897777 18.998816 8.2964917 19 8 C 19 5.2385763 16.761424 3 14 3 z "
-     id="path164" />
-  <circle
-     style="opacity:1;vector-effect:none;fill:#9bdb4d;fill-opacity:1;stroke:#452981;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-     id="path226-6"
-     cx="-24.818802"
-     cy="11.483972"
-     r="0" />
-  <path
-     style="opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#555761;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
-     d="M 14,2.5 C 11.646738,2.5027371 9.5559487,4.0023271 8.7988281,6.2304688 8.1259711,5.7562346 7.3231849,5.5011436 6.5,5.5 c -2.209139,-1e-7 -4.0000001,1.790861 -4,4 0.0012,0.251126 0.026052,0.501581 0.074219,0.748047 C 1.2536376,11.47577 0.50237524,13.196882 0.5,15 c -2.8e-7,3.589851 2.9101489,6.5 6.5,6.5 h 10 c 3.589851,0 6.5,-2.910149 6.5,-6.5 C 23.497473,12.342082 21.876973,9.9534885 19.408203,8.96875 19.467364,8.6491798 19.498083,8.3249946 19.5,8 19.5,4.962434 17.037566,2.5 14,2.5 Z"
-     id="path164-2" />
-  <ellipse
-     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3164-2);fill-opacity:1;stroke:none;stroke-width:1.87944353;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
-     id="path164-6-7-2"
-     cx="14"
-     cy="7.9999995"
-     rx="5"
-     ry="4.9999995" />
-  <circle
-     style="opacity:0.15;vector-effect:none;fill:url(#radialGradient3182);fill-opacity:1;stroke:none;stroke-width:0.52312344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"
-     id="path1063-6"
-     cx="6.5"
-     cy="9.5"
-     r="3.5" />
-  <path
-     style="opacity:0.8;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient4015-5);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-     d="M 14,3.5 C 11.883347,3.5 10.108017,4.9613778 9.6279338,6.9302104 9,7.4701607 8.3728515,7.1738685 7.867184,6.81162 7.5571666,6.6472876 7.1415574,6.5194998 6.5,6.5 c -1.6568542,0 -3,1.3431458 -3,3 -1.83e-4,0.3770578 0.070717,0.750771 0.2089844,1.101562 C 2.3211055,11.63805 1.502611,13.267803 1.5,15 c -3e-7,3.037566 2.4624337,5.5 5.5,5.5 h 10 c 3.037566,0 5.5,-2.462434 5.5,-5.5 C 22.4976,12.42189 20.704802,10.191402 18.1875,9.6347656 18.392409,9.1140152 18.498388,8.5596126 18.5,8 18.5,5.5147187 16.485282,3.5 14,3.5 Z"
-     id="path164-3" />
-</svg>
diff --git a/categories/32/applications-internet.svg b/categories/32/applications-internet.svg
deleted file mode 120000
index a6b406092..000000000
--- a/categories/32/applications-internet.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts.svg
\ No newline at end of file
diff --git a/categories/32/applications-internet.svg b/categories/32/applications-internet.svg
new file mode 100644
index 000000000..8baa3d10a
--- /dev/null
+++ b/categories/32/applications-internet.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg4082"
+   height="32"
+   width="32"
+   version="1.1">
+  <defs
+     id="defs4084">
+    <linearGradient
+       id="linearGradient855">
+      <stop
+         id="stop851"
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1" />
+      <stop
+         id="stop853"
+         offset="1"
+         style="stop-color:#d4d4d4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,2)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4017"
+       id="linearGradient4015"
+       y2="26.666777"
+       x2="20.153708"
+       y1="3.0216999"
+       x1="20.153708" />
+    <linearGradient
+       id="linearGradient4017">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4019" />
+      <stop
+         offset="0.49550432"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4021" />
+      <stop
+         offset="0.88038814"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4023" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4025" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.44678297,0,0,0.44287961,-294.96947,-148.64601)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-5-1"
+       id="radialGradient3182"
+       fy="354.21619"
+       fx="681.32629"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <linearGradient
+       id="linearGradient9165-5-1">
+      <stop
+         offset="0"
+         style="stop-color:#acb9bf;stop-opacity:1"
+         id="stop9167-7-12" />
+      <stop
+         offset="1"
+         style="stop-color:#acb9bf;stop-opacity:0"
+         id="stop9169-0-4" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.59927171,0,0,0.59403611,-389.15478,-205.61691)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-59"
+       id="radialGradient3164"
+       fy="355.25784"
+       fx="680.60205"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <linearGradient
+       id="linearGradient9165-59">
+      <stop
+         offset="0"
+         style="stop-color:#b6c5cc;stop-opacity:1"
+         id="stop9167-6" />
+      <stop
+         offset="1"
+         style="stop-color:#e5f0f6;stop-opacity:0"
+         id="stop9169-9" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-5"
+       id="radialGradient3176"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3690-8" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3692-6" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-5"
+       id="radialGradient3178"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-4-7"
+       id="linearGradient3180"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       id="linearGradient3702-4-7">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3704-7-8" />
+      <stop
+         offset="0.5"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3710-0-0" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3706-7-2" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="32.321995"
+       x2="19.830294"
+       y1="6.2034917"
+       x1="19.830294"
+       id="linearGradient857"
+       xlink:href="#linearGradient855" />
+  </defs>
+  <metadata
+     id="metadata4087">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.23999999"
+     id="g3712-3-7"
+     transform="matrix(0.71051963,0,0,0.58319692,-1.0526103,3.5897444)">
+    <rect
+       style="fill:url(#radialGradient3176);fill-opacity:1;stroke:none"
+       id="rect2801-5"
+       y="40"
+       x="38"
+       height="7"
+       width="5" />
+    <rect
+       style="fill:url(#radialGradient3178);fill-opacity:1;stroke:none"
+       id="rect3696-8"
+       transform="scale(-1)"
+       y="-47"
+       x="-10"
+       height="7"
+       width="5" />
+    <rect
+       style="fill:url(#linearGradient3180);fill-opacity:1;stroke:none"
+       id="rect3700-8"
+       y="40"
+       x="10"
+       height="7.0000005"
+       width="28" />
+  </g>
+  <path
+     d="m 18.63832,4.5000015 c -2.936436,0 -5.479497,1.7226776 -6.740027,4.2229831 C 11.081297,8.1911724 10.114154,7.878404 9.0744882,7.878404 c -2.9141734,0 -5.276589,2.420034 -5.276589,5.4054 0,0.47463 0.073276,0.933817 0.1855016,1.372435 -2.1047212,1.45423 -3.4833861,3.928221 -3.4833861,6.735623 0,4.491888 3.5300431,8.108138 7.9148882,8.108138 H 23.585131 c 4.38485,0 7.914883,-3.61625 7.914883,-8.108138 0,-3.586954 -2.260456,-6.611095 -5.400274,-7.685803 0.08519,-0.466183 0.123669,-0.944245 0.123669,-1.435762 0,-4.2914474 -3.39595,-7.7702955 -7.585089,-7.7702955 z"
+     id="rect4519"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient857);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 18.638298,4.500001 c -2.93643,0 -5.479491,1.7226713 -6.740025,4.2229843 C 11.081277,8.1911668 10.11414,7.8784024 9.0744733,7.8784024 c -2.9141797,0 -5.2766004,2.4200346 -5.2766004,5.4054006 0,0.47463 0.073297,0.933824 0.1855067,1.372442 C 1.8786638,16.110463 0.5,18.58446 0.5,21.391872 c 0,4.49189 3.5300377,8.108129 7.9148922,8.108129 H 23.585115 c 4.384845,0 7.914884,-3.616239 7.914884,-8.108129 0,-3.58696 -2.260462,-6.6111 -5.400268,-7.685809 0.08519,-0.466188 0.123663,-0.94425 0.123663,-1.43576 0,-4.2914475 -3.395954,-7.770302 -7.585096,-7.770302 z"
+     id="rect4519-6"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#555761;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 18.681213,5.0299104 c -2.77652,0 -5.139586,1.6977024 -6.124242,4.0994928 1.358638,1.0441718 2.234997,2.6821148 2.234997,4.5181628 0,0.976996 -0.232326,1.899881 -0.668738,2.70392 1.18835,1.121983 2.787288,1.814246 4.557983,1.814246 3.658075,0 6.634597,-2.950517 6.634597,-6.576633 0,-3.6261145 -2.976522,-6.5591886 -6.634597,-6.5591886 z"
+     id="path9151"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#radialGradient3164);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;enable-background:accumulate" />
+  <path
+     d="m 14.033866,13.296418 a 4.9381291,4.8949867 0 1 1 -9.8762579,0 4.9381291,4.8949867 0 1 1 9.8762579,0 z"
+     id="path9151-6"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#radialGradient3182);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52312344;marker:none;enable-background:accumulate" />
+  <path
+     d="m 18.625,5.5 c -2.54424,0 -4.711234,1.4718499 -5.8125,3.65625 A 1.0053509,1.0053509 0 0 1 11.34375,9.5625 C 10.686391,9.1345964 9.9010967,8.875 9.0625,8.875 c -2.3574547,0 -4.25,1.945239 -4.25,4.40625 0,0.412446 0.039123,0.789313 0.125,1.125 a 1.0053509,1.0053509 0 0 1 -0.40625,1.0625 C 2.700649,16.733573 1.5,18.924451 1.5,21.40625 1.5,25.372766 4.5718921,28.5 8.40625,28.5 h 15.1875 c 3.834347,0 6.90625,-3.127236 6.90625,-7.09375 0,-3.163511 -1.98567,-5.814507 -4.71875,-6.75 a 1.0053509,1.0053509 0 0 1 -0.6875,-1.125 c 0.07322,-0.400684 0.125,-0.81277 0.125,-1.25 C 25.21875,8.5214775 22.255853,5.5 18.625,5.5 Z"
+     id="path4007"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4015);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/categories/32/config-language.svg b/categories/32/config-language.svg
deleted file mode 120000
index c0bcf8bca..000000000
--- a/categories/32/config-language.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-locale.svg
\ No newline at end of file
diff --git a/categories/32/gnome-power-manager.svg b/categories/32/gnome-power-manager.svg
deleted file mode 120000
index e7a4d9f1f..000000000
--- a/categories/32/gnome-power-manager.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-system-power.svg
\ No newline at end of file
diff --git a/categories/32/preferences-desktop-sound.svg b/categories/32/multimedia-volume-control.svg
similarity index 100%
rename from categories/32/preferences-desktop-sound.svg
rename to categories/32/multimedia-volume-control.svg
diff --git a/categories/32/preferences-desktop-online-accounts.svg b/categories/32/preferences-desktop-online-accounts.svg
deleted file mode 100644
index 8baa3d10a..000000000
--- a/categories/32/preferences-desktop-online-accounts.svg
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg4082"
-   height="32"
-   width="32"
-   version="1.1">
-  <defs
-     id="defs4084">
-    <linearGradient
-       id="linearGradient855">
-      <stop
-         id="stop851"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop853"
-         offset="1"
-         style="stop-color:#d4d4d4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,2)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4017"
-       id="linearGradient4015"
-       y2="26.666777"
-       x2="20.153708"
-       y1="3.0216999"
-       x1="20.153708" />
-    <linearGradient
-       id="linearGradient4017">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4019" />
-      <stop
-         offset="0.49550432"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4021" />
-      <stop
-         offset="0.88038814"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4023" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4025" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.44678297,0,0,0.44287961,-294.96947,-148.64601)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-5-1"
-       id="radialGradient3182"
-       fy="354.21619"
-       fx="681.32629"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <linearGradient
-       id="linearGradient9165-5-1">
-      <stop
-         offset="0"
-         style="stop-color:#acb9bf;stop-opacity:1"
-         id="stop9167-7-12" />
-      <stop
-         offset="1"
-         style="stop-color:#acb9bf;stop-opacity:0"
-         id="stop9169-0-4" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.59927171,0,0,0.59403611,-389.15478,-205.61691)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-59"
-       id="radialGradient3164"
-       fy="355.25784"
-       fx="680.60205"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <linearGradient
-       id="linearGradient9165-59">
-      <stop
-         offset="0"
-         style="stop-color:#b6c5cc;stop-opacity:1"
-         id="stop9167-6" />
-      <stop
-         offset="1"
-         style="stop-color:#e5f0f6;stop-opacity:0"
-         id="stop9169-9" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-5"
-       id="radialGradient3176"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3690-8" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3692-6" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-5"
-       id="radialGradient3178"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-4-7"
-       id="linearGradient3180"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-4-7">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3704-7-8" />
-      <stop
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3710-0-0" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3706-7-2" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="32.321995"
-       x2="19.830294"
-       y1="6.2034917"
-       x1="19.830294"
-       id="linearGradient857"
-       xlink:href="#linearGradient855" />
-  </defs>
-  <metadata
-     id="metadata4087">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="opacity:0.23999999"
-     id="g3712-3-7"
-     transform="matrix(0.71051963,0,0,0.58319692,-1.0526103,3.5897444)">
-    <rect
-       style="fill:url(#radialGradient3176);fill-opacity:1;stroke:none"
-       id="rect2801-5"
-       y="40"
-       x="38"
-       height="7"
-       width="5" />
-    <rect
-       style="fill:url(#radialGradient3178);fill-opacity:1;stroke:none"
-       id="rect3696-8"
-       transform="scale(-1)"
-       y="-47"
-       x="-10"
-       height="7"
-       width="5" />
-    <rect
-       style="fill:url(#linearGradient3180);fill-opacity:1;stroke:none"
-       id="rect3700-8"
-       y="40"
-       x="10"
-       height="7.0000005"
-       width="28" />
-  </g>
-  <path
-     d="m 18.63832,4.5000015 c -2.936436,0 -5.479497,1.7226776 -6.740027,4.2229831 C 11.081297,8.1911724 10.114154,7.878404 9.0744882,7.878404 c -2.9141734,0 -5.276589,2.420034 -5.276589,5.4054 0,0.47463 0.073276,0.933817 0.1855016,1.372435 -2.1047212,1.45423 -3.4833861,3.928221 -3.4833861,6.735623 0,4.491888 3.5300431,8.108138 7.9148882,8.108138 H 23.585131 c 4.38485,0 7.914883,-3.61625 7.914883,-8.108138 0,-3.586954 -2.260456,-6.611095 -5.400274,-7.685803 0.08519,-0.466183 0.123669,-0.944245 0.123669,-1.435762 0,-4.2914474 -3.39595,-7.7702955 -7.585089,-7.7702955 z"
-     id="rect4519"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient857);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 18.638298,4.500001 c -2.93643,0 -5.479491,1.7226713 -6.740025,4.2229843 C 11.081277,8.1911668 10.11414,7.8784024 9.0744733,7.8784024 c -2.9141797,0 -5.2766004,2.4200346 -5.2766004,5.4054006 0,0.47463 0.073297,0.933824 0.1855067,1.372442 C 1.8786638,16.110463 0.5,18.58446 0.5,21.391872 c 0,4.49189 3.5300377,8.108129 7.9148922,8.108129 H 23.585115 c 4.384845,0 7.914884,-3.616239 7.914884,-8.108129 0,-3.58696 -2.260462,-6.6111 -5.400268,-7.685809 0.08519,-0.466188 0.123663,-0.94425 0.123663,-1.43576 0,-4.2914475 -3.395954,-7.770302 -7.585096,-7.770302 z"
-     id="rect4519-6"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#555761;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 18.681213,5.0299104 c -2.77652,0 -5.139586,1.6977024 -6.124242,4.0994928 1.358638,1.0441718 2.234997,2.6821148 2.234997,4.5181628 0,0.976996 -0.232326,1.899881 -0.668738,2.70392 1.18835,1.121983 2.787288,1.814246 4.557983,1.814246 3.658075,0 6.634597,-2.950517 6.634597,-6.576633 0,-3.6261145 -2.976522,-6.5591886 -6.634597,-6.5591886 z"
-     id="path9151"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#radialGradient3164);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;enable-background:accumulate" />
-  <path
-     d="m 14.033866,13.296418 a 4.9381291,4.8949867 0 1 1 -9.8762579,0 4.9381291,4.8949867 0 1 1 9.8762579,0 z"
-     id="path9151-6"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#radialGradient3182);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52312344;marker:none;enable-background:accumulate" />
-  <path
-     d="m 18.625,5.5 c -2.54424,0 -4.711234,1.4718499 -5.8125,3.65625 A 1.0053509,1.0053509 0 0 1 11.34375,9.5625 C 10.686391,9.1345964 9.9010967,8.875 9.0625,8.875 c -2.3574547,0 -4.25,1.945239 -4.25,4.40625 0,0.412446 0.039123,0.789313 0.125,1.125 a 1.0053509,1.0053509 0 0 1 -0.40625,1.0625 C 2.700649,16.733573 1.5,18.924451 1.5,21.40625 1.5,25.372766 4.5718921,28.5 8.40625,28.5 h 15.1875 c 3.834347,0 6.90625,-3.127236 6.90625,-7.09375 0,-3.163511 -1.98567,-5.814507 -4.71875,-6.75 a 1.0053509,1.0053509 0 0 1 -0.6875,-1.125 c 0.07322,-0.400684 0.125,-0.81277 0.125,-1.25 C 25.21875,8.5214775 22.255853,5.5 18.625,5.5 Z"
-     id="path4007"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4015);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/categories/48/applications-internet.svg b/categories/48/applications-internet.svg
deleted file mode 120000
index a6b406092..000000000
--- a/categories/48/applications-internet.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts.svg
\ No newline at end of file
diff --git a/categories/48/applications-internet.svg b/categories/48/applications-internet.svg
new file mode 100644
index 000000000..bd052cc87
--- /dev/null
+++ b/categories/48/applications-internet.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg4082"
+   height="48"
+   width="48"
+   version="1.1">
+  <defs
+     id="defs4084">
+    <linearGradient
+       id="linearGradient868">
+      <stop
+         id="stop864"
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1" />
+      <stop
+         id="stop866"
+         offset="1"
+         style="stop-color:#d4d4d4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-5-1">
+      <stop
+         offset="0"
+         style="stop-color:#acb9bf;stop-opacity:1"
+         id="stop9167-7-12" />
+      <stop
+         offset="1"
+         style="stop-color:#acb9bf;stop-opacity:0"
+         id="stop9169-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-59">
+      <stop
+         offset="0"
+         style="stop-color:#b6c5cc;stop-opacity:1"
+         id="stop9167-6" />
+      <stop
+         offset="1"
+         style="stop-color:#e5f0f6;stop-opacity:0"
+         id="stop9169-9" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-5"
+       id="radialGradient3176"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3690-8" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3692-6" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-5"
+       id="radialGradient3178"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-4-7"
+       id="linearGradient3180"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       id="linearGradient3702-4-7">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3704-7-8" />
+      <stop
+         offset="0.5"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3710-0-0" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3706-7-2" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.67017445,0,0,0.66431941,-442.4542,-222.96901)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-5-1"
+       id="radialGradient3030"
+       fy="354.21619"
+       fx="681.32629"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <radialGradient
+       gradientTransform="matrix(0.89890757,0,0,0.89105416,-583.73217,-308.42536)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-59"
+       id="radialGradient3033"
+       fy="355.25784"
+       fx="680.60205"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <linearGradient
+       gradientTransform="matrix(1.5,0,0,1.5,0,3)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4017-8"
+       id="linearGradient3027-6"
+       y2="26.666777"
+       x2="20.153708"
+       y1="3.0216999"
+       x1="20.153708" />
+    <linearGradient
+       id="linearGradient4017-8">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4019-8" />
+      <stop
+         offset="0.49550432"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4021-4" />
+      <stop
+         offset="0.88038814"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4023-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4025-5" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="48.197144"
+       x2="30.417143"
+       y1="7.1228571"
+       x1="30.417143"
+       id="linearGradient870"
+       xlink:href="#linearGradient868" />
+  </defs>
+  <metadata
+     id="metadata4087">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.6;display:inline"
+     id="g2036-4"
+     transform="matrix(1.0124901,0,0,0.68039709,-0.2999805,14.521356)">
+    <g
+       style="opacity:0.4"
+       id="g3712-3-7"
+       transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+      <rect
+         style="fill:url(#radialGradient3176);fill-opacity:1;stroke:none"
+         id="rect2801-5"
+         y="40"
+         x="38"
+         height="7"
+         width="5" />
+      <rect
+         style="fill:url(#radialGradient3178);fill-opacity:1;stroke:none"
+         id="rect3696-8"
+         transform="scale(-1,-1)"
+         y="-47"
+         x="-10"
+         height="7"
+         width="5" />
+      <rect
+         style="fill:url(#linearGradient3180);fill-opacity:1;stroke:none"
+         id="rect3700-8"
+         y="40"
+         x="10"
+         height="7.0000005"
+         width="28" />
+    </g>
+  </g>
+  <path
+     style="color:#000000;fill:url(#linearGradient870);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4519"
+     d="m 27.914905,7 c -4.357292,0 -8.130867,2.549563 -10.001331,6.250015 -1.212317,-0.787081 -2.647431,-1.249979 -4.190162,-1.249979 -4.3242568,0 -7.8297768,3.581651 -7.8297768,7.999992 0,0.702453 0.1087322,1.38205 0.2752605,2.031204 C 3.0457608,24.183493 1,27.845 1,31.999955 1,38.647949 6.2381285,44 12.744673,44 l 22.510661,0 C 41.761886,44 47,38.647949 47,31.999955 c 0,-5.308692 -3.354225,-9.78442 -8.01331,-11.374989 0.126411,-0.68995 0.183508,-1.397483 0.183508,-2.124928 C 39.170198,12.148695 34.131047,7 27.914905,7 z" />
+  <path
+     style="opacity:0.5;color:#000000;fill:none;stroke:#555761;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"
+     id="rect4519-6"
+     d="m 28.000001,6.4999997 c -4.452007,0 -8.307616,2.6184603 -10.218749,6.4189353 -1.238671,-0.808364 -2.704975,-1.283765 -4.281244,-1.283765 -4.4182724,0 -8.0000071,3.678452 -8.0000071,8.216208 0,0.721438 0.1111277,1.419412 0.2812521,2.086112 C 2.5902322,24.147901 0.5,27.908377 0.5,32.175643 c 0,6.827672 5.3519926,12.324355 11.999998,12.324355 l 23.000016,0 c 6.64799,0 11.999986,-5.496683 11.999986,-12.324355 0,-5.452179 -3.427153,-10.048872 -8.187505,-11.68243 0.12916,-0.708606 0.18749,-1.43526 0.18749,-2.182355 0,-6.523 -5.148705,-11.8108583 -11.499984,-11.8108583 z" />
+  <path
+     style="opacity:0.15;color:#000000;fill:url(#radialGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9151"
+     d="m 28.021819,7.5448656 c -4.16478,0 -7.709379,2.5465534 -9.186363,6.1492394 2.037957,1.566257 3.352496,4.023172 3.352496,6.777244 0,1.465494 -0.348489,2.849821 -1.003107,4.05588 1.782525,1.682975 4.180932,2.721369 6.836974,2.721369 5.487113,0 9.951896,-4.425775 9.951896,-9.86495 0,-5.439171 -4.464783,-9.8387824 -9.951896,-9.8387824 z" />
+  <path
+     style="opacity:0.15;color:#000000;fill:url(#radialGradient3030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.1760155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9151-6"
+     d="m 21.050801,19.94463 a 7.4071936,7.34248 0 0 1 -14.8143872,0 7.4071936,7.34248 0 1 1 14.8143872,0 z" />
+  <path
+     style="color:#000000;fill:none;stroke:url(#linearGradient3027-6);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="path3068"
+     d="m 28,7.5 c -4.064541,0 -7.591595,2.3594181 -9.34375,5.84375 A 0.99308562,0.99308562 0 0 1 17.25,13.75 c -1.086741,-0.709214 -2.37233,-1.125 -3.75,-1.125 -3.8667481,0 -7,3.203515 -7,7.21875 0,0.619469 0.095763,1.239312 0.25,1.84375 A 0.99308562,0.99308562 0 0 1 6.34375,22.75 C 3.4205972,24.77486 1.5,28.244496 1.5,32.1875 1.5,38.496258 6.3981593,43.5 12.5,43.5 l 23,0 c 6.101824,0 11,-5.003743 11,-11.3125 0,-5.036063 -3.142774,-9.254778 -7.5,-10.75 a 0.99308562,0.99308562 0 0 1 -0.65625,-1.125 C 38.460742,19.67065 38.5,19.007901 38.5,18.3125 38.5,12.312021 33.799957,7.5 28,7.5 z" />
+</svg>
diff --git a/categories/48/applications-system.svg b/categories/48/applications-system.svg
deleted file mode 120000
index 1b1a25ece..000000000
--- a/categories/48/applications-system.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/48/system-shutdown.svg
\ No newline at end of file
diff --git a/categories/48/config-language.svg b/categories/48/config-language.svg
deleted file mode 120000
index c0bcf8bca..000000000
--- a/categories/48/config-language.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-locale.svg
\ No newline at end of file
diff --git a/categories/48/gnome-power-manager.svg b/categories/48/gnome-power-manager.svg
deleted file mode 120000
index e7a4d9f1f..000000000
--- a/categories/48/gnome-power-manager.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-system-power.svg
\ No newline at end of file
diff --git a/categories/48/preferences-desktop-sound.svg b/categories/48/multimedia-volume-control.svg
similarity index 100%
rename from categories/48/preferences-desktop-sound.svg
rename to categories/48/multimedia-volume-control.svg
diff --git a/categories/48/preferences-desktop-online-accounts.svg b/categories/48/preferences-desktop-online-accounts.svg
deleted file mode 100644
index bd052cc87..000000000
--- a/categories/48/preferences-desktop-online-accounts.svg
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg4082"
-   height="48"
-   width="48"
-   version="1.1">
-  <defs
-     id="defs4084">
-    <linearGradient
-       id="linearGradient868">
-      <stop
-         id="stop864"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop866"
-         offset="1"
-         style="stop-color:#d4d4d4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-5-1">
-      <stop
-         offset="0"
-         style="stop-color:#acb9bf;stop-opacity:1"
-         id="stop9167-7-12" />
-      <stop
-         offset="1"
-         style="stop-color:#acb9bf;stop-opacity:0"
-         id="stop9169-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-59">
-      <stop
-         offset="0"
-         style="stop-color:#b6c5cc;stop-opacity:1"
-         id="stop9167-6" />
-      <stop
-         offset="1"
-         style="stop-color:#e5f0f6;stop-opacity:0"
-         id="stop9169-9" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-5"
-       id="radialGradient3176"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3690-8" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3692-6" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-5"
-       id="radialGradient3178"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-4-7"
-       id="linearGradient3180"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-4-7">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3704-7-8" />
-      <stop
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3710-0-0" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3706-7-2" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.67017445,0,0,0.66431941,-442.4542,-222.96901)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-5-1"
-       id="radialGradient3030"
-       fy="354.21619"
-       fx="681.32629"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <radialGradient
-       gradientTransform="matrix(0.89890757,0,0,0.89105416,-583.73217,-308.42536)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-59"
-       id="radialGradient3033"
-       fy="355.25784"
-       fx="680.60205"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <linearGradient
-       gradientTransform="matrix(1.5,0,0,1.5,0,3)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4017-8"
-       id="linearGradient3027-6"
-       y2="26.666777"
-       x2="20.153708"
-       y1="3.0216999"
-       x1="20.153708" />
-    <linearGradient
-       id="linearGradient4017-8">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4019-8" />
-      <stop
-         offset="0.49550432"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4021-4" />
-      <stop
-         offset="0.88038814"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4023-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4025-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="48.197144"
-       x2="30.417143"
-       y1="7.1228571"
-       x1="30.417143"
-       id="linearGradient870"
-       xlink:href="#linearGradient868" />
-  </defs>
-  <metadata
-     id="metadata4087">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="opacity:0.6;display:inline"
-     id="g2036-4"
-     transform="matrix(1.0124901,0,0,0.68039709,-0.2999805,14.521356)">
-    <g
-       style="opacity:0.4"
-       id="g3712-3-7"
-       transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
-      <rect
-         style="fill:url(#radialGradient3176);fill-opacity:1;stroke:none"
-         id="rect2801-5"
-         y="40"
-         x="38"
-         height="7"
-         width="5" />
-      <rect
-         style="fill:url(#radialGradient3178);fill-opacity:1;stroke:none"
-         id="rect3696-8"
-         transform="scale(-1,-1)"
-         y="-47"
-         x="-10"
-         height="7"
-         width="5" />
-      <rect
-         style="fill:url(#linearGradient3180);fill-opacity:1;stroke:none"
-         id="rect3700-8"
-         y="40"
-         x="10"
-         height="7.0000005"
-         width="28" />
-    </g>
-  </g>
-  <path
-     style="color:#000000;fill:url(#linearGradient870);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect4519"
-     d="m 27.914905,7 c -4.357292,0 -8.130867,2.549563 -10.001331,6.250015 -1.212317,-0.787081 -2.647431,-1.249979 -4.190162,-1.249979 -4.3242568,0 -7.8297768,3.581651 -7.8297768,7.999992 0,0.702453 0.1087322,1.38205 0.2752605,2.031204 C 3.0457608,24.183493 1,27.845 1,31.999955 1,38.647949 6.2381285,44 12.744673,44 l 22.510661,0 C 41.761886,44 47,38.647949 47,31.999955 c 0,-5.308692 -3.354225,-9.78442 -8.01331,-11.374989 0.126411,-0.68995 0.183508,-1.397483 0.183508,-2.124928 C 39.170198,12.148695 34.131047,7 27.914905,7 z" />
-  <path
-     style="opacity:0.5;color:#000000;fill:none;stroke:#555761;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"
-     id="rect4519-6"
-     d="m 28.000001,6.4999997 c -4.452007,0 -8.307616,2.6184603 -10.218749,6.4189353 -1.238671,-0.808364 -2.704975,-1.283765 -4.281244,-1.283765 -4.4182724,0 -8.0000071,3.678452 -8.0000071,8.216208 0,0.721438 0.1111277,1.419412 0.2812521,2.086112 C 2.5902322,24.147901 0.5,27.908377 0.5,32.175643 c 0,6.827672 5.3519926,12.324355 11.999998,12.324355 l 23.000016,0 c 6.64799,0 11.999986,-5.496683 11.999986,-12.324355 0,-5.452179 -3.427153,-10.048872 -8.187505,-11.68243 0.12916,-0.708606 0.18749,-1.43526 0.18749,-2.182355 0,-6.523 -5.148705,-11.8108583 -11.499984,-11.8108583 z" />
-  <path
-     style="opacity:0.15;color:#000000;fill:url(#radialGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path9151"
-     d="m 28.021819,7.5448656 c -4.16478,0 -7.709379,2.5465534 -9.186363,6.1492394 2.037957,1.566257 3.352496,4.023172 3.352496,6.777244 0,1.465494 -0.348489,2.849821 -1.003107,4.05588 1.782525,1.682975 4.180932,2.721369 6.836974,2.721369 5.487113,0 9.951896,-4.425775 9.951896,-9.86495 0,-5.439171 -4.464783,-9.8387824 -9.951896,-9.8387824 z" />
-  <path
-     style="opacity:0.15;color:#000000;fill:url(#radialGradient3030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.1760155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path9151-6"
-     d="m 21.050801,19.94463 a 7.4071936,7.34248 0 0 1 -14.8143872,0 7.4071936,7.34248 0 1 1 14.8143872,0 z" />
-  <path
-     style="color:#000000;fill:none;stroke:url(#linearGradient3027-6);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="path3068"
-     d="m 28,7.5 c -4.064541,0 -7.591595,2.3594181 -9.34375,5.84375 A 0.99308562,0.99308562 0 0 1 17.25,13.75 c -1.086741,-0.709214 -2.37233,-1.125 -3.75,-1.125 -3.8667481,0 -7,3.203515 -7,7.21875 0,0.619469 0.095763,1.239312 0.25,1.84375 A 0.99308562,0.99308562 0 0 1 6.34375,22.75 C 3.4205972,24.77486 1.5,28.244496 1.5,32.1875 1.5,38.496258 6.3981593,43.5 12.5,43.5 l 23,0 c 6.101824,0 11,-5.003743 11,-11.3125 0,-5.036063 -3.142774,-9.254778 -7.5,-10.75 a 0.99308562,0.99308562 0 0 1 -0.65625,-1.125 C 38.460742,19.67065 38.5,19.007901 38.5,18.3125 38.5,12.312021 33.799957,7.5 28,7.5 z" />
-</svg>
diff --git a/categories/64/applications-internet.svg b/categories/64/applications-internet.svg
deleted file mode 120000
index a6b406092..000000000
--- a/categories/64/applications-internet.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts.svg
\ No newline at end of file
diff --git a/categories/64/applications-internet.svg b/categories/64/applications-internet.svg
new file mode 100644
index 000000000..69b214144
--- /dev/null
+++ b/categories/64/applications-internet.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg4082"
+   height="64"
+   width="64"
+   version="1.1">
+  <defs
+     id="defs4084">
+    <linearGradient
+       id="linearGradient870">
+      <stop
+         id="stop866"
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:1" />
+      <stop
+         id="stop868"
+         offset="1"
+         style="stop-color:#d4d4d4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-5-1">
+      <stop
+         offset="0"
+         style="stop-color:#acb9bf;stop-opacity:1"
+         id="stop9167-7-12" />
+      <stop
+         offset="1"
+         style="stop-color:#acb9bf;stop-opacity:0"
+         id="stop9169-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9165-59">
+      <stop
+         offset="0"
+         style="stop-color:#b6c5cc;stop-opacity:1"
+         id="stop9167-6" />
+      <stop
+         offset="1"
+         style="stop-color:#e5f0f6;stop-opacity:0"
+         id="stop9169-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3688-5">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3690-8" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3692-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702-4-7">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3704-7-8" />
+      <stop
+         offset="0.5"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3710-0-0" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3706-7-2" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.89356594,0,0,0.88575922,-589.93894,-297.29202)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-5-1"
+       id="radialGradient3030"
+       fy="354.21619"
+       fx="681.32629"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <radialGradient
+       gradientTransform="matrix(1.1985434,0,0,1.1880722,-778.30956,-411.23382)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9165-59"
+       id="radialGradient3033"
+       fy="355.25784"
+       fx="680.60205"
+       r="12.052631"
+       cy="365.6579"
+       cx="680.5658" />
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-5"
+       id="radialGradient3044"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-5"
+       id="radialGradient3046"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-4-7"
+       id="linearGradient3048"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       gradientTransform="matrix(2,0,0,2,0,4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4017-9"
+       id="linearGradient3027-0"
+       y2="26.666777"
+       x2="20.153708"
+       y1="3.0216999"
+       x1="20.153708" />
+    <linearGradient
+       id="linearGradient4017-9">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4019-8" />
+      <stop
+         offset="0.49550432"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4021-9" />
+      <stop
+         offset="0.88038814"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4023-5" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4025-8" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="59.142857"
+       x2="40.405743"
+       y1="9.9542856"
+       x1="40.405743"
+       id="linearGradient872"
+       xlink:href="#linearGradient870" />
+  </defs>
+  <metadata
+     id="metadata4087">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.23999999"
+     id="g3712-3-7"
+     transform="matrix(1.4210393,0,0,1.1663938,-2.1052206,7.1794886)">
+    <rect
+       style="fill:url(#radialGradient3044);fill-opacity:1;stroke:none"
+       id="rect2801-5"
+       y="40"
+       x="38"
+       height="7"
+       width="5" />
+    <rect
+       style="fill:url(#radialGradient3046);fill-opacity:1;stroke:none"
+       id="rect3696-8"
+       transform="scale(-1,-1)"
+       y="-47"
+       x="-10"
+       height="7"
+       width="5" />
+    <rect
+       style="fill:url(#linearGradient3048);fill-opacity:1;stroke:none"
+       id="rect3700-8"
+       y="40"
+       x="10"
+       height="7.0000005"
+       width="28" />
+  </g>
+  <path
+     style="color:#000000;fill:url(#linearGradient872);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4519"
+     d="m 37.27664,9.000003 c -5.872872,0 -10.958994,3.445355 -13.480054,8.445966 -1.633992,-1.063624 -3.568278,-1.689161 -5.64761,-1.689161 -5.828346,0 -10.5531776,4.840068 -10.5531776,10.8108 0,0.94926 0.146552,1.867634 0.3710032,2.74487 C 3.7573592,32.220938 1.0000294,37.16892 1.0000294,42.783724 1.0000294,51.7675 8.0601156,59 16.829806,59 l 30.340456,0 c 8.7697,0 15.829766,-7.2325 15.829766,-16.216276 0,-7.173908 -4.520912,-13.22219 -10.800548,-15.371606 0.17038,-0.932366 0.247338,-1.88849 0.247338,-2.871524 0,-8.582895 -6.7919,-15.540591 -15.170178,-15.540591 z" />
+  <path
+     style="opacity:0.5;color:#000000;fill:none;stroke:#555761;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="rect4519-6"
+     d="m 37.361705,8.5000009 c -5.967584,0 -11.135741,3.5142491 -13.697471,8.6148881 -1.660347,-1.08491 -3.625819,-1.72295 -5.73869,-1.72295 -5.922366,0 -10.7234147,4.936872 -10.7234147,11.027018 0,0.968245 0.1489584,1.905001 0.3769975,2.799782 C 3.3018008,32.185343 0.5,37.232297 0.5,42.959417 0.5,52.122873 7.6739481,59.5 16.585104,59.5 l 30.82981,0 c 8.911137,0 16.085088,-7.377127 16.085088,-16.540583 0,-7.317398 -4.593842,-13.486644 -10.974739,-15.67905 0.173128,-0.951024 0.251315,-1.92627 0.251315,-2.92895 0,-8.754553 -6.901455,-15.8514161 -15.414873,-15.8514161 z" />
+  <path
+     style="opacity:0.15;color:#000000;fill:url(#radialGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9151"
+     d="m 37.362426,10.059821 c -5.55304,0 -10.279172,3.395405 -12.248484,8.198985 2.717276,2.088344 4.469994,5.36423 4.469994,9.036326 0,1.953992 -0.464652,3.799762 -1.337476,5.40784 2.3767,2.243966 5.574576,3.628492 9.115966,3.628492 7.31615,0 13.269194,-5.901034 13.269194,-13.153266 0,-7.252229 -5.953044,-13.118377 -13.269194,-13.118377 z" />
+  <path
+     style="opacity:0.15;color:#000000;fill:url(#radialGradient3030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.1760155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9151-6"
+     d="m 28.067733,26.592836 a 9.8762584,9.7899736 0 0 1 -19.7525168,0 9.8762584,9.7899736 0 1 1 19.7525168,0 z" />
+  <path
+     style="color:#000000;fill:none;stroke:url(#linearGradient3027-0);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="path3072"
+     d="m 37.375,9.5 c -5.578939,0 -10.440134,3.276679 -12.84375,8.0625 a 0.98720122,0.98720122 0 0 1 -1.40625,0.375 c -1.512137,-0.988066 -3.272043,-1.53125 -5.1875,-1.53125 -5.376804,0 -9.75,4.431502 -9.75,10 0,0.847124 0.1578364,1.710392 0.375,2.5625 a 0.98720122,0.98720122 0 0 1 -0.40625,1.0625 C 4.1437861,32.814155 1.5,37.565248 1.5,42.96875 1.5,51.616392 8.2266887,58.5 16.59375,58.5 l 30.8125,0 C 55.773291,58.5 62.5,51.616391 62.5,42.96875 c 0,-6.904803 -4.301757,-12.695512 -10.28125,-14.75 a 0.98720122,0.98720122 0 0 1 -0.65625,-1.125 c 0.160866,-0.883667 0.21875,-1.797772 0.21875,-2.75 C 51.78125,16.107322 45.340439,9.5 37.375,9.5 z" />
+</svg>
diff --git a/categories/64/gnome-power-manager.svg b/categories/64/gnome-power-manager.svg
deleted file mode 120000
index e7a4d9f1f..000000000
--- a/categories/64/gnome-power-manager.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-system-power.svg
\ No newline at end of file
diff --git a/categories/64/preferences-desktop-sound.svg b/categories/64/multimedia-volume-control.svg
similarity index 100%
rename from categories/64/preferences-desktop-sound.svg
rename to categories/64/multimedia-volume-control.svg
diff --git a/categories/64/preferences-desktop-online-accounts.svg b/categories/64/preferences-desktop-online-accounts.svg
deleted file mode 100644
index 69b214144..000000000
--- a/categories/64/preferences-desktop-online-accounts.svg
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg4082"
-   height="64"
-   width="64"
-   version="1.1">
-  <defs
-     id="defs4084">
-    <linearGradient
-       id="linearGradient870">
-      <stop
-         id="stop866"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop868"
-         offset="1"
-         style="stop-color:#d4d4d4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-5-1">
-      <stop
-         offset="0"
-         style="stop-color:#acb9bf;stop-opacity:1"
-         id="stop9167-7-12" />
-      <stop
-         offset="1"
-         style="stop-color:#acb9bf;stop-opacity:0"
-         id="stop9169-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9165-59">
-      <stop
-         offset="0"
-         style="stop-color:#b6c5cc;stop-opacity:1"
-         id="stop9167-6" />
-      <stop
-         offset="1"
-         style="stop-color:#e5f0f6;stop-opacity:0"
-         id="stop9169-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3688-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3690-8" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3692-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3702-4-7">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3704-7-8" />
-      <stop
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3710-0-0" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3706-7-2" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.89356594,0,0,0.88575922,-589.93894,-297.29202)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-5-1"
-       id="radialGradient3030"
-       fy="354.21619"
-       fx="681.32629"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <radialGradient
-       gradientTransform="matrix(1.1985434,0,0,1.1880722,-778.30956,-411.23382)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9165-59"
-       id="radialGradient3033"
-       fy="355.25784"
-       fx="680.60205"
-       r="12.052631"
-       cy="365.6579"
-       cx="680.5658" />
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-5"
-       id="radialGradient3044"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-5"
-       id="radialGradient3046"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-4-7"
-       id="linearGradient3048"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       gradientTransform="matrix(2,0,0,2,0,4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4017-9"
-       id="linearGradient3027-0"
-       y2="26.666777"
-       x2="20.153708"
-       y1="3.0216999"
-       x1="20.153708" />
-    <linearGradient
-       id="linearGradient4017-9">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4019-8" />
-      <stop
-         offset="0.49550432"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4021-9" />
-      <stop
-         offset="0.88038814"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4023-5" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4025-8" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="59.142857"
-       x2="40.405743"
-       y1="9.9542856"
-       x1="40.405743"
-       id="linearGradient872"
-       xlink:href="#linearGradient870" />
-  </defs>
-  <metadata
-     id="metadata4087">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="opacity:0.23999999"
-     id="g3712-3-7"
-     transform="matrix(1.4210393,0,0,1.1663938,-2.1052206,7.1794886)">
-    <rect
-       style="fill:url(#radialGradient3044);fill-opacity:1;stroke:none"
-       id="rect2801-5"
-       y="40"
-       x="38"
-       height="7"
-       width="5" />
-    <rect
-       style="fill:url(#radialGradient3046);fill-opacity:1;stroke:none"
-       id="rect3696-8"
-       transform="scale(-1,-1)"
-       y="-47"
-       x="-10"
-       height="7"
-       width="5" />
-    <rect
-       style="fill:url(#linearGradient3048);fill-opacity:1;stroke:none"
-       id="rect3700-8"
-       y="40"
-       x="10"
-       height="7.0000005"
-       width="28" />
-  </g>
-  <path
-     style="color:#000000;fill:url(#linearGradient872);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect4519"
-     d="m 37.27664,9.000003 c -5.872872,0 -10.958994,3.445355 -13.480054,8.445966 -1.633992,-1.063624 -3.568278,-1.689161 -5.64761,-1.689161 -5.828346,0 -10.5531776,4.840068 -10.5531776,10.8108 0,0.94926 0.146552,1.867634 0.3710032,2.74487 C 3.7573592,32.220938 1.0000294,37.16892 1.0000294,42.783724 1.0000294,51.7675 8.0601156,59 16.829806,59 l 30.340456,0 c 8.7697,0 15.829766,-7.2325 15.829766,-16.216276 0,-7.173908 -4.520912,-13.22219 -10.800548,-15.371606 0.17038,-0.932366 0.247338,-1.88849 0.247338,-2.871524 0,-8.582895 -6.7919,-15.540591 -15.170178,-15.540591 z" />
-  <path
-     style="opacity:0.5;color:#000000;fill:none;stroke:#555761;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="rect4519-6"
-     d="m 37.361705,8.5000009 c -5.967584,0 -11.135741,3.5142491 -13.697471,8.6148881 -1.660347,-1.08491 -3.625819,-1.72295 -5.73869,-1.72295 -5.922366,0 -10.7234147,4.936872 -10.7234147,11.027018 0,0.968245 0.1489584,1.905001 0.3769975,2.799782 C 3.3018008,32.185343 0.5,37.232297 0.5,42.959417 0.5,52.122873 7.6739481,59.5 16.585104,59.5 l 30.82981,0 c 8.911137,0 16.085088,-7.377127 16.085088,-16.540583 0,-7.317398 -4.593842,-13.486644 -10.974739,-15.67905 0.173128,-0.951024 0.251315,-1.92627 0.251315,-2.92895 0,-8.754553 -6.901455,-15.8514161 -15.414873,-15.8514161 z" />
-  <path
-     style="opacity:0.15;color:#000000;fill:url(#radialGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87944353;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path9151"
-     d="m 37.362426,10.059821 c -5.55304,0 -10.279172,3.395405 -12.248484,8.198985 2.717276,2.088344 4.469994,5.36423 4.469994,9.036326 0,1.953992 -0.464652,3.799762 -1.337476,5.40784 2.3767,2.243966 5.574576,3.628492 9.115966,3.628492 7.31615,0 13.269194,-5.901034 13.269194,-13.153266 0,-7.252229 -5.953044,-13.118377 -13.269194,-13.118377 z" />
-  <path
-     style="opacity:0.15;color:#000000;fill:url(#radialGradient3030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.1760155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path9151-6"
-     d="m 28.067733,26.592836 a 9.8762584,9.7899736 0 0 1 -19.7525168,0 9.8762584,9.7899736 0 1 1 19.7525168,0 z" />
-  <path
-     style="color:#000000;fill:none;stroke:url(#linearGradient3027-0);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="path3072"
-     d="m 37.375,9.5 c -5.578939,0 -10.440134,3.276679 -12.84375,8.0625 a 0.98720122,0.98720122 0 0 1 -1.40625,0.375 c -1.512137,-0.988066 -3.272043,-1.53125 -5.1875,-1.53125 -5.376804,0 -9.75,4.431502 -9.75,10 0,0.847124 0.1578364,1.710392 0.375,2.5625 a 0.98720122,0.98720122 0 0 1 -0.40625,1.0625 C 4.1437861,32.814155 1.5,37.565248 1.5,42.96875 1.5,51.616392 8.2266887,58.5 16.59375,58.5 l 30.8125,0 C 55.773291,58.5 62.5,51.616391 62.5,42.96875 c 0,-6.904803 -4.301757,-12.695512 -10.28125,-14.75 a 0.98720122,0.98720122 0 0 1 -0.65625,-1.125 c 0.160866,-0.883667 0.21875,-1.797772 0.21875,-2.75 C 51.78125,16.107322 45.340439,9.5 37.375,9.5 z" />
-</svg>
diff --git a/categories/meson.build b/categories/meson.build
new file mode 100644
index 000000000..632d726ad
--- /dev/null
+++ b/categories/meson.build
@@ -0,0 +1,33 @@
+sizes = ['16', '24', '32', '48', '64', '128', 'symbolic']
+
+links = [
+    # The first argument is the original icon name,
+    # the second is the link
+    ['applications-internet', 'preferences-desktop-online-accounts'],
+    ['multimedia-volume-control', 'preferences-desktop-sound'],
+    ['preferences-desktop-locale', 'config-language'], # gnome language selector
+    ['preferences-system', 'applications-system'],
+    ['preferences-system-power', 'gnome-power-manager']
+]
+
+foreach link : links
+    foreach size: sizes
+        origin = link[0]
+        destination = link[1]
+
+        if (size == 'symbolic')
+            origin += '-symbolic'
+            destination += '-symbolic'
+        endif
+
+        if (fs.exists(size / origin + '.svg'))
+            install_symlink(
+                destination  + '.svg',
+                install_dir: icon_dir / 'categories' / size,
+                pointing_to: origin + '.svg',
+            )
+        else
+            warning('@0@ does not exist'.format (size / origin))
+        endif
+    endforeach
+endforeach
diff --git a/categories/symbolic/applications-internet-symbolic.svg b/categories/symbolic/applications-internet-symbolic.svg
deleted file mode 120000
index 5305a9f08..000000000
--- a/categories/symbolic/applications-internet-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-online-accounts-symbolic.svg
\ No newline at end of file
diff --git a/categories/symbolic/applications-internet-symbolic.svg b/categories/symbolic/applications-internet-symbolic.svg
new file mode 100644
index 000000000..bb65b1432
--- /dev/null
+++ b/categories/symbolic/applications-internet-symbolic.svg
@@ -0,0 +1,6 @@
+<svg height='15.997' width='16.002' xmlns='http://www.w3.org/2000/svg'>
+    <g transform='translate(-991.998 -459.951)'>
+        <path color='#000' d='M1001.362 462.13c-1.516 0-2.828.887-3.479 2.174a2.667 2.667 0 0 0-1.457-.434c-1.505 0-2.724 1.245-2.724 2.782 0 .245.038.48.096.707a4.196 4.196 0 0 0-1.798 3.467c0 2.312 1.822 4.174 4.085 4.174h7.83c2.263 0 4.085-1.862 4.085-4.174 0-1.846-1.167-3.403-2.787-3.956.044-.24.064-.487.064-.74 0-2.209-1.753-4-3.915-4z' fill='#666' overflow='visible' style='marker:none'/>
+        
+    </g>
+</svg>
diff --git a/categories/symbolic/config-language-symbolic.svg b/categories/symbolic/config-language-symbolic.svg
deleted file mode 120000
index 753bd402c..000000000
--- a/categories/symbolic/config-language-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-desktop-locale-symbolic.svg
\ No newline at end of file
diff --git a/categories/symbolic/preferences-desktop-online-accounts-symbolic.svg b/categories/symbolic/preferences-desktop-online-accounts-symbolic.svg
deleted file mode 100644
index 6d2bf439e..000000000
--- a/categories/symbolic/preferences-desktop-online-accounts-symbolic.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="15.997"
-   width="16.002"
-   version="1.1"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <g
-     transform="translate(-991.998 -459.951)"
-     id="g1"
-     style="fill:#555761">
-    <path
-       color="#000"
-       d="M1001.362 462.13c-1.516 0-2.828.887-3.479 2.174a2.667 2.667 0 0 0-1.457-.434c-1.505 0-2.724 1.245-2.724 2.782 0 .245.038.48.096.707a4.196 4.196 0 0 0-1.798 3.467c0 2.312 1.822 4.174 4.085 4.174h7.83c2.263 0 4.085-1.862 4.085-4.174 0-1.846-1.167-3.403-2.787-3.956.044-.24.064-.487.064-.74 0-2.209-1.753-4-3.915-4z"
-       fill="#666"
-       overflow="visible"
-       style="marker:none;fill:#555761"
-       id="path1" />
-  </g>
-</svg>
diff --git a/meson.build b/meson.build
index 94aeca7c6..dd09f47e8 100644
--- a/meson.build
+++ b/meson.build
@@ -171,6 +171,7 @@ foreach directory_entry : directories
 endforeach
 
 subdir('apps')
+subdir('categories')
 subdir('cursors')
 subdir('mimes')
 
diff --git a/places/16/folder-remote.svg b/places/16/folder-remote.svg
index d2ed7a68d..f46f6cbbb 120000
--- a/places/16/folder-remote.svg
+++ b/places/16/folder-remote.svg
@@ -1 +1 @@
-../../categories/16/preferences-desktop-online-accounts.svg
\ No newline at end of file
+../../categories/16/applications-internet.svg
\ No newline at end of file
diff --git a/places/24/folder-remote.svg b/places/24/folder-remote.svg
index 19cb3fcc7..d2428700c 120000
--- a/places/24/folder-remote.svg
+++ b/places/24/folder-remote.svg
@@ -1 +1 @@
-../../categories/24/preferences-desktop-online-accounts.svg
\ No newline at end of file
+../../categories/24/applications-internet.svg
\ No newline at end of file
diff --git a/places/symbolic/folder-remote-symbolic.svg b/places/symbolic/folder-remote-symbolic.svg
deleted file mode 120000
index 930a3f91b..000000000
--- a/places/symbolic/folder-remote-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../categories/symbolic/preferences-desktop-online-accounts-symbolic.svg
\ No newline at end of file
diff --git a/places/symbolic/folder-remote.svg b/places/symbolic/folder-remote.svg
new file mode 120000
index 000000000..c8b77d876
--- /dev/null
+++ b/places/symbolic/folder-remote.svg
@@ -0,0 +1 @@
+../../categories/symbolic/applications-internet-symbolic.svg
\ No newline at end of file