diff --git a/Themes/_res/SettingsIcons.css b/Themes/_res/SettingsIcons.css
index 2f5310a837..17ef3edf99 100644
--- a/Themes/_res/SettingsIcons.css
+++ b/Themes/_res/SettingsIcons.css
@@ -4,55 +4,55 @@
 	--settingsicons-size: 18px;
 	--settingsicons-gap: 14px;
 	
-	--settingsicons-default: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/questionmark.svg);
-	--settingsicons-myaccount: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/account.svg);
-	--settingsicons-profile: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/profile.svg);
-	--settingsicons-privacy: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/privacy.svg);
-	--settingsicons-family: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/family.svg);
-	--settingsicons-apps: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/apps.svg);
-	--settingsicons-sessions: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/sessions.svg);
-	--settingsicons-connections: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/connections.svg);
-	--settingsicons-friendrequests: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/friendrequests.svg);
-	--settingsicons-nitro: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/nitro.svg);
-	--settingsicons-boosts: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/boosts.svg);
-	--settingsicons-subscriptions: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/subscriptions.svg);
-	--settingsicons-gifts: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/gift.svg);
-	--settingsicons-billing: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/billing.svg);
-	--settingsicons-appearance: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/appearance.svg);
-	--settingsicons-accessibility: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/accessibility.svg);
-	--settingsicons-voice: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/voice.svg);
-	--settingsicons-powermode: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/party.svg);
-	--settingsicons-text: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/text.svg);
-	--settingsicons-notifications: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/notifications.svg);
-	--settingsicons-keybinds: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/keybinds.svg);
-	--settingsicons-language: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/language.svg);
-	--settingsicons-windows: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/windows.svg);
-	--settingsicons-linux: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/linux.svg);
-	--settingsicons-streamermode: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/streamermode.svg);
-	--settingsicons-advanced: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/advanced.svg);
-	--settingsicons-activityprivacy: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/activityprivacy.svg);
-	--settingsicons-games: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/games.svg);
-	--settingsicons-overlay: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/overlay.svg);
-	--settingsicons-bd-settings: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/settings.svg);
-	--settingsicons-bd-updates: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/updates.svg);
-	--settingsicons-bd-customcss: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/custom.svg);
-	--settingsicons-bd-plugins: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/plugins.svg);
-	--settingsicons-bd-themes: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/themes.svg);
-	--settingsicons-vc-cloud: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/cloud.svg);
-	--settingsicons-vc-backup-restore: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/backuprestore.svg);
-	--settingsicons-bd-pluginrepo: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/pluginrepo.svg);
-	--settingsicons-bd-themerepo: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/themerepo.svg);
-	--settingsicons-changelog: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/changelog.svg);
-	--settingsicons-merchandise: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/merchandise.svg);
-	--settingsicons-hypesquad: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/hypesquad.svg);
-	--settingsicons-experiments: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/experiments.svg);
-	--settingsicons-developer: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/developer.svg);
-	--settingsicons-hotspots: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/hotspots.svg);
-	--settingsicons-dismissable: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/dismissable.svg);
-	--settingsicons-paymentmodals: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/paymentmodals.svg);
-	--settingsicons-textplayground: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/textplayground.svg);
-	--settingsicons-textcomponent: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/textcomponent.svg);
-	--settingsicons-logout: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/logout.svg);
+	--settingsicons-default: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/questionmark.png);
+	--settingsicons-myaccount: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/account.png);
+	--settingsicons-profile: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/profile.png);
+	--settingsicons-privacy: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/privacy.png);
+	--settingsicons-family: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/family.png);
+	--settingsicons-apps: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/apps.png);
+	--settingsicons-sessions: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/sessions.png);
+	--settingsicons-connections: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/connections.png);
+	--settingsicons-friendrequests: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/friendrequests.png);
+	--settingsicons-nitro: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/nitro.png);
+	--settingsicons-boosts: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/boosts.png);
+	--settingsicons-subscriptions: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/subscriptions.png);
+	--settingsicons-gifts: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/gift.png);
+	--settingsicons-billing: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/billing.png);
+	--settingsicons-appearance: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/appearance.png);
+	--settingsicons-accessibility: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/accessibility.png);
+	--settingsicons-voice: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/voice.png);
+	--settingsicons-powermode: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/party.png);
+	--settingsicons-text: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/text.png);
+	--settingsicons-notifications: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/notifications.png);
+	--settingsicons-keybinds: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/keybinds.png);
+	--settingsicons-language: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/language.png);
+	--settingsicons-windows: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/windows.png);
+	--settingsicons-linux: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/linux.png);
+	--settingsicons-streamermode: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/streamermode.png);
+	--settingsicons-advanced: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/advanced.png);
+	--settingsicons-activityprivacy: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/activityprivacy.png);
+	--settingsicons-games: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/games.png);
+	--settingsicons-overlay: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/overlay.png);
+	--settingsicons-bd-settings: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/settings.png);
+	--settingsicons-bd-updates: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/updates.png);
+	--settingsicons-bd-customcss: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/customcss.png);
+	--settingsicons-bd-plugins: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/plugins.png);
+	--settingsicons-bd-themes: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/themes.png);
+	--settingsicons-vc-cloud: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/cloud.png);
+	--settingsicons-vc-backup-restore: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/backuprestore.png);
+	--settingsicons-bd-pluginrepo: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/pluginrepo.png);
+	--settingsicons-bd-themerepo: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/themerepo.png);
+	--settingsicons-changelog: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/changelog.png);
+	--settingsicons-merchandise: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/merchandise.png);
+	--settingsicons-hypesquad: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/hypesquad.png);
+	--settingsicons-experiments: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/experiments.png);
+	--settingsicons-developer: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/developer.png);
+	--settingsicons-hotspots: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/hotspots.png);
+	--settingsicons-dismissable: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/dismissable.png);
+	--settingsicons-paymentmodals: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/paymentmodals.png);
+	--settingsicons-textplayground: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/textplayground.png);
+	--settingsicons-textcomponent: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/textcomponent.png);
+	--settingsicons-logout: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/logout.png);
 }
 
 body #app-mount .sidebarRegion__60457:has(.socialLinks_c1fc99) {
diff --git a/Themes/_res/svgs/settingsicons/accessibility.png b/Themes/_res/svgs/settingsicons/accessibility.png
new file mode 100644
index 0000000000..06dd79eb8c
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/accessibility.png differ
diff --git a/Themes/_res/svgs/settingsicons/accessibility.svg b/Themes/_res/svgs/settingsicons/accessibility.svg
deleted file mode 100644
index 92192c250c..0000000000
--- a/Themes/_res/svgs/settingsicons/accessibility.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 9.5443927,23.78336 C 7.3390791,23.325082 5.1855352,22.130768 3.4686229,20.413855 -1.1454095,15.799823 -1.1214916,8.1581718 3.5215155,3.5151646 6.9967857,0.03989448 12.472103,-0.98779577 16.845356,1.0143457 c 7.6975,3.5240329 9.56144,13.5187043 3.627742,19.4524023 -2.739318,2.739319 -7.196923,4.0921 -10.9287053,3.316612 z m 1.0313903,-5.711945 c 0.544679,-1.418773 1.184366,-2.579589 1.421524,-2.579589 0.237159,0 0.877522,1.160816 1.42303,2.579589 0.855818,2.225835 1.116142,2.579589 1.898303,2.579589 1.316247,0 1.321205,-0.881615 0.02405,-4.278498 -1.184111,-3.100877 -1.459323,-5.409974 -0.673672,-5.652298 0.253352,-0.07815 1.206879,-0.363143 2.118948,-0.633331 1.254637,-0.371671 1.687025,-0.6934883 1.776282,-1.3220546 0.174727,-1.2304663 -0.769167,-1.3944519 -3.848225,-0.6685635 -2.582864,0.6089121 -2.85458,0.6089121 -5.4374437,0 C 6.1995235,7.3703705 5.2556291,7.5343561 5.4303564,8.7648224 5.5196134,9.3933887 5.9520001,9.715206 7.206638,10.086877 c 0.9120688,0.270188 1.8655954,0.555188 2.1189478,0.633331 0.7814422,0.241026 0.5125407,2.563075 -0.6448971,5.568895 -1.473107,3.8256 -1.4415885,4.701501 0.1608329,4.469574 0.5460359,-0.07903 1.00737,-0.793876 1.7342574,-2.687262 z M 13.534469,6.9589199 C 14.373577,6.1995375 14.403956,4.710586 13.598503,3.8205663 12.333077,2.4222869 9.7862341,3.406434 9.7862341,5.293698 c 0,1.9711765 2.2873019,2.9873515 3.7482389,1.6652219 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/account.png b/Themes/_res/svgs/settingsicons/account.png
new file mode 100644
index 0000000000..629ead9f53
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/account.png differ
diff --git a/Themes/_res/svgs/settingsicons/account.svg b/Themes/_res/svgs/settingsicons/account.svg
deleted file mode 100644
index 8c4f531f7f..0000000000
--- a/Themes/_res/svgs/settingsicons/account.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 11.48228,0.00259146 c -1.487848,0.0517 -2.962478,0.381425 -4.329697,1.00735904 -0.5194472,0.237811 -1.0103789,0.507217 -1.4761148,0.800702 -0.039927,0.02454 -0.077711,0.05274 -0.117369,0.07777 -0.1599679,0.103375 -0.3189644,0.207339 -0.4723567,0.316825 -0.5552073,0.3884757 -1.0834048,0.8205842 -1.569002,1.3061813 -2.1340314,2.1340313 -3.28923778,4.901755 -3.47067018,7.7175602 -0.014138,0.219417 -0.024372,0.439122 -0.026642,0.658851 -2.506e-4,0.01802 -0.00127,0.03598 -0.00144,0.05401 -0.00122,0.206933 0.00293,0.413994 0.012241,0.620688 0.00582,0.137617 0.017504,0.275093 0.028082,0.412592 0.005,0.06313 0.00842,0.126324 0.014401,0.189375 0.014552,0.156551 0.033942,0.312616 0.054724,0.468757 0.00526,0.03914 0.010203,0.07827 0.015841,0.117369 0.023611,0.164814 0.050031,0.329156 0.080646,0.493238 0.00441,0.0236 0.00985,0.04699 0.014401,0.07057 0.093799,0.486281 0.2182248,0.968124 0.3744292,1.443712 0.025521,0.07831 0.049875,0.156901 0.077046,0.234739 0.03412,0.09694 0.071235,0.193166 0.1080084,0.289462 0.047242,0.124798 0.09678,0.248883 0.1483315,0.372269 0.02805,0.06654 0.055616,0.133284 0.084967,0.199456 0.5703652,1.297567 1.3794275,2.509915 2.4330691,3.563557 1.7176377,1.717637 3.8717475,2.91211 6.0779925,3.370582 0.793655,0.164926 1.621037,0.228485 2.456832,0.208096 0.835794,0.02039 1.663176,-0.04317 2.45683,-0.208096 2.206246,-0.458472 4.360356,-1.652945 6.077993,-3.370582 1.053642,-1.053642 1.862704,-2.26599 2.43307,-3.563557 0.02935,-0.06617 0.05692,-0.132921 0.08497,-0.199456 0.05155,-0.123386 0.10109,-0.247471 0.148331,-0.372269 0.03678,-0.0963 0.07389,-0.192527 0.108009,-0.289462 0.02717,-0.07784 0.05152,-0.156434 0.07705,-0.234739 0.156204,-0.475588 0.28063,-0.957431 0.374429,-1.443712 0.0045,-0.02358 0.01,-0.04697 0.0144,-0.07057 0.03061,-0.164082 0.05703,-0.328424 0.08065,-0.493238 0.0056,-0.03909 0.01059,-0.07823 0.01584,-0.117369 0.02078,-0.156141 0.04017,-0.312206 0.05472,-0.468757 0.006,-0.06305 0.0094,-0.126244 0.0144,-0.189375 0.01058,-0.137499 0.02226,-0.274975 0.02808,-0.412592 0.0093,-0.206694 0.01346,-0.413755 0.01224,-0.620688 -1.7e-4,-0.01803 -0.0012,-0.03598 -0.0014,-0.05401 -0.0023,-0.219729 -0.01251,-0.439434 -0.02664,-0.658851 C 23.771543,8.4131838 22.616337,5.6454601 20.482305,3.5114288 19.996708,3.0258317 19.46851,2.5937232 18.913303,2.2052475 c -0.153392,-0.109486 -0.312389,-0.21345 -0.472357,-0.316825 -0.03966,-0.02502 -0.07744,-0.05322 -0.117369,-0.07777 -0.465735,-0.293485 -0.956667,-0.562891 -1.476114,-0.800702 -1.525645,-0.69846304 -3.185234,-1.01991704 -4.847418,-1.00591904 -0.172604,-0.0014 -0.345317,-0.0074 -0.51772,-0.0014 z m 0.51484,3.10056194 c 0.11465,0 0.229702,0.00566 0.344187,0.01728 0.801391,0.081371 1.594346,0.4471221 2.3229,1.0980855 1.41282,1.2772247 1.795895,3.886078 0,5.5905152 -0.788912,0.7048929 -1.400153,1.0000759 -2.274656,1.0628029 -0.123098,0.0088 -0.25192,0.01284 -0.386671,0.01296 -0.13695,0 -0.267501,-0.004 -0.39243,-0.01296 -0.874504,-0.06273 -1.485744,-0.35791 -2.274657,-1.0628029 -1.795894,-1.7044372 -1.412819,-4.3132905 0,-5.5905152 0.728554,-0.6509634 1.521509,-1.0167148 2.322901,-1.0980855 0.112813,-0.011285 0.225455,-0.01728 0.338426,-0.01728 z m 0,8.8876506 c 0.204905,0 0.408804,0.0058 0.611328,0.01728 3.037855,0.172507 5.782255,1.626351 7.45546,3.97615 l 0.744538,1.045521 -1.14849,1.392588 -1.144169,1.388268 -0.502599,-0.958394 c -0.308839,-0.589438 -0.535202,-0.891322 -0.667492,-0.91447 -0.171424,-0.03965 -0.190287,0.373145 -0.03024,1.226256 0.01198,0.06386 0.01946,0.114029 0.02952,0.172093 0.08522,0.557077 0.04534,0.944757 -0.240499,1.260098 -0.168425,0.145024 -0.408215,0.286665 -0.761819,0.470197 -0.789361,0.409704 -2.63958,0.688819 -4.342659,0.758219 C 10.296922,21.75521 8.446703,21.476095 7.657342,21.066391 7.303739,20.882859 7.063949,20.741218 6.895523,20.596194 6.6096804,20.280853 6.5698052,19.893173 6.6550244,19.336096 c 0.010061,-0.05806 0.017541,-0.108229 0.029523,-0.172093 0.1600446,-0.853111 0.1411824,-1.265904 -0.030242,-1.226256 -0.1322901,0.02315 -0.3586531,0.325032 -0.667492,0.914472 L 5.4842145,19.810613 4.3400454,18.422345 3.1915561,17.029757 3.936094,15.984235 c 1.6732043,-2.349799 4.417605,-3.803642 7.45546,-3.976149 0.200641,-0.01129 0.402591,-0.01728 0.605567,-0.01728 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/activityprivacy.png b/Themes/_res/svgs/settingsicons/activityprivacy.png
new file mode 100644
index 0000000000..0a8cc25868
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/activityprivacy.png differ
diff --git a/Themes/_res/svgs/settingsicons/activityprivacy.svg b/Themes/_res/svgs/settingsicons/activityprivacy.svg
deleted file mode 100644
index 624e6e5b10..0000000000
--- a/Themes/_res/svgs/settingsicons/activityprivacy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12 0 C 10.595784 2.0724142e-15 3.0467119 4.5407379 2.3984375 5.7753906 C 1.4408295 7.5991738 2.0792289 13.081387 3.6308594 16.367188 C 4.7933742 18.828977 6.7928731 21.127836 9.1523438 22.716797 C 10.200074 23.42238 11.463209 24 11.960938 24 C 14.199991 24 18.679775 19.942712 20.353516 16.398438 C 21.919557 13.082227 22.561539 7.6074058 21.599609 5.7753906 C 20.951335 4.5407379 13.404216 0 12 0 z M 10.199219 6 L 13.800781 6 L 13.800781 9.3007812 L 12 11.099609 L 10.199219 9.3007812 L 10.199219 6 z M 6 10.199219 L 9.3007812 10.199219 L 11.099609 12 L 9.3007812 13.800781 L 6 13.800781 L 6 10.199219 z M 14.699219 10.199219 L 18 10.199219 L 18 13.800781 L 14.699219 13.800781 L 12.900391 12 L 14.699219 10.199219 z M 12 12.900391 L 13.800781 14.699219 L 13.800781 18 L 10.199219 18 L 10.199219 14.699219 L 12 12.900391 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/advanced.png b/Themes/_res/svgs/settingsicons/advanced.png
new file mode 100644
index 0000000000..6826f2a556
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/advanced.png differ
diff --git a/Themes/_res/svgs/settingsicons/advanced.svg b/Themes/_res/svgs/settingsicons/advanced.svg
deleted file mode 100644
index f9ba764eca..0000000000
--- a/Themes/_res/svgs/settingsicons/advanced.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 2.9374744,8.9791825 c -0.7731007,0 -1.5461601,0.29488 -2.1360139,0.88474 -1.17970773,1.1796995 -1.17970773,3.0924095 0,4.2721195 1.1797076,1.1797 3.0924123,1.1797 4.2721201,0 1.1797076,-1.17971 1.1797076,-3.09242 0,-4.2721195 -0.5898539,-0.58986 -1.3630055,-0.88474 -2.1361062,-0.88474 z m 9.0625256,0 c -0.773101,0 -1.54616,0.29488 -2.1360142,0.88474 -1.1797077,1.1796995 -1.1797077,3.0924095 0,4.2721195 1.1797082,1.1797 3.0924122,1.1797 4.2721202,0 1.179708,-1.17971 1.179708,-3.09242 0,-4.2721195 C 13.546252,9.2740625 12.7731,8.9791825 12,8.9791825 Z m 9.062525,0 c -0.7731,0 -1.546252,0.29488 -2.136106,0.88474 -1.179707,1.1796995 -1.179707,3.0924095 0,4.2721195 1.179708,1.1797 3.092412,1.1797 4.272121,0 1.179707,-1.17971 1.179707,-3.09242 0,-4.2721195 -0.589854,-0.58986 -1.362914,-0.88474 -2.136015,-0.88474 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/analytics.svg b/Themes/_res/svgs/settingsicons/analytics.svg
deleted file mode 100644
index 8f55992b40..0000000000
--- a/Themes/_res/svgs/settingsicons/analytics.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 2.4003906 0 A 2.4 2.4 0 0 0 0 2.4003906 L 0 16.800781 A 2.4 2.4 0 0 0 2.4003906 19.199219 L 4.8007812 19.199219 L 4.8007812 24 L 11.199219 19.199219 L 21.599609 19.199219 A 2.4 2.4 0 0 0 24 16.800781 L 24 2.4003906 A 2.4 2.4 0 0 0 21.599609 0 L 2.4003906 0 z M 2.4003906 2.4003906 L 21.599609 2.4003906 L 21.599609 16.800781 L 10.400391 16.800781 L 7.1992188 19.199219 L 7.1992188 16.800781 L 2.4003906 16.800781 L 2.4003906 2.4003906 z M 6 4.8007812 L 6 14.400391 L 8.4003906 14.400391 L 8.4003906 4.8007812 L 6 4.8007812 z M 15.599609 7.1992188 L 15.599609 14.400391 L 18 14.400391 L 18 7.1992188 L 15.599609 7.1992188 z M 10.800781 9.5996094 L 10.800781 14.400391 L 13.199219 14.400391 L 13.199219 9.5996094 L 10.800781 9.5996094 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/appearance.png b/Themes/_res/svgs/settingsicons/appearance.png
new file mode 100644
index 0000000000..90e8727821
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/appearance.png differ
diff --git a/Themes/_res/svgs/settingsicons/appearance.svg b/Themes/_res/svgs/settingsicons/appearance.svg
deleted file mode 100644
index 9f0f226037..0000000000
--- a/Themes/_res/svgs/settingsicons/appearance.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.964844 0.12304688 C 7.1183102 0.12304688 3.3399746 2.479449 1.1933594 6.8398438 C 0.15538843 8.948263 -0.0070999668 9.6554423 0 12.060547 C 0.014075949 16.843487 2.3447358 20.669688 6.515625 22.753906 C 7.7519475 23.371706 8.9733351 23.876953 9.2285156 23.876953 C 10.897771 23.876953 11.964844 22.205546 11.964844 19.591797 C 11.964844 16.851436 12.501492 16.502653 16.722656 16.501953 C 20.899043 16.501276 22.487757 15.896607 23.503906 13.921875 C 24.388832 12.202156 24.084433 9.656839 22.636719 6.671875 C 20.610027 2.4931528 16.747596 0.12304688 11.964844 0.12304688 z M 11.941406 1.7460938 A 2 2 0 0 1 13.941406 3.7460938 A 2 2 0 0 1 11.941406 5.7460938 A 2 2 0 0 1 9.9414062 3.7460938 A 2 2 0 0 1 11.941406 1.7460938 z M 6.3515625 5.1699219 A 2 2 0 0 1 8.3515625 7.1699219 A 2 2 0 0 1 6.3515625 9.1699219 A 2 2 0 0 1 4.3515625 7.1699219 A 2 2 0 0 1 6.3515625 5.1699219 z M 17.619141 5.1992188 A 2 2 0 0 1 19.619141 7.1992188 A 2 2 0 0 1 17.619141 9.1992188 A 2 2 0 0 1 15.619141 7.1992188 A 2 2 0 0 1 17.619141 5.1992188 z M 3.6582031 11.169922 A 2 2 0 0 1 5.6582031 13.169922 A 2 2 0 0 1 3.6582031 15.169922 A 2 2 0 0 1 1.6582031 13.169922 A 2 2 0 0 1 3.6582031 11.169922 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/apps.png b/Themes/_res/svgs/settingsicons/apps.png
new file mode 100644
index 0000000000..7608c4e8c8
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/apps.png differ
diff --git a/Themes/_res/svgs/settingsicons/apps.svg b/Themes/_res/svgs/settingsicons/apps.svg
deleted file mode 100644
index f9a050d97c..0000000000
--- a/Themes/_res/svgs/settingsicons/apps.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 0.29108426,18.427495 C -0.91743381,13.75936 3.3910437,8.8546523 8.1849139,10.07892 L 9.630214,10.448023 14.66298,5.4645651 c 5.278751,-5.22703273 6.029236,-5.65087973 7.46446,-4.2156557 0.924934,0.924934 0.974329,1.837713 0.162194,2.997198 -0.572331,0.8171172 -0.540689,0.9385679 0.575853,2.2102383 1.373269,1.5640664 1.48587,2.5500923 0.413658,3.6223043 -1.077708,1.077708 -2.059356,0.958628 -3.656336,-0.4435387 -1.263377,-1.1092592 -1.43129,-1.1596946 -1.992504,-0.5984806 -0.561214,0.5612145 -0.510779,0.7291274 0.59848,1.9925043 1.402167,1.59698 1.521248,2.578628 0.443539,3.656336 -1.077243,1.077244 -2.059262,0.958712 -3.653416,-0.440974 -1.67322,-1.469107 -2.262716,-1.121779 -1.679714,0.989679 0.885843,3.208258 -1.246827,6.673227 -4.3048284,7.754275 C 7.0590927,23.686739 4.6691109,23.338607 3.1810941,22.417423 1.6930773,21.496239 0.89765645,20.770497 0.29108426,18.427495 Z M 8.3727231,18.273037 C 9.8293949,16.954768 8.8041496,14.30157 6.8380736,14.30157 c -2.0534932,0 -3.1121034,2.382819 -1.7347618,3.904764 0.791094,0.874149 2.3422249,0.905796 3.2694113,0.0667 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/audit.svg b/Themes/_res/svgs/settingsicons/audit.svg
deleted file mode 100644
index 6a01919615..0000000000
--- a/Themes/_res/svgs/settingsicons/audit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12.018182,0 A 3.2727272,3.2727272 0 0 0 8.936683,2.1818182 H 4.109091 C 3.0514546,2.1818182 2.2,3.0332728 2.2,4.090909 v 18 C 2.2,23.148545 3.0514546,24 4.109091,24 h 15.818182 c 1.057636,0 1.909091,-0.851455 1.909091,-1.909091 v -18 c 0,-1.0576362 -0.851455,-1.9090908 -1.909091,-1.9090908 H 15.09968 A 3.2727272,3.2727272 0 0 0 12.018182,0 Z m 0,2.1818182 a 1.0909091,1.0909091 0 0 1 1.090909,1.090909 1.0909091,1.0909091 0 0 1 -1.090909,1.0909092 1.0909091,1.0909091 0 0 1 -1.090909,-1.0909092 1.0909091,1.0909091 0 0 1 1.090909,-1.090909 z m -7.090909,6 H 15.836364 V 10.909091 H 4.927273 Z m 0,4.0909088 H 15.836364 V 15 H 4.927273 Z m 0,4.090909 h 8.181818 v 2.727273 H 4.927273 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/automod.svg b/Themes/_res/svgs/settingsicons/automod.svg
deleted file mode 100644
index ac51461158..0000000000
--- a/Themes/_res/svgs/settingsicons/automod.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12 0 L 2.1816406 4.3632812 L 2.1816406 10.908203 C 2.1816406 16.962748 6.3709091 22.625455 12 24 C 17.629091 22.625455 21.818359 16.962748 21.818359 10.908203 L 21.818359 4.3632812 L 12 0 z M 16.550781 7.5507812 L 18.248047 9.2480469 L 10.800781 16.697266 L 6.3515625 12.248047 L 8.0488281 10.550781 L 10.800781 13.302734 L 16.550781 7.5507812 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/automodmessage.svg b/Themes/_res/svgs/settingsicons/automodmessage.svg
deleted file mode 100644
index c145529453..0000000000
--- a/Themes/_res/svgs/settingsicons/automodmessage.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 21.6,0 H 2.4 C 1.0764,0 0,1.0764 0,2.4 V 24 l 4.8,-4.8 h 16.8 c 1.3236,0 2.4,-1.0764 2.4,-2.4 V 2.4 C 24,1.0764 22.9236,0 21.6,0 Z M 10.8,14.2968 6.3516,9.8484 8.0484,8.1516 10.8,10.9032 16.5516,5.1516 18.2484,6.8484 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/backuprestore.svg b/Themes/_res/svgs/settingsicons/backuprestore.svg
deleted file mode 100644
index 0e06238a8b..0000000000
--- a/Themes/_res/svgs/settingsicons/backuprestore.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.974609,2.0527345 7.7148436,6.279297 A 0.66666667,0.66666667 0 0 0 8.6406248,7.2265626 L 11.306641,4.6132814 v 7.9999996 a 0.66699219,0.66699219 0 0 0 1.333984,0 V 4.6132814 l 2.666016,2.6328125 A 0.66793521,0.66793521 0 1 0 16.228516,6.279297 Z M 4.7128904,8.6132814 A 1.28,1.28 0 0 0 3.4472654,9.4941408 C 1.907267,13.734136 1.4941924,14.899297 1.3808592,15.279297 H 22.619141 c -0.106667,-0.38 -0.525263,-1.538624 -2.058594,-5.7519531 A 1.2933333,1.2933333 0 0 0 19.287109,8.6132814 H 14 v 3.9999996 a 2.0000001,2.0000001 0 0 1 -4.0000002,0 V 8.6132814 Z M 1.3339842,16.613281 v 4 a 1.3333333,1.3333333 0 0 0 1.3320312,1.333984 H 21.333984 a 1.3333333,1.3333333 0 0 0 1.332032,-1.333984 v -4 z m 15.9999998,2 H 20 v 1.333984 h -2.666016 z" />
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/backupsestore.png b/Themes/_res/svgs/settingsicons/backupsestore.png
new file mode 100644
index 0000000000..22cab07fa1
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/backupsestore.png differ
diff --git a/Themes/_res/svgs/settingsicons/bans.svg b/Themes/_res/svgs/settingsicons/bans.svg
deleted file mode 100644
index dae672b086..0000000000
--- a/Themes/_res/svgs/settingsicons/bans.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 19.889203,2.4815697 c -0.451297,-0.451296 -1.177932,-0.451296 -1.629228,0 l -0.814614,0.8146138 3.258455,3.2584552 0.814614,-0.8146138 c 0.451296,-0.4512961 0.451296,-1.1779315 0,-1.6292276 z M 13.046128,0.5261785 c -0.722073,-0.7220737 -1.908062,-0.6980646 -2.660222,0.054095 L 4.9540867,6.0120928 C 4.2019261,6.7642535 4.1779174,7.9502426 4.899991,8.6723163 L 15.327684,19.10001 c 0.722074,0.722073 1.908063,0.698064 2.660224,-0.0541 l 5.431818,-5.431819 c 0.752161,-0.75216 0.776169,-1.93815 0.0541,-2.660223 z M 7.669996,13.071549 0.338472,20.403073 c -0.451296,0.451296 -0.451296,1.177931 0,1.629228 l 1.6292276,1.629227 c 0.451296,0.451296 1.1779315,0.451296 1.6292276,0 l 7.3315238,-7.331524 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/betterdiscord.svg b/Themes/_res/svgs/settingsicons/betterdiscord.svg
deleted file mode 100644
index a7e59a3e4c..0000000000
--- a/Themes/_res/svgs/settingsicons/betterdiscord.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 15.46875 0.859375 C 15.772992 1.030675 16.059675 1.2229406 16.326172 1.4316406 C 17.134815 2.0640406 17.768634 2.8677594 18.208984 3.8183594 C 18.665347 4.8050594 18.913286 5.9512625 18.945312 7.2265625 L 18.945312 7.2421875 L 18.945312 7.2597656 L 18.945312 16.753906 L 18.945312 16.769531 L 18.945312 16.785156 C 18.914433 18.060356 18.666491 19.206759 18.208984 20.193359 C 17.768634 21.144059 17.135961 21.947578 16.326172 22.580078 C 16.06768 22.782278 15.790044 22.967366 15.496094 23.134766 L 16.326172 23.134766 C 20.285895 23.158766 24 20.930212 24 15.820312 L 24 8.3535156 C 24.021728 3.1431156 20.305428 0.86132812 16.345703 0.86132812 L 15.46875 0.859375 z M 0 0.8671875 L 0 10.064453 L 4.4492188 15.191406 L 4.4492188 5.4394531 L 8.4394531 5.4394531 C 11.753741 5.4394531 11.753741 9.8828125 8.4394531 9.8828125 L 7.0234375 9.8828125 L 7.0234375 14.126953 L 8.4394531 14.126953 C 11.753741 14.126953 11.753741 18.568359 8.4394531 18.568359 L 0 18.568359 L 0 23.138672 L 8.3457031 23.138672 C 12.647637 23.138672 15.987145 21.3021 16.105469 16.75 C 16.105469 14.6555 15.567688 13.090453 14.621094 12.001953 C 15.567688 10.914853 16.105469 9.3502594 16.105469 7.2558594 C 15.988351 2.7036594 12.648845 0.8671875 8.3457031 0.8671875 L 0 0.8671875 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/billing.png b/Themes/_res/svgs/settingsicons/billing.png
new file mode 100644
index 0000000000..86a72eed1a
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/billing.png differ
diff --git a/Themes/_res/svgs/settingsicons/billing.svg b/Themes/_res/svgs/settingsicons/billing.svg
deleted file mode 100644
index 950a1836f1..0000000000
--- a/Themes/_res/svgs/settingsicons/billing.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="black"><path d="M 1.8749999,3.7500001 C 0.83625005,3.7500001 0,4.5862501 0,5.6250005 V 18.375 c 0,1.03875 0.83625005,1.875 1.8749999,1.875 H 22.125 C 23.16375,20.25 24,19.41375 24,18.375 V 5.6250005 C 24,4.5862501 23.16375,3.7500001 22.125,3.7500001 Z m 7.059778,4.4701542 a 3.75,3.75 0 0 1 3.0540161,1.5819579 3.75,3.75 0 0 1 3.048047,-1.5708617 3.75,3.75 0 0 1 3.749999,3.7499995 3.75,3.75 0 0 1 -3.749999,3.75 3.75,3.75 0 0 1 -3.054016,-1.581921 3.75,3.75 0 0 1 -3.0480471,1.570825 3.75,3.75 0 0 1 -3.75,-3.75 3.75,3.75 0 0 1 3.75,-3.7499997 z"/><path opacity="0.6" d="m 8.9347779,8.2201543 a 3.75,3.75 0 0 0 -3.75,3.7499997 3.75,3.75 0 0 0 3.75,3.75 A 3.75,3.75 0 0 0 11.982825,14.149292 3.75,3.75 0 0 1 11.286841,11.98125 3.75,3.75 0 0 1 11.988794,9.8021122 3.75,3.75 0 0 0 8.9347779,8.2201543 Z"/><path opacity="0.4" d="m 15.036842,8.2312505 a 3.75,3.75 0 0 0 -3.048048,1.5708617 3.75,3.75 0 0 1 0.695984,2.1680418 3.75,3.75 0 0 1 -0.701953,2.179138 3.75,3.75 0 0 0 3.054017,1.581958 3.75,3.75 0 0 0 3.749998,-3.749999 3.75,3.75 0 0 0 -3.749998,-3.7500005 z"/><path opacity="0.2" d="m 11.988794,9.8021122 c -0.455415,0.6354498 -0.70084,1.3973468 -0.701953,2.1791378 0.0017,0.77735 0.244886,1.534966 0.695984,2.168042 0.455415,-0.63545 0.70084,-1.397346 0.701953,-2.179138 -0.0017,-0.777349 -0.244886,-1.534966 -0.695984,-2.1680418 z"/></g></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/boosts.png b/Themes/_res/svgs/settingsicons/boosts.png
new file mode 100644
index 0000000000..a5cd800b3c
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/boosts.png differ
diff --git a/Themes/_res/svgs/settingsicons/boosts.svg b/Themes/_res/svgs/settingsicons/boosts.svg
deleted file mode 100644
index b825d9031a..0000000000
--- a/Themes/_res/svgs/settingsicons/boosts.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 8.4597448,21.445261 C 6.700976,20.038836 5.0647842,18.443064 4.8237543,17.899099 4.2344514,16.569121 4.2344514,7.4308828 4.8237543,6.1009058 5.2170982,5.2131848 11.283337,-0.0058742 11.914979,4.8030797e-6 12.91878,0.0093048 18.823742,5.0718368 19.246978,6.2859338 c 0.494993,1.419937 0.494993,10.0082002 0,11.4281362 -0.423236,1.214097 -6.328198,6.276586 -7.331999,6.285929 -0.141613,0.0013 -1.696469,-1.148314 -3.4552342,-2.554738 z m 6.2891292,-1.856299 2.697361,-2.231179 V 12.000002 6.6422218 l -2.727817,-2.256372 -2.727816,-2.256372 -2.727817,2.256372 -2.7278167,2.256372 v 5.3558362 5.355835 l 2.6368895,2.21593 c 1.4502892,1.218761 2.6915112,2.223667 2.7582732,2.233125 0.06676,0.0095 1.335194,-0.986837 2.818743,-2.213986 z M 10.247785,16.623523 8.7172216,15.063994 V 11.971035 8.8780758 l 1.6366904,-1.606289 1.63669,-1.60629 1.63669,1.60629 1.63669,1.606289 v 3.0929592 3.092959 l -1.530564,1.559529 c -0.841808,0.857742 -1.626077,1.55953 -1.742816,1.55953 -0.11674,0 -0.901009,-0.701788 -1.742817,-1.55953 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/changelog.png b/Themes/_res/svgs/settingsicons/changelog.png
new file mode 100644
index 0000000000..51c5482c6a
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/changelog.png differ
diff --git a/Themes/_res/svgs/settingsicons/changelog.svg b/Themes/_res/svgs/settingsicons/changelog.svg
deleted file mode 100644
index 52ecd16cec..0000000000
--- a/Themes/_res/svgs/settingsicons/changelog.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12.000979,-8.8676194e-5 C 5.3736798,-8.8676194e-5 -5.1193583e-8,5.373591 -5.1193583e-8,12.000891 -5.1193583e-8,18.62813 5.3736798,23.999737 12.000979,23.999721 c 0.662738,0 1.198809,-0.538217 1.198809,-1.200957 0,-0.66274 -0.536071,-1.198809 -1.198809,-1.198809 -5.3018386,0 -9.601213,-4.297201 -9.601213,-9.599064 0,-5.3018395 4.2993744,-9.6012136 9.601213,-9.6012136 5.301878,0 9.599064,4.2993741 9.599064,9.6012136 0,0.662738 0.53607,1.198809 1.198809,1.198809 0.66274,0 1.200957,-0.536071 1.200957,-1.198809 0,-6.6273 -5.371591,-12.000979676194 -11.99883,-12.000979676194 z m 0,3.600723376194 c -0.66274,0 -1.200958,0.536106 -1.200958,1.1988089 v 7.2014474 c 0,0.318261 0.127209,0.621488 0.352338,0.84647 l 3.598575,3.600724 c 0.468593,0.468593 1.228647,0.468593 1.697239,0 0.468593,-0.468592 0.468593,-1.228647 0,-1.697239 L 13.199788,11.502461 V 4.7994436 c 0,-0.6627395 -0.53607,-1.1988089 -1.198809,-1.1988089 z"/><path fill="black" d="M 11.999021,24 C 18.62632,24 24,18.626321 24,11.999021 24,5.3717817 18.62632,1.746e-4 11.999021,1.906e-4 c -0.662738,0 -1.198809,0.538217 -1.198809,1.200957 0,0.66274 0.536071,1.198809 1.198809,1.198809 5.301839,0 9.601213,4.2972011 9.601213,9.5990644 0,5.301839 -4.299374,9.601213 -9.601213,9.601213 -5.3018784,0 -9.5990644,-4.299374 -9.5990644,-9.601213 0,-0.662738 -0.53607,-1.198809 -1.198809,-1.198809 -0.66273999,0 -1.20095699,0.536071 -1.20095699,1.198809 C 1.9061e-4,18.626321 5.3717816,24 11.999021,24 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/cloud.png b/Themes/_res/svgs/settingsicons/cloud.png
new file mode 100644
index 0000000000..0df0b9604a
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/cloud.png differ
diff --git a/Themes/_res/svgs/settingsicons/cloud.svg b/Themes/_res/svgs/settingsicons/cloud.svg
deleted file mode 100644
index f0a4dc8835..0000000000
--- a/Themes/_res/svgs/settingsicons/cloud.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 19.568492,18.313499 c 0,0 3.875366,0.0042 4.419462,-3.787609 0.25906,-4.146361 -3.746187,-4.9635571 -3.746187,-4.9635571 0,0 0.455636,-6.1381027 -5.167857,-6.8380555 -4.819635,-0.4921434 -6.2862369,3.9869933 -6.2862369,3.9869933 0,0 -1.4518581,-1.3956934 -3.4211338,-0.2555495 -1.7628703,1.0881917 -1.4511561,3.0806347 -1.4511561,3.0806347 0,0 -3.91538331301006,0.7610321 -3.91538331301006,4.7515361 C 0.08775727,18.273481 4.2523716,18.313499 4.2523716,18.313499"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/community.svg b/Themes/_res/svgs/settingsicons/community.svg
deleted file mode 100644
index 7208036b9f..0000000000
--- a/Themes/_res/svgs/settingsicons/community.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 8.1,0 0,6.6 V 24 H 3 V 21.832031 21.313477 19.044141 C 3,16.886332 4.179753,15.13887 5.677149,15.012305 5.734353,15.004789 5.791914,15 5.85,15 c 0.058086,0 0.115647,0.0048 0.172852,0.0123 C 7.520247,15.13887 8.7,16.886332 8.7,19.044141 V 21.313477 21.832031 24 h 2.7 v -0.9 -7.5 l 4.8,-2.594532 V 6.6 L 13.8,4.6447265 V 0 h -2.1 v 2.9332032 z m -6,7.8 H 6.6 V 12 H 2.1 Z m 7.2,0 h 4.5 V 12 H 9.3 Z m 9.15,5.7 -5.55,3 V 24 H 24 v -7.5 z m -2.25,3.909961 h 4.5 v 4.2 h -4.5 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/connections.png b/Themes/_res/svgs/settingsicons/connections.png
new file mode 100644
index 0000000000..95a4207f49
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/connections.png differ
diff --git a/Themes/_res/svgs/settingsicons/connections.svg b/Themes/_res/svgs/settingsicons/connections.svg
deleted file mode 100644
index 854df55ace..0000000000
--- a/Themes/_res/svgs/settingsicons/connections.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 5.3138467,21.720706 C 3.9978873,20.991325 3.4003515,19.668623 3.3850304,17.451088 3.3724879,15.635708 3.2907827,15.468268 2.196226,15.014888 1.5088294,14.73016 0.76952832,14.000941 0.41542121,13.25837 c -0.55389455,-1.161533 -0.55389455,-1.377824 0,-2.539356 C 0.76952832,9.9764427 1.5088294,9.2472231 2.196226,8.9624949 3.2851008,8.5114683 3.3715597,8.3378568 3.3715597,6.6024422 c 0,-3.4792204 1.6250076,-5.046114 4.983809,-4.8055747 1.5654311,0.1121071 1.6749393,0.1933956 1.7846363,1.3247441 0.06471,0.6673816 0.554333,1.6427733 1.097078,2.1855183 2.030344,2.0303438 5.610925,0.701951 5.890897,-2.1855183 0.109698,-1.1313485 0.219205,-1.212637 1.784636,-1.3247441 2.141416,-0.1533575 3.880692,0.1668516 4.577502,1.5143336 0.719285,1.3909438 0.654083,15.3196259 -0.04778,16.8600489 -0.848874,1.863067 -1.89173,2.081081 -9.884496,2.066406 -5.3569221,-0.0099 -7.5806343,-0.149276 -8.2439993,-0.51695 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/custom.svg b/Themes/_res/svgs/settingsicons/custom.svg
deleted file mode 100644
index 1782fe9108..0000000000
--- a/Themes/_res/svgs/settingsicons/custom.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 7.1992188 3.5 L 0 12 L 7.1992188 20.5 L 10.199219 17.5 L 5.5 12 L 10.199219 6.5 L 7.1992188 3.5 z M 16.800781 3.5 L 13.800781 6.5 L 18.5 12 L 13.800781 17.5 L 16.800781 20.5 L 24 12 L 16.800781 3.5 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/customcss.png b/Themes/_res/svgs/settingsicons/customcss.png
new file mode 100644
index 0000000000..021204ac70
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/customcss.png differ
diff --git a/Themes/_res/svgs/settingsicons/delete.svg b/Themes/_res/svgs/settingsicons/delete.svg
deleted file mode 100644
index 099f5024a9..0000000000
--- a/Themes/_res/svgs/settingsicons/delete.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 8.2285156 0 L 8.2285156 2.5253906 L 0.65039062 2.5253906 L 0.65039062 5.0507812 L 23.388672 5.0507812 L 23.388672 2.5253906 L 15.808594 2.5253906 L 15.808594 0 L 8.2285156 0 z M 3.1757812 6.3144531 L 3.1757812 21.472656 C 3.1757812 22.86473 4.3097885 24 5.703125 24 L 18.335938 24 C 19.729274 24 20.861328 22.86473 20.861328 21.472656 L 20.861328 6.3144531 L 3.1757812 6.3144531 z M 8.2285156 11.369141 L 10.755859 11.369141 L 10.755859 18.949219 L 8.2285156 18.949219 L 8.2285156 11.369141 z M 13.283203 11.369141 L 15.808594 11.369141 L 15.808594 18.949219 L 13.283203 18.949219 L 13.283203 11.369141 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/developer.png b/Themes/_res/svgs/settingsicons/developer.png
new file mode 100644
index 0000000000..048d72d444
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/developer.png differ
diff --git a/Themes/_res/svgs/settingsicons/developer.svg b/Themes/_res/svgs/settingsicons/developer.svg
deleted file mode 100644
index e39be56890..0000000000
--- a/Themes/_res/svgs/settingsicons/developer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 4.2160084,0 c -1.09331,0 -2.18645,0.39826 -2.9826,1.19476 -1.64452,1.64522 -1.64452,4.3217 0,5.96622 1.05675,1.05675 2.62163,1.48179 4.07592,1.0925 l 2.71317,2.75189 2.9831496,-2.98288 -2.7135296,-2.7518 c 0.38794,-1.45223 -0.0309,-3.01435 -1.0924,-4.07593 C 6.4028684,0.39826 5.3093284,0 4.2160084,0 Z M 19.763128,1.9e-4 c -1.10296,0.006 -2.17211,0.44331 -2.96411,1.23413 -1.06153,1.06223 -1.48044,2.62369 -1.0925,4.07593 l -10.3958996,10.39562 -7.5e-4,-7.3e-4 c -1.44675,-0.38381 -3.01709,0.035 -4.0752,1.09314 -0.93248,0.93249 -1.37878,2.27073 -1.19339,3.57944 0.0378,0.26367 0.22113,0.48348 0.47379,0.5679 0.25064,0.0845 0.53075,0.0185 0.7196,-0.16965 l 0.99427,-0.99499 c 0.53146,-0.53147 1.45778,-0.53147 1.98925,0 0.54994,0.54984 0.54966,1.43896 0,1.98861 l -0.99426,0.99427 c -0.18815,0.18815 -0.25412,0.4669 -0.16965,0.7196 0.0845,0.2527 0.30423,0.43605 0.56791,0.47379 1.30875,0.18623 2.62563,-0.24049 3.57879,-1.19275 1.06153,-1.06224 1.48044,-2.6237 1.0925,-4.07593 L 18.689378,8.29303 l 7.5e-4,7.4e-4 c 1.4543,0.38521 3.01709,-0.035 4.0752,-1.09314 0.93248,-0.93249 1.37878,-2.27069 1.19339,-3.57944 -0.0378,-0.26367 -0.22113,-0.48348 -0.47379,-0.5679 -0.25129,-0.0851 -0.53074,-0.0185 -0.7196,0.16965 l -0.99427,0.9949 c -0.53147,0.53147 -1.45779,0.53147 -1.98926,0 -0.54993,-0.54994 -0.54965,-1.43896 0,-1.98853 l 0.99427,-0.99426 c 0.18816,-0.18815 0.25411,-0.4669 0.16965,-0.7196 -0.0845,-0.25271 -0.30423,-0.43605 -0.5679,-0.47379 -0.20503,-0.029 -0.41044,-0.0426 -0.61469,-0.0415 z M 4.6337684,1.93946 c 0.18339,2.3e-4 0.36228,0.073 0.49566,0.20636 l 1.14185,1.14184 c 0.17784,0.17785 0.24721,0.43666 0.18201,0.67905 l -0.41821,1.56006 c -0.0652,0.24239 -0.2547,0.43193 -0.49705,0.49713 l -1.56005,0.41821 c -0.22917,0.0632 -0.49394,0.003 -0.67905,-0.18201 l -1.14194,-1.14184 c -0.17784,-0.17784 -0.24711,-0.43675 -0.18191,-0.67914 l 0.41812,-1.55996 c 0.0652,-0.2424 0.25479,-0.43193 0.49713,-0.49714 l 1.56006,-0.41821 c 0.0606,-0.0165 0.12225,-0.0244 0.18338,-0.0243 z m 11.3441996,11.05471 -2.9837,2.98343 2.72479,2.72498 c -0.10645,0.40303 -0.15655,0.74567 -0.15655,1.07867 0,2.32636 1.89239,4.21875 4.21875,4.21875 2.32636,0 4.21875,-1.89239 4.21875,-4.21875 0,-2.32636 -1.89239,-4.21875 -4.21875,-4.21875 -0.333,0 -0.67566,0.0501 -1.07803,0.15656 z m 4.29016,4.61838 c 0.18305,3e-5 0.36253,0.0736 0.4964,0.207 l 1.14194,1.14185 c 0.17784,0.17784 0.24712,0.43665 0.18192,0.67904 l -0.41813,1.56006 c -0.0652,0.24239 -0.25478,0.43193 -0.49713,0.49713 l -1.56006,0.41821 c -0.22917,0.0632 -0.49393,0.003 -0.67904,-0.182 l -1.14194,-1.14185 c -0.17784,-0.17784 -0.24712,-0.43674 -0.18191,-0.67914 l 0.41812,-1.55996 c 0.0652,-0.24239 0.25478,-0.43193 0.49713,-0.49713 l 1.56005,-0.41822 c 0.0603,-0.0168 0.12164,-0.025 0.18265,-0.025 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/discovery.svg b/Themes/_res/svgs/settingsicons/discovery.svg
deleted file mode 100644
index 0e3a14240f..0000000000
--- a/Themes/_res/svgs/settingsicons/discovery.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 12,10.68 c -0.732,0 -1.32,0.588 -1.32,1.32 0,0.732 0.588,1.32 1.32,1.32 0.732,0 1.32,-0.588 1.32,-1.32 0,-0.732 -0.588,-1.32 -1.32,-1.32 z M 12,0 C 5.376,0 0,5.376 0,12 0,18.624 5.376,24 12,24 18.624,24 24,18.624 24,12 24,5.376 18.624,0 12,0 Z M 14.628,14.628 4.8,19.2 9.372,9.372 19.2,4.8 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/dismissable.png b/Themes/_res/svgs/settingsicons/dismissable.png
new file mode 100644
index 0000000000..2448a367e5
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/dismissable.png differ
diff --git a/Themes/_res/svgs/settingsicons/dismissable.svg b/Themes/_res/svgs/settingsicons/dismissable.svg
deleted file mode 100644
index b937362939..0000000000
--- a/Themes/_res/svgs/settingsicons/dismissable.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 14 14"><path fill="black" d="M7.02799 0.333252C3.346 0.333252 0.361328 3.31792 0.361328 6.99992C0.361328 10.6819 3.346 13.6666 7.02799 13.6666C10.71 13.6666 13.6947 10.6819 13.6947 6.99992C13.6947 3.31792 10.7093 0.333252 7.02799 0.333252ZM10.166 9.19525L9.22333 10.1379L7.02799 7.94325L4.83266 10.1379L3.89 9.19525L6.08466 6.99992L3.88933 4.80459L4.832 3.86259L7.02733 6.05792L9.22266 3.86259L10.1653 4.80459L7.97066 6.99992L10.166 9.19525Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/emotes.svg b/Themes/_res/svgs/settingsicons/emotes.svg
deleted file mode 100644
index 07fc8b4c20..0000000000
--- a/Themes/_res/svgs/settingsicons/emotes.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12,0 A 12,12 0 0 0 0,12 12,12 0 0 0 12,24 12,12 0 0 0 24,12 12,12 0 0 0 12,0 Z M 7.1625,4.643555 a 2.4,2.4 0 0 1 2.4,2.3999998 2.4,2.4 0 0 1 -2.4,2.4 2.4,2.4 0 0 1 -2.4,-2.4 2.4,2.4 0 0 1 2.4,-2.3999998 z m 9.6,0 a 2.4,2.4 0 0 1 2.4,2.3999998 2.4,2.4 0 0 1 -2.4,2.4 2.4,2.4 0 0 1 -2.4,-2.4 2.4,2.4 0 0 1 2.4,-2.3999998 z m -12.2894532,8.4 H 19.447266 a 7.5,7.5 0 0 1 -7.484766,7.2 7.5,7.5 0 0 1 -7.4894532,-7.2 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/experiments.png b/Themes/_res/svgs/settingsicons/experiments.png
new file mode 100644
index 0000000000..742fdf5f4f
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/experiments.png differ
diff --git a/Themes/_res/svgs/settingsicons/experiments.svg b/Themes/_res/svgs/settingsicons/experiments.svg
deleted file mode 100644
index b7cbcb12b2..0000000000
--- a/Themes/_res/svgs/settingsicons/experiments.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 1.125 1.125"><path fill="black" d="m 0.42184421,0 c -0.025875,0 -0.046876,0.02100145 -0.046876,0.04687645 0,0.025875 0.021001,0.04687214 0.046876,0.04687214 v 0.23859643 c 0,0.0285938 -0.00858,0.0561543 -0.024702,0.0797324 l -0.2685472,0.39037514 c -0.025172,0.0376875 -0.037078,0.0817505 -0.0345,0.12735989 C 0.10070481,1.046578 0.20368761,1.125 0.35026571,1.125 h 0.4662194 c 0.114,0 0.20817039,-0.085735 0.21435789,-0.1952348 0.00258,-0.0456094 -0.00933,-0.0896721 -0.034873,-0.12792206 L 0.72784351,0.41203022 C 0.71167161,0.38849897 0.70309421,0.36093877 0.70309421,0.33234502 V 0.09374859 c 0.025875,0 0.046876,-0.02099714 0.046876,-0.04687214 C 0.74997061,0.02100145 0.72896921,0 0.70309421,0 Z m 0.093749,0.09374859 h 0.093753 v 0.23859643 c 0,0.0476719 0.014298,0.0936101 0.041298,0.13284445 l 0.2677488,0.38929369 c 0.013828,0.0206719 0.020344,0.0448616 0.018891,0.0700335 -0.003329,0.058875 -0.0575173,0.10673474 -0.1207517,0.10673474 h -0.4662666 c -0.095109,0 -0.1589074,-0.0419069 -0.1626106,-0.10678195 -0.00141,-0.0251719 0.00511,-0.0493619 0.018518,-0.0694713 l 0.2681222,-0.38980868 c 0.027,-0.0392344 0.041298,-0.0851726 0.041298,-0.13284445 z m 0.046893,0.53919263 c -0.020033,2.353e-5 -0.040096,0.004327 -0.057674,0.0129047 l -0.029251,0.014574 c -0.00647,0.003141 -0.014668,0.00511 -0.023153,0.005532 -0.010312,5.1562e-4 -0.019829,0.005534 -0.02611,0.01369 l -0.1325177,0.17278127 c -7.031e-4,7.5e-4 -0.00136,0.001546 -0.00197,0.002343 -0.00694,0.009 -0.010596,0.01964 -0.010596,0.0308431 0,0.0285937 0.024282,0.051889 0.054095,0.051889 h 0.4543104 c 0.029813,0 0.054095,-0.0232952 0.054095,-0.051889 0,-0.0112031 -0.00366,-0.0218904 -0.010501,-0.0308904 -6.094e-4,-7.9687e-4 -0.00126,-0.001593 -0.00197,-0.002343 L 0.69873401,0.67964161 c -0.00628,-0.008156 -0.015844,-0.0131744 -0.02611,-0.01369 -0.00848,-4.6875e-4 -0.016686,-0.002437 -0.022827,-0.00539 L 0.61998431,0.6457043 C 0.60252341,0.637173 0.58251951,0.63291783 0.56248621,0.63294122 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/family.png b/Themes/_res/svgs/settingsicons/family.png
new file mode 100644
index 0000000000..02650e2335
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/family.png differ
diff --git a/Themes/_res/svgs/settingsicons/family.svg b/Themes/_res/svgs/settingsicons/family.svg
deleted file mode 100644
index 1c2eb6b035..0000000000
--- a/Themes/_res/svgs/settingsicons/family.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 0.49403453,23.248513 c -0.812021,-0.897272 -0.581154,-2.987362 0.58506697,-5.296736 2.5692047,-5.087595 9.7100985,-6.243168 14.0741255,-2.277542 2.164208,1.966633 3.438705,6.259402 2.248759,7.574278 -0.763706,0.843885 -1.378388,1.000299 -1.378388,0.350747 0,-0.229517 -0.306935,-1.09375 -0.682077,-1.920516 l -0.682076,-1.503211 -0.227642,1.819437 -0.227642,1.819436 H 8.9480099 3.6918591 L 3.4642172,21.99497 3.2365753,20.175533 2.5544988,21.678744 c -0.375142,0.826766 -0.6820766,1.690999 -0.6820766,1.920516 0,0.649552 -0.6146827,0.493138 -1.37838767,-0.350747 z M 20.214174,18.659335 c -0.195772,-0.277969 -0.700803,-1.186281 -1.12229,-2.01847 -0.421487,-0.832189 -1.639901,-2.317758 -2.707585,-3.301264 -1.845372,-1.699877 -1.922185,-1.854655 -1.555293,-3.133931 0.212274,-0.740156 0.385953,-1.392426 0.385953,-1.449488 0,-0.381577 2.697049,0.01295 3.760032,0.550024 2.682148,1.355156 4.335743,3.636437 4.904103,6.76564 0.216447,1.191686 0.11975,1.736907 -0.412319,2.324836 -0.786517,0.869091 -2.715768,1.024882 -3.252601,0.262653 z M 7.677234,11.494779 C 4.2583294,10.080725 5.2586012,4.851832 8.9480099,4.851832 c 2.9251321,0 4.4685081,3.409402 2.5269961,5.582269 -1.040045,1.163978 -2.5371,1.58209 -3.797772,1.060678 z M 14.81064,6.457087 c 0,-0.347907 -0.388023,-1.439863 -1.166338,-2.301365 C 12.865988,3.294221 12.112112,3.228523 11.834064,2.7544416 11.312143,1.8645522 13.557005,0 15.085306,0 17.935444,0 19.45886,3.453889 17.539795,5.564817 16.38265,6.837651 14.81064,7.351605 14.81064,6.457087 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/friendrequests.png b/Themes/_res/svgs/settingsicons/friendrequests.png
new file mode 100644
index 0000000000..239717180a
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/friendrequests.png differ
diff --git a/Themes/_res/svgs/settingsicons/friendrequests.svg b/Themes/_res/svgs/settingsicons/friendrequests.svg
deleted file mode 100644
index d929b8670b..0000000000
--- a/Themes/_res/svgs/settingsicons/friendrequests.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 6.8965159,24 C 5.9180302,23.696336 5.4091145,21.972637 5.4049692,19.239451 5.4020292,17.300313 5.0999082,16.354364 3.4357869,13.073859 0.62409223,7.5311347 -0.21591327,1.9801477 1.6487522,1.2646087 c 0.9743634,-0.37389701 1.6677056,0.503738 2.2884335,2.896699 0.6731841,2.595201 2.2606734,4.933339 4.3170805,6.3584303 1.2204449,0.845769 2.2897258,1.161944 4.7779148,1.412779 5.668228,0.571417 8.659861,2.693991 9.923501,7.040758 0.74504,2.562849 0.424978,4.165358 -0.9322,4.667411 -0.736764,0.272547 -1.00809,0.07725 -1.765858,-1.271013 -1.152881,-2.051274 -1.727833,-2.043606 -1.398066,0.01864 L 19.117276,24 c 0.01546,0.03057 -12.2207601,0 -12.2207601,0 z M 10.646415,8.8055457 c -3.8440666,-1.965122 -3.3489473,-7.380675 0.788102,-8.62016501 2.145827,-0.642906 5.085746,0.38253353 5.794177,2.73106001 0.450666,1.4940085 0.386531,1.9338751 0.05659,3.3110409 -0.708422,2.9569274 -4.085093,3.8835764 -6.638868,2.5780641 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/games.png b/Themes/_res/svgs/settingsicons/games.png
new file mode 100644
index 0000000000..95d9f3323b
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/games.png differ
diff --git a/Themes/_res/svgs/settingsicons/games.svg b/Themes/_res/svgs/settingsicons/games.svg
deleted file mode 100644
index 32133faf36..0000000000
--- a/Themes/_res/svgs/settingsicons/games.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 15.6,6.6 V 0 H 8.4 v 6.6 l 3.6,3.6 z m -9,1.8 H 0 v 7.2 H 6.6 L 10.2,12 Z m 1.8,9 V 24 h 7.2 V 17.4 L 12,13.8 Z m 9,-9 -3.6,3.6 3.6,3.6 H 24 V 8.4 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/gift.png b/Themes/_res/svgs/settingsicons/gift.png
new file mode 100644
index 0000000000..0e127367b0
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/gift.png differ
diff --git a/Themes/_res/svgs/settingsicons/gift.svg b/Themes/_res/svgs/settingsicons/gift.svg
deleted file mode 100644
index 44b71ab070..0000000000
--- a/Themes/_res/svgs/settingsicons/gift.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 6.9648438 0.013671875 C 6.4793484 0.03346108 6.0178172 0.20452136 5.3007812 0.5546875 C 3.2391585 1.5614868 2.0740304 3.8358841 2.6542969 5.7265625 C 2.927626 6.6171519 2.975066 6.9246043 2.6425781 7.1113281 C 2.6138038 7.1139114 2.5877363 7.1171875 2.5546875 7.1171875 C 2.3008206 7.1171875 2.0133468 7.2379893 1.7246094 7.4375 C 0.83062921 7.865123 0.13434258 8.9222134 0.0234375 9.9980469 C 0.023160711 9.9999882 0.023708031 10.001967 0.0234375 10.003906 C 0.018622837 10.051515 0.01419994 10.098871 0.01171875 10.146484 C 0.0099618017 10.176853 0.005859375 10.208637 0.005859375 10.238281 C 0.005859375 10.252161 0.0076958797 10.265415 0.0078125 10.279297 C 0.007350608 10.367648 0.011376234 10.455472 0.01953125 10.542969 C 0.030955698 10.733433 0.049400434 10.915608 0.078125 11.078125 L 0.15234375 11.724609 L 0.796875 11.730469 C 2.2353987 11.832949 6.7295756 11.877809 12 11.832031 C 17.270402 11.877792 21.76482 11.833156 23.203125 11.730469 L 23.847656 11.724609 L 23.921875 11.078125 C 23.950503 10.916288 23.968986 10.734487 23.980469 10.544922 C 23.98875 10.456787 23.992652 10.368302 23.992188 10.279297 C 23.992315 10.264816 23.994141 10.250807 23.994141 10.236328 C 23.994141 10.20601 23.988166 10.173652 23.986328 10.142578 C 23.983887 10.09693 23.981148 10.051502 23.976562 10.005859 C 23.976103 10.001286 23.97509 9.9967606 23.974609 9.9921875 C 23.861659 8.9175513 23.166754 7.861728 22.273438 7.4355469 C 21.985358 7.237027 21.698548 7.1171875 21.445312 7.1171875 C 21.412264 7.1171875 21.38619 7.1139102 21.357422 7.1113281 C 21.024346 6.9246394 21.070374 6.6173043 21.34375 5.7265625 C 21.924016 3.8358821 20.760844 1.5614878 18.699219 0.5546875 C 17.875177 0.15226461 17.387103 -0.012993664 16.814453 0.015625 C 16.461374 0.025918697 16.080552 0.10884733 15.570312 0.26171875 C 14.726537 0.51451952 13.571111 1.2712284 13.003906 1.9453125 L 12 3.1386719 L 10.996094 1.9453125 C 10.428889 1.2712278 9.2734621 0.51451977 8.4296875 0.26171875 C 7.9194472 0.10884717 7.5388594 0.025832329 7.1855469 0.015625 C 7.1823519 0.015465236 7.1789711 0.013819443 7.1757812 0.013671875 C 7.1047125 0.01038413 7.0342002 0.010844846 6.9648438 0.013671875 z M 7.3554688 2.3320312 C 7.4209412 2.3316046 7.486133 2.3336067 7.5527344 2.3378906 C 8.4477729 2.4401811 9.0850666 2.8339111 9.5195312 3.5664062 C 9.522723 3.5717875 9.5261269 3.5766135 9.5292969 3.5820312 C 9.5351695 3.5926975 9.5410224 3.602485 9.546875 3.6132812 C 9.5831248 3.6768191 9.6189691 3.7420744 9.6523438 3.8105469 C 9.7685135 4.0488844 9.866001 4.3175401 9.9492188 4.6171875 C 10.178019 5.4410395 10.365958 6.3397529 10.367188 6.6152344 C 10.36953 7.1412194 8.5875172 7.2541495 7.1386719 7.0273438 C 6.3972988 6.8993812 5.7457265 6.6821886 5.4765625 6.3847656 C 5.0010918 5.8593766 4.7939321 5.2937243 4.7871094 4.7558594 C 4.7883802 4.6908011 4.7886886 4.6254362 4.7949219 4.5605469 C 4.7956141 4.5533412 4.7961226 4.5462636 4.796875 4.5390625 C 4.8168267 4.3481126 4.8614175 4.1593487 4.921875 3.9765625 C 5.263781 3.0449932 6.2178704 2.3394448 7.3554688 2.3320312 z M 16.646484 2.3320312 C 17.786417 2.3394602 18.740326 3.0485166 19.080078 3.9824219 C 19.091979 4.0186775 19.102916 4.0550754 19.113281 4.0917969 C 19.127377 4.1377411 19.139301 4.1836041 19.150391 4.2304688 C 19.168305 4.3098676 19.182798 4.3901307 19.193359 4.4707031 C 19.19866 4.5147368 19.204457 4.5589489 19.207031 4.6035156 C 19.20976 4.637948 19.209602 4.67255 19.210938 4.7070312 C 19.216099 5.2588365 19.011079 5.841816 18.521484 6.3828125 C 18.240292 6.693527 17.544409 6.9177875 16.761719 7.0429688 C 15.331948 7.2494698 13.630521 7.1311987 13.632812 6.6171875 C 13.634042 6.3417057 13.821981 5.4410403 14.050781 4.6171875 C 14.133999 4.3175398 14.231484 4.0489584 14.347656 3.8105469 C 14.383124 3.7377597 14.422221 3.6687838 14.460938 3.6015625 C 14.466155 3.5925044 14.471285 3.5831765 14.476562 3.5742188 C 14.894241 2.8652067 15.49989 2.4705165 16.34375 2.3496094 C 16.445382 2.3394725 16.547371 2.3313854 16.646484 2.3320312 z M 1.3554688 14.529297 L 1.2402344 18.238281 C 1.1316342 21.733735 1.1801295 22.006302 2.1210938 22.947266 C 2.478747 23.304919 2.7573468 23.538333 3.1582031 23.691406 C 3.6329504 23.890306 4.3015839 23.94873 5.5898438 23.964844 C 5.6072162 23.965111 5.6191254 23.966546 5.6367188 23.966797 C 5.6445839 23.966887 5.6502912 23.966709 5.6582031 23.966797 C 5.9018216 23.969496 6.1895091 23.970114 6.4804688 23.970703 C 6.578255 23.970929 6.6544578 23.972656 6.7578125 23.972656 C 6.8146292 23.972688 6.8554484 23.972656 6.9140625 23.972656 C 9.4091537 23.97456 10.617785 24.009697 10.597656 23.972656 L 10.625 23.972656 L 10.625 14.529297 L 10.570312 14.529297 L 6.015625 14.529297 L 5.9609375 14.529297 L 1.4082031 14.529297 L 1.3554688 14.529297 z M 13.376953 14.529297 L 13.376953 23.972656 L 13.402344 23.972656 C 13.382215 24.009697 14.590854 23.97456 17.085938 23.972656 C 17.248594 23.972656 17.370469 23.971004 17.519531 23.970703 C 17.810482 23.970115 18.098201 23.969493 18.341797 23.966797 C 18.349708 23.966709 18.355417 23.966887 18.363281 23.966797 C 18.380913 23.966546 18.392747 23.965112 18.410156 23.964844 C 19.700016 23.94873 20.369077 23.89091 20.84375 23.691406 C 21.24336 23.538382 21.519917 23.304302 21.876953 22.947266 C 22.817917 22.006301 22.870319 21.735692 22.761719 18.240234 L 22.646484 14.529297 L 22.591797 14.529297 L 18.037109 14.529297 L 17.982422 14.529297 L 13.429688 14.529297 L 13.376953 14.529297 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/hotspots.png b/Themes/_res/svgs/settingsicons/hotspots.png
new file mode 100644
index 0000000000..7163d65657
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/hotspots.png differ
diff --git a/Themes/_res/svgs/settingsicons/hotspots.svg b/Themes/_res/svgs/settingsicons/hotspots.svg
deleted file mode 100644
index 84ea572e32..0000000000
--- a/Themes/_res/svgs/settingsicons/hotspots.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 10.525648,0 C 11.798162,3.410392 11.13646,5.268293 9.7112385,6.744433 8.1587582,8.373277 5.740979,9.59491 4.0358007,11.987275 1.7707196,15.16861 1.3889645,22.167551 9.5585304,24 6.1227342,22.193002 5.3846736,16.950158 9.1004262,13.66702 c -0.9671176,3.181337 0.8144097,5.217391 3.0285918,4.479322 2.163282,-0.738071 3.588504,0.814422 3.537605,2.59597 -0.0254,1.221632 -0.509014,2.265112 -1.756078,2.850478 5.319122,-0.941676 7.456955,-5.344647 7.456955,-8.704135 0,-4.428422 -3.9448,-5.039238 -1.959675,-8.755039 -2.36688,0.203606 -3.1813,1.756098 -2.952242,4.301167 0.152698,1.679745 -1.60337,2.825026 -2.901343,2.061506 C 12.510773,11.860021 12.536222,10.638388 13.452441,9.722163 15.412116,7.787911 16.175626,3.33404 10.525648,0 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/hypesquad.png b/Themes/_res/svgs/settingsicons/hypesquad.png
new file mode 100644
index 0000000000..bba023bd27
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/hypesquad.png differ
diff --git a/Themes/_res/svgs/settingsicons/hypesquad.svg b/Themes/_res/svgs/settingsicons/hypesquad.svg
deleted file mode 100644
index 4787340493..0000000000
--- a/Themes/_res/svgs/settingsicons/hypesquad.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 23.988076,4.0407257 -4.020135,7.7588623 c -0.05567,0.147956 0.01528,0.313482 0.160804,0.375213 h 2.532686 c 0.154403,0.01365 0.265061,0.155051 0.241208,0.308211 0.0011,0.07406 -0.03389,0.144041 -0.0938,0.187607 L 12.19568,20.335677 c -0.100799,0.05243 -0.220819,0.05243 -0.321611,0 L 1.2073048,12.684018 c -0.1055339,-0.11322 -0.1055339,-0.288786 0,-0.402014 v 0 c 0.046769,-0.04879 0.1077235,-0.08162 0.1742059,-0.0938 h 2.3718807 c 0.162819,0 0.29481,-0.131994 0.29481,-0.29481 v 0 -0.0938 L 0.02806482,4.0407257 c -0.067899,-0.1444542 -0.0085,-0.3167117 0.1340046,-0.3886131 0.059633,-0.026948 0.127973,-0.026948 0.1876063,0 L 9.8907994,9.9101245 c 0.1746236,0.09447 0.3117316,0.2457635 0.3886126,0.4288145 l 1.46065,2.9213 c 0.06036,0.132342 0.219144,0.187311 0.34841,0.120604 0.05616,-0.02522 0.103024,-0.06739 0.134006,-0.120604 l 1.407047,-2.9079 c 0.09676,-0.169537 0.22939,-0.315887 0.388613,-0.4288145 l 9.541123,-6.2714119 c 0.140608,-0.066801 0.308733,-0.0067 0.375213,0.1340045 v 0 c 0.06062,0.069924 0.0809,0.1661763 0.0536,0.2546086 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/integrations.svg b/Themes/_res/svgs/settingsicons/integrations.svg
deleted file mode 100644
index 343ec85097..0000000000
--- a/Themes/_res/svgs/settingsicons/integrations.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 4.4479735,3.4653965 H 19.551929 c 1.915074,0 3.504552,1.4799939 3.640996,3.390201 L 23.994144,18.07267 c 0.08916,1.248237 -0.850458,2.332412 -2.098696,2.421572 -0.05373,0.0038 -0.107574,0.0058 -0.161438,0.0058 -1.430193,0 -2.676856,-0.973365 -3.023729,-2.360856 L 18.083738,15.63297 H 5.9161645 L 5.2896212,18.139144 C 4.9427483,19.526635 3.6960857,20.5 2.2658923,20.5 1.0144746,20.5 0,19.485525 0,18.234108 0,18.180248 0.00192,18.126397 0.00576,18.07267 L 0.8069777,6.8555975 C 0.9434211,4.9453904 2.5328995,3.4653965 4.4479735,3.4653965 Z m 10.5938715,6.083787 c 1.007994,0 1.825136,-0.8171413 1.825136,-1.8251361 0,-1.0079949 -0.817142,-1.8251361 -1.825136,-1.8251361 -1.007995,0 -1.825137,0.8171412 -1.825137,1.8251361 0,1.0079948 0.817142,1.8251361 1.825137,1.8251361 z m 4.867029,3.6502725 c 1.007995,0 1.825136,-0.817142 1.825136,-1.825136 0,-1.007995 -0.817141,-1.8251365 -1.825136,-1.8251365 -1.007995,0 -1.825136,0.8171415 -1.825136,1.8251365 0,1.007994 0.817141,1.825136 1.825136,1.825136 z M 4.6994071,8.3324261 H 2.2658923 v 2.4335149 h 2.4335148 v 2.433515 H 7.1329219 V 10.765941 H 9.5664364 V 8.3324261 H 7.1329219 V 5.8989113 H 4.6994071 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/invites.svg b/Themes/_res/svgs/settingsicons/invites.svg
deleted file mode 100644
index 835ffbd9b0..0000000000
--- a/Themes/_res/svgs/settingsicons/invites.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 2.1045459,12.559707 c -0.167167,0.167166 -0.324165,0.340229 -0.471565,0.518316 -0.0013,0.0018 -0.0029,0.0035 -0.0045,0.0054 -0.07285,0.08818 -0.142849,0.177788 -0.210833,0.268374 -0.05041,0.06731 -0.09836,0.136007 -0.146101,0.204539 -0.01794,0.02566 -0.03732,0.05057 -0.05484,0.07642 -0.0013,0.0019 -0.0023,0.0037 -0.0036,0.0054 -1.79443401,2.653373 -1.60730101,6.166088 0.622609,8.396004 0.07502,0.07502 0.15182,0.147676 0.229715,0.218025 l -0.0049,0.0049 c 2.56827,2.32311 6.628247,2.131417 9.2505601,-0.490897 l 4.056636,-4.056614 c 2.701631,-2.70163 2.823524,-6.929632 0.273319,-9.4798362 -0.07577,-0.07577 -0.152891,-0.148748 -0.231512,-0.219825 -0.516652,-0.436335 -1.281342,-0.404495 -1.759937,0.07327 -0.500954,0.501734 -0.508339,1.312213 -0.237358,1.597655 0.270989,0.2854386 0.331476,0.3341902 0.387495,0.3902072 1.530121,1.530122 1.389349,4.13456 -0.315575,5.839485 l -3.9721051,3.972103 c -1.704928,1.704928 -4.309361,1.845699 -5.839486,0.315576 -1.244808,-1.24481 -1.38281,-3.200115 -0.473361,-4.804203 0.06871,-0.121195 0.142764,-0.240662 0.22342,-0.357382 0.0013,-0.0019 0.0026,-0.004 0.004,-0.0059 0.08087,-0.116683 0.167502,-0.230832 0.260283,-0.342098 0.09414,-0.113248 0.194795,-0.223244 0.301188,-0.32996 0.0016,-0.0016 0.0029,-0.0037 0.0045,-0.0054 l 0.257145,-0.257121 c -0.388877,-1.088672 -0.471571,-2.270654 -0.25579,-3.425923 z m 6.527729,-6.2571062 c -2.701631,2.70163 -2.823524,6.9296322 -0.273319,9.4798372 0.07577,0.07577 0.152864,0.14877 0.231511,0.219824 0.516653,0.436334 1.281343,0.404496 1.7599381,-0.07327 0.50095,-0.501735 0.508339,-1.312212 0.237354,-1.597655 C 10.316777,14.045895 10.256287,13.997146 10.200268,13.941129 8.6701459,12.411006 8.8109189,9.8065688 10.515843,8.1016438 l 3.972111,-3.972111 c 1.704928,-1.704927 4.309361,-1.845697 5.839486,-0.315573 1.244808,1.244809 1.38281,3.200113 0.473361,4.804201 -0.06871,0.121196 -0.142764,0.240664 -0.22342,0.357383 -0.0013,0.002 -0.0026,0.0039 -0.004,0.0059 -0.08088,0.116674 -0.167502,0.230831 -0.260279,0.342097 -0.09415,0.113243 -0.194789,0.223252 -0.301188,0.329959 -0.0016,0.0016 -0.0029,0.0037 -0.0045,0.0054 l -0.257138,0.2571356 c 0.388877,1.0886686 0.471567,2.2706516 0.25579,3.4259186 l 1.889402,-1.889403 c 0.16717,-0.167167 0.324175,-0.340219 0.471564,-0.518316 0.0016,-0.0018 0.0029,-0.0036 0.0045,-0.0054 0.07284,-0.08818 0.142846,-0.177796 0.210836,-0.268374 0.05042,-0.0673 0.09836,-0.136006 0.146097,-0.20454 0.0179,-0.02568 0.0373,-0.05059 0.05485,-0.07642 0.0013,-0.002 0.0023,-0.0036 0.0036,-0.0054 1.794427,-2.6533792 1.607301,-6.1660882 -0.622609,-8.3960052 -0.07502,-0.07503 -0.15182,-0.147677 -0.229715,-0.218025 l 0.0049,-0.005 c -2.568309,-2.32313804 -6.628289,-2.13144304 -9.250602,0.490869 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/keybinds.png b/Themes/_res/svgs/settingsicons/keybinds.png
new file mode 100644
index 0000000000..45dd953be8
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/keybinds.png differ
diff --git a/Themes/_res/svgs/settingsicons/keybinds.svg b/Themes/_res/svgs/settingsicons/keybinds.svg
deleted file mode 100644
index 1c15353d84..0000000000
--- a/Themes/_res/svgs/settingsicons/keybinds.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 1.8467972,20.226793 C 0.2212062,19.325797 0.0143012,18.412322 5.2420451e-4,12.07563 -0.0135658,5.5950825 0.2464512,4.4947995 1.9784972,3.7056265 3.4592075,3.0309695 20.800894,3.1030875 22.128116,3.7894165 23.758774,4.6326635 24,5.6910905 24,12.002737 c 0,6.311645 -0.241226,7.370073 -1.871884,8.213319 -1.401627,0.724811 -18.9761872,0.734111 -20.2813188,0.01073 z M 17.451173,16.368627 V 15.277155 H 11.993816 6.5364601 v 1.091472 1.091471 h 5.4573559 5.457357 z M 4.3535179,12.002742 c 0,-0.970197 -0.1212745,-1.091472 -1.0914716,-1.091472 -0.9701968,0 -1.0914713,0.121275 -1.0914713,1.091472 0,0.970196 0.1212745,1.091471 1.0914713,1.091471 0.9701971,0 1.0914716,-0.121275 1.0914716,-1.091471 z m 4.3658847,0 c 0,-0.970197 -0.1212734,-1.091472 -1.0914713,-1.091472 -0.9701968,0 -1.0914712,0.121275 -1.0914712,1.091472 0,0.970196 0.1212744,1.091471 1.0914712,1.091471 0.9701979,0 1.0914713,-0.121275 1.0914713,-1.091471 z m 4.3658854,0 c 0,-0.970197 -0.121274,-1.091472 -1.091472,-1.091472 -0.970197,0 -1.091471,0.121275 -1.091471,1.091472 0,0.970196 0.121274,1.091471 1.091471,1.091471 0.970198,0 1.091472,-0.121275 1.091472,-1.091471 z m 4.365885,0 c 0,-0.970197 -0.121274,-1.091472 -1.091471,-1.091472 -0.970198,0 -1.091472,0.121275 -1.091472,1.091472 0,0.970196 0.121274,1.091471 1.091472,1.091471 0.970197,0 1.091471,-0.121275 1.091471,-1.091471 z m 4.365885,0 c 0,-0.970197 -0.121274,-1.091472 -1.091471,-1.091472 -0.970198,0 -1.091472,0.121275 -1.091472,1.091472 0,0.970196 0.121274,1.091471 1.091472,1.091471 0.970197,0 1.091471,-0.121275 1.091471,-1.091471 z M 4.3535179,7.6368566 c 0,-0.9701971 -0.1212745,-1.0914711 -1.0914716,-1.0914711 -0.9701968,0 -1.0914713,0.121274 -1.0914713,1.0914711 0,0.9701968 0.1212745,1.0914713 1.0914713,1.0914713 0.9701971,0 1.0914716,-0.1212745 1.0914716,-1.0914713 z m 4.3658847,0 c 0,-0.9701971 -0.1212734,-1.0914711 -1.0914713,-1.0914711 -0.9701968,0 -1.0914712,0.121274 -1.0914712,1.0914711 0,0.9701968 0.1212744,1.0914713 1.0914712,1.0914713 0.9701979,0 1.0914713,-0.1212745 1.0914713,-1.0914713 z m 4.3658854,0 c 0,-0.9701971 -0.121274,-1.0914711 -1.091472,-1.0914711 -0.970197,0 -1.091471,0.121274 -1.091471,1.0914711 0,0.9701968 0.121274,1.0914713 1.091471,1.0914713 0.970198,0 1.091472,-0.1212745 1.091472,-1.0914713 z m 4.365885,0 c 0,-0.9701971 -0.121274,-1.0914711 -1.091471,-1.0914711 -0.970198,0 -1.091472,0.121274 -1.091472,1.0914711 0,0.9701968 0.121274,1.0914713 1.091472,1.0914713 0.970197,0 1.091471,-0.1212745 1.091471,-1.0914713 z m 4.365885,0 c 0,-0.9701971 -0.121274,-1.0914711 -1.091471,-1.0914711 -0.970198,0 -1.091472,0.121274 -1.091472,1.0914711 0,0.9701968 0.121274,1.0914713 1.091472,1.0914713 0.970197,0 1.091471,-0.1212745 1.091471,-1.0914713 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/language.png b/Themes/_res/svgs/settingsicons/language.png
new file mode 100644
index 0000000000..0a6021a1cf
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/language.png differ
diff --git a/Themes/_res/svgs/settingsicons/language.svg b/Themes/_res/svgs/settingsicons/language.svg
deleted file mode 100644
index db989c7b65..0000000000
--- a/Themes/_res/svgs/settingsicons/language.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 12.949117,15.354466 v 0 l -2.770928,-2.738201 0.03273,-0.03273 c 1.898181,-2.116379 3.250892,-4.549091 4.04729,-7.1236554 h 3.196383 V 3.2726224 H 9.8181888 V 1.0907856 H 7.636352 V 3.2726224 H 0 V 5.443516 H 12.185446 C 11.449082,7.548955 10.298155,9.54532 8.7272448,11.29081 7.7126987,10.161718 6.872681,8.9344446 6.2072431,7.6362448 H 4.0254574 c 0.7963472,1.7781661 1.8872911,3.4582012 3.2508944,4.9745492 l -5.5472767,5.481822 1.5436545,1.543654 5.4545664,-5.454566 3.392747,3.392747 z"/><path fill="black" d="M 19.090906,9.8180816 H 16.909069 L 11.999974,22.909 h 2.181837 l 1.227274,-3.27273 H 20.59089 L 21.818163,22.909 H 24 Z m -2.863639,7.6363524 1.772746,-4.729095 1.772745,4.729095 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/library.svg b/Themes/_res/svgs/settingsicons/library.svg
deleted file mode 100644
index 2454bfb2ee..0000000000
--- a/Themes/_res/svgs/settingsicons/library.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 6.375,0.75 c -0.3886406,0 -0.703125,0.3144844 -0.703125,0.703125 v 14.0625 c 0,0.388641 0.3144844,0.703125 0.703125,0.703125 3.252375,0 4.608656,1.798453 4.921875,2.296875 V 2.3886719 C 10.323656,1.5753438 8.760938,0.75 6.375,0.75 Z M 3.5625,2.15625 c -0.3886406,0 -0.703125,0.3144844 -0.703125,0.703125 v 15.46875 c 0,0.388641 0.3144844,0.703125 0.703125,0.703125 H 9.929688 C 9.535891,18.553922 8.503875,17.625 6.375,17.625 5.2118437,17.625 4.265625,16.678781 4.265625,15.515625 V 2.15625 Z m 11.25,0 c -0.794437,0 -1.519969,0.2745469 -2.109375,0.7207031 V 19.734375 c 0,-0.387938 0.315188,-0.703125 0.703125,-0.703125 h 7.03125 c 0.388641,0 0.703125,-0.314484 0.703125,-0.703125 V 2.859375 c 0,-0.3886406 -0.314484,-0.703125 -0.703125,-0.703125 z M 0.703125,3.5625 C 0.3144844,3.5625 0,3.8769844 0,4.265625 v 16.875 c 0,0.388641 0.3144844,0.703125 0.703125,0.703125 H 8.605469 C 8.895906,22.662234 9.677063,23.25 10.59375,23.25 h 2.8125 c 0.916687,0 1.697797,-0.587766 1.988281,-1.40625 h 7.902344 C 23.685516,21.84375 24,21.529266 24,21.140625 v -16.875 C 24,3.8769844 23.685516,3.5625 23.296875,3.5625 H 22.59375 v 14.765625 c 0,1.163156 -0.993094,2.109375 -2.15625,2.109375 H 13.988281 C 13.697844,21.255984 12.916688,21.84375 12,21.84375 c -0.916687,0 -1.697797,-0.587766 -1.988281,-1.40625 H 3.5625 c -1.1631562,0 -2.15625,-0.946219 -2.15625,-2.109375 V 3.5625 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/linux.png b/Themes/_res/svgs/settingsicons/linux.png
new file mode 100644
index 0000000000..34f03a9fca
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/linux.png differ
diff --git a/Themes/_res/svgs/settingsicons/linux.svg b/Themes/_res/svgs/settingsicons/linux.svg
deleted file mode 100644
index 99043dee97..0000000000
--- a/Themes/_res/svgs/settingsicons/linux.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 4.1262045,22.708789 c 1.26575,0.151162 2.68792,0.971123 3.8781,1.115885 1.19657,0.151086 1.56685,-0.814856 1.56685,-0.814856 0,0 1.3465105,-0.301029 2.7621305,-0.335695 1.41699,-0.0397 2.75833,0.294704 2.75833,0.294704 0,0 0.26011,0.595733 0.74567,0.855847 0.48556,0.265143 1.53097,0.301029 2.20099,-0.404876 0.67131,-0.711009 2.4624,-1.606627 3.46811,-2.166475 1.01212,-0.561142 0.82636,-1.416913 0.19094,-1.677027 -0.63543,-0.260038 -1.15558,-0.670019 -1.11589,-1.456685 0.0346,-0.78019 -0.56114,-1.300343 -0.56114,-1.300343 0,0 0.52145,-1.716722 0.0359,-3.138817 -0.48556,-1.415618 -2.087,-3.6922652 -3.31817,-5.4038832 -1.23116,-1.716723 -0.18582,-3.698665 -1.30674,-6.231539 -1.12106,-2.53668497 -4.02796,-2.38674197 -5.5948105,-1.30552397 -1.56686,1.08129497 -1.08648,3.76274097 -1.0109,5.03496897 0.0756,1.265752 0.0346,2.171504 -0.11017,2.496989 -0.14476,0.330515 -1.15558,1.530971 -1.82689,2.5366852 -0.67002,1.010818 -1.15566,3.097827 -1.64633,3.958779 -0.48045,0.855847 -0.14476,1.636037 -0.14476,1.636037 0,0 -0.33562,0.115276 -0.60084,0.676495 -0.26011,0.554742 -0.78026,0.819885 -1.7168,1.000609 -0.93013,0.190857 -0.93013,0.790476 -0.7059,1.461789 0.22545,0.670019 0,1.045409 -0.26011,1.901257 -0.26004,0.855694 1.0416,1.115732 2.31245,1.265675 z M 17.283685,18.80502 c 0.66492,0.290819 1.62065,-0.114057 1.91147,-0.404876 0.2896,-0.289524 0.49455,-0.72 0.49455,-0.72 0,0 0.29082,0.144762 0.26133,0.604647 -0.0308,0.466362 0.19985,1.131276 0.63543,1.361905 0.43558,0.229333 1.1005,0.549561 0.75589,0.869866 -0.35109,0.320304 -2.29326,1.10179 -2.8736,1.711618 -0.57524,0.605942 -1.33113,1.10179 -1.79109,0.955733 -0.46499,-0.144762 -0.87116,-0.78019 -0.67124,-1.710323 0.20625,-0.926247 0.3805,-1.942247 0.35101,-2.522589 -0.0307,-0.580343 -0.14476,-1.361828 0,-1.477181 0.14477,-0.114057 0.37539,-0.05897 0.37539,-0.05897 0,0 -0.11542,1.100723 0.55086,1.39017 z M 12.968795,3.1263228 c 0.64053,0 1.15687,0.635428 1.15687,1.416914 0,0.554742 -0.26011,1.035199 -0.64061,1.265828 -0.0961,-0.0397 -0.19603,-0.08457 -0.30621,-0.130743 0.23063,-0.113981 0.39071,-0.4048 0.39071,-0.740495 0,-0.43939 -0.27025,-0.800685 -0.60983,-0.800685 -0.33051,0 -0.60602,0.361219 -0.60602,0.800685 0,0.160229 0.0398,0.320305 0.10507,0.445866 -0.19985,-0.08076 -0.3805,-0.149866 -0.52526,-0.204952 -0.0756,-0.190933 -0.12046,-0.406171 -0.12046,-0.635428 8e-5,-0.781485 0.51505,-1.41699 1.15574,-1.41699 z m -1.58613,2.441904 c 0.31519,0.05509 1.18118,0.430476 1.50156,0.545752 0.3203,0.110171 0.67512,0.315123 0.64053,0.520152 -0.0397,0.211352 -0.20495,0.211352 -0.64053,0.476571 -0.43048,0.260114 -1.37082,0.840457 -1.67193,0.880152 -0.29981,0.03969 -0.47017,-0.129448 -0.79055,-0.335695 -0.3203,-0.210133 -0.9210605,-0.7008 -0.7699805,-0.960838 0,0 0.4701705,-0.359999 0.6752005,-0.544456 0.20503,-0.190934 0.73539,-0.64061 1.0557,-0.581638 z m -1.38111,-2.21638 c 0.50476,0 0.91604,0.600838 0.91604,1.341333 0,0.134552 -0.0154,0.260038 -0.0397,0.385599 -0.12556,0.0397 -0.25104,0.105067 -0.37158,0.210134 -0.0589,0.04998 -0.11405,0.09478 -0.16396,0.144761 0.0794,-0.149866 0.11017,-0.365104 0.0743,-0.590628 -0.0692,-0.399695 -0.33951,-0.695619 -0.6047305,-0.655923 -0.26651,0.04488 -0.42537,0.411276 -0.36129,0.816152 0.0705,0.40998 0.33562,0.705828 0.6059405,0.661028 0.0154,-0.0051 0.0295,-0.01021 0.0449,-0.01539 -0.1293705,0.125562 -0.2498305,0.235734 -0.3753905,0.32541 -0.36511,-0.170438 -0.63543,-0.680305 -0.63543,-1.281142 7e-5,-0.7456 0.40487,-1.341333 0.9109305,-1.341333 z M 7.1894445,13.045023 c 0.52015,-0.819885 0.85577,-2.612265 1.37592,-3.2079992 0.52533,-0.594437 0.93013,-1.861484 0.74568,-2.421332 0,0 1.1209905,1.341333 1.9012505,1.12099 0.78149,-0.225523 2.53798,-1.53097 2.79802,-1.306742 0.26011,0.225448 2.49699,5.1450642 2.72244,6.7119202 0.22552,1.565562 -0.14987,2.762208 -0.14987,2.762208 0,0 -0.85577,-0.225523 -0.96602,0.294629 -0.11017,0.525257 -0.11017,2.427808 -0.11017,2.427808 0,0 -1.15687,1.601447 -2.94796,1.86659 -1.79108,0.260114 -2.6879205,0.07048 -2.6879205,0.07048 l -1.00571,-1.151771 c 0,0 0.78156,-0.115276 0.67131,-0.900647 -0.11017,-0.78019 -2.38811,-1.861561 -2.79809,-2.832684 -0.40983,-0.971124 -0.0754,-2.612266 0.45112,-3.433446 z m -4.42895,5.875349 c 0.0897,-0.384304 1.25036,-0.384304 1.69623,-0.654628 0.44586,-0.270324 0.53546,-1.046704 0.89554,-1.251657 0.35482,-0.210133 1.01082,0.535543 1.28114,0.955657 0.26522,0.409981 1.28122,2.202361 1.6963,2.648151 0.42019,0.449676 0.80587,1.045409 0.68541,1.580952 -0.11398,0.535466 -0.7456,0.926247 -0.7456,0.926247 -0.56495,0.174247 -2.1408,-0.506057 -2.85691,-0.805867 -0.71611,-0.301028 -2.53798,-0.39078 -2.77242,-0.655923 -0.24083,-0.270324 0.11528,-0.866057 0.21006,-1.431085 0.0845,-0.571352 -0.18065,-0.926247 -0.0897,-1.311847 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/logout.png b/Themes/_res/svgs/settingsicons/logout.png
new file mode 100644
index 0000000000..7c081d7ab7
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/logout.png differ
diff --git a/Themes/_res/svgs/settingsicons/logout.svg b/Themes/_res/svgs/settingsicons/logout.svg
deleted file mode 100644
index a901647358..0000000000
--- a/Themes/_res/svgs/settingsicons/logout.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 21.333333,0 H 2.6666667 C 1.1866667,0 0,1.1866667 0,2.6666667 V 8 H 2.6666667 V 2.6666667 H 21.333333 V 21.333333 H 2.6666667 V 16 H 0 v 5.333333 A 2.6666667,2.6666667 0 0 0 2.6666667,24 H 21.333333 A 2.6666667,2.6666667 0 0 0 24,21.333333 V 2.6666667 C 24,1.1866667 22.8,0 21.333333,0 M 9.44,16.773333 11.333333,18.666667 18,12 11.333333,5.3333333 9.44,7.2133333 12.893333,10.666667 H 0 v 2.666666 h 12.893333 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/members.svg b/Themes/_res/svgs/settingsicons/members.svg
deleted file mode 100644
index aa08df8d6f..0000000000
--- a/Themes/_res/svgs/settingsicons/members.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 9.6,2.400003 A 4.7999994,4.7999994 0 0 0 4.8,7.2000028 4.7999994,4.7999994 0 0 0 9.6,12.000002 4.7999994,4.7999994 0 0 0 14.4,7.2000028 4.7999994,4.7999994 0 0 0 9.6,2.400003 Z m 5.61211,0.06914 A 15.599998,10.799999 0 0 1 16.8,7.2000018 15.599998,10.799999 0 0 1 15.20508,11.926759 4.7999994,4.7999994 0 0 0 19.2,7.2000018 4.7999994,4.7999994 0 0 0 15.21211,2.469143 Z M 9.6,13.050001 A 9.5999988,8.399999 0 0 0 0,21.45 9.5999988,8.399999 0 0 0 0.006,21.6 h 19.18535 a 9.5999988,8.399999 0 0 0 0.009,-0.15 9.5999988,8.399999 0 0 0 -9.6,-8.399999 z m 8.74805,0.754687 A 11.399999,9.8999988 0 0 1 21.6,20.7 11.399999,9.8999988 0 0 1 21.5432,21.6 h 2.44805 a 9.5999988,8.399999 0 0 0 0.009,-0.15 9.5999988,8.399999 0 0 0 -5.65195,-7.645312 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/merchandise.png b/Themes/_res/svgs/settingsicons/merchandise.png
new file mode 100644
index 0000000000..a104717630
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/merchandise.png differ
diff --git a/Themes/_res/svgs/settingsicons/merchandise.svg b/Themes/_res/svgs/settingsicons/merchandise.svg
deleted file mode 100644
index 30aa22d2db..0000000000
--- a/Themes/_res/svgs/settingsicons/merchandise.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 4.3574219 0 L -0.001953125 7.5 L 23.966797 7.5 L 19.609375 0 L 4.3574219 0 z M -0.001953125 9 C -0.015449742 9.3262497 -0.001953125 10.07325 -0.001953125 10.5 C -0.001953125 11.298749 0.28466319 12.171751 0.74804688 12.75 L 0.77148438 21 C 0.77148438 22.656748 2.15521 24 3.8632812 24 L 20.101562 24 C 21.809634 24 23.242188 22.656748 23.242188 21 L 23.242188 12.75 C 23.767056 12.132001 23.992187 11.497499 23.992188 10.5 L 23.992188 9 L 0.017578125 9 L -0.001953125 9 z M 17.59375 11.570312 C 18.273829 12.695311 19.241189 13.5 20.242188 13.5 C 20.461882 13.5 21.550236 13.536 21.742188 13.5 L 21.742188 18 L 2.25 18 L 2.2480469 13.5 L 3.7207031 13.5 C 4.526001 13.5 5.8031356 12.78114 6.34375 11.681641 C 6.9503478 12.75039 8.0808808 13.5 9.1621094 13.5 C 10.304072 13.5 11.562527 12.82039 11.982422 11.837891 C 12.403066 12.79714 13.633234 13.5 14.751953 13.5 C 15.861675 13.5 17.011897 12.684811 17.59375 11.570312 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/nitro.png b/Themes/_res/svgs/settingsicons/nitro.png
new file mode 100644
index 0000000000..20c60d7192
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/nitro.png differ
diff --git a/Themes/_res/svgs/settingsicons/nitro.svg b/Themes/_res/svgs/settingsicons/nitro.svg
deleted file mode 100644
index 8571f16f5e..0000000000
--- a/Themes/_res/svgs/settingsicons/nitro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12.746113,20.388252 C 10.540714,19.684668 8.57313,17.998018 7.5909878,15.969184 6.9868967,14.721298 6.5803443,14.311664 5.9459376,14.311664 c -0.4634607,0 -1.0489454,-0.248561 -1.3010747,-0.552358 C 3.9176431,12.88306 4.8191319,12.1565 6.7915737,12.02915 8.3509193,11.928472 8.5113686,11.832225 8.5113686,10.997516 8.5113686,10.185338 8.3378995,10.06536 7.038414,9.978768 4.5640898,9.8138899 3.9083856,9.5644549 3.9083856,8.7880841 c 0,-0.8646508 0.7184557,-1.0674222 4.2347444,-1.1951803 2.479048,-0.090072 2.57767,-0.1288773 2.57767,-1.0142515 0,-0.8706568 -0.123157,-0.9264998 -2.2703134,-1.0294188 -2.5156617,-0.120582 -3.509523,-0.758048 -2.7009078,-1.732371 0.6606915,-0.796085 9.4156132,-0.778469 12.1191152,0.02439 4.208303,1.249731 6.888179,5.7560731 5.940746,9.9896525 -1.110756,4.963376 -6.341554,8.063726 -11.063327,6.557347 z m 4.799156,-4.425747 c 0.594108,-0.307226 1.331562,-1.04468 1.638787,-1.638788 1.600454,-3.094934 -0.460623,-6.6403488 -3.860272,-6.6403488 -3.397905,0 -5.4607616,3.5453458 -3.861877,6.6372468 1.047557,2.025753 3.868651,2.787161 6.083362,1.64189 z m -4.382418,-3.876439 c -0.0068,-1.173917 0.620524,-2.2053611 2.160933,-2.1932659 1.540408,0.012097 2.258388,0.7985969 2.209432,2.2094319 -0.04896,1.410835 -0.808423,2.224732 -2.209432,2.209432 -1.401009,-0.0153 -2.154148,-1.051682 -2.160933,-2.225598 z M 0.21066207,9.321961 C -0.44997653,8.5259406 0.55685787,7.5050004 1.6578915,7.8544552 2.567706,8.1432187 2.6969247,9.3454229 1.8529549,9.6692833 0.98404417,10.002717 0.73127417,9.9492592 0.21066207,9.321961 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/notifications.png b/Themes/_res/svgs/settingsicons/notifications.png
new file mode 100644
index 0000000000..67a3784d6f
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/notifications.png differ
diff --git a/Themes/_res/svgs/settingsicons/notifications.svg b/Themes/_res/svgs/settingsicons/notifications.svg
deleted file mode 100644
index a3a6255f79..0000000000
--- a/Themes/_res/svgs/settingsicons/notifications.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.882812 0.001953125 C 11.858469 0.0029557157 11.83483 0.0080205468 11.810547 0.009765625 C 11.046701 0.064658557 10.323369 0.48563765 10.041016 1.2578125 C 9.7996137 1.7231499 9.330433 2.1789807 8.9589844 2.296875 C 8.5647414 2.4220019 7.6039377 3.1024015 6.8222656 3.8085938 C 5.2769595 5.2046854 4.2988281 7.6909572 4.2988281 10.224609 C 4.2988281 11.152973 3.9954167 12.051864 3.4257812 12.8125 C 3.0710045 13.286236 2.8008914 13.729273 2.5976562 14.146484 C 2.5865619 14.167773 2.5751065 14.187914 2.5644531 14.208984 C 2.5410019 14.258656 2.5173724 14.308548 2.4960938 14.357422 C 2.2835194 14.813078 2.1740009 15.218494 2.1816406 15.582031 C 2.1819404 15.596298 2.1809972 15.610856 2.1816406 15.625 C 2.1756526 15.870337 2.2059847 16.103587 2.2753906 16.322266 C 2.5091994 17.058932 4.5976228 18.042348 7.0429688 18.568359 C 7.7487022 18.720168 9.8626522 18.799287 12 18.773438 C 14.137348 18.799287 16.251298 18.720168 16.957031 18.568359 C 19.402377 18.042348 21.490801 17.058932 21.724609 16.322266 C 21.794015 16.103587 21.824347 15.870337 21.818359 15.625 C 21.819003 15.610856 21.81806 15.596298 21.818359 15.582031 C 21.825999 15.218494 21.716481 14.813078 21.503906 14.357422 C 21.482628 14.308548 21.458998 14.258656 21.435547 14.208984 C 21.424893 14.187914 21.413438 14.167773 21.402344 14.146484 C 21.199109 13.729273 20.928995 13.286236 20.574219 12.8125 C 20.004583 12.051864 19.701172 11.152973 19.701172 10.224609 C 19.701172 7.6909575 18.723041 5.2046854 17.177734 3.8085938 C 16.396062 3.1024015 15.435259 2.4220019 15.041016 2.296875 C 14.669568 2.1789807 14.200387 1.7231499 13.958984 1.2578125 C 13.676631 0.48563764 12.953299 0.064658558 12.189453 0.009765625 C 12.126305 0.0052275732 12.063411 0.0053704739 12 0.005859375 C 11.960973 0.0055584777 11.921773 0.00034849242 11.882812 0.001953125 z M 11.984375 20.746094 C 11.951187 20.746094 11.923581 20.747965 11.890625 20.748047 C 10.139928 20.752326 8.7226562 20.839339 8.7226562 20.947266 C 8.7226562 20.960494 8.7257259 20.976395 8.7265625 20.990234 C 8.7120271 21.000817 8.7026092 21.010579 8.703125 21.021484 C 8.7351485 21.699286 9.7638566 23.087726 10.560547 23.529297 C 11.16484 23.864233 11.563815 24.012651 12 23.992188 C 12.436185 24.012651 12.83516 23.864233 13.439453 23.529297 C 14.236143 23.087726 15.264851 21.699286 15.296875 21.021484 C 15.297388 21.010579 15.287975 21.000817 15.273438 20.990234 C 15.274274 20.976395 15.277344 20.960494 15.277344 20.947266 C 15.277344 20.839339 13.860072 20.752326 12.109375 20.748047 C 12.065469 20.74794 12.028692 20.746094 11.984375 20.746094 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/overlay.png b/Themes/_res/svgs/settingsicons/overlay.png
new file mode 100644
index 0000000000..1156213311
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/overlay.png differ
diff --git a/Themes/_res/svgs/settingsicons/overlay.svg b/Themes/_res/svgs/settingsicons/overlay.svg
deleted file mode 100644
index 0a0ad9c18c..0000000000
--- a/Themes/_res/svgs/settingsicons/overlay.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 2,3 C 0.89200007,3 0,4.0035001 0,5.25 v 13.5 C 0,19.9965 0.89200007,21 2,21 h 20 c 1.108,0 2,-1.0035 2,-2.25 V 5.25 C 24,4.0035001 23.108,3 22,3 Z M 3.6660156,5.25 H 20.333984 C 21.257318,5.25 22,6.002625 22,6.9375 v 10.125 C 22,17.997375 21.257318,18.75 20.333984,18.75 H 3.6660156 C 2.7426823,18.75 2,17.997375 2,17.0625 V 6.9375 C 2,6.002625 2.7426823,5.25 3.6660156,5.25 Z M 13.666016,6.2995605 C 13.296682,6.2995605 13,6.6001711 13,6.9741211 v 4.0495599 c 0,0.37395 0.296682,0.676758 0.666016,0.676758 h 6.667968 C 20.703318,11.700439 21,11.397631 21,11.023681 V 6.9741211 c 0,-0.37395 -0.296682,-0.6745606 -0.666016,-0.6745606 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/overview.svg b/Themes/_res/svgs/settingsicons/overview.svg
deleted file mode 100644
index c376be7a33..0000000000
--- a/Themes/_res/svgs/settingsicons/overview.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.999999,0 C 5.3725824,5.5228472e-7 0,5.3725834 0,12 c 0,6.627417 5.3725824,11.999999 11.999999,12 6.627417,0 12,-5.372583 12,-12 0,-6.627417 -5.372583,-12 -12,-12 z m 0,2.4 c 5.301934,0 9.6,4.2980664 9.6,9.6 0,5.301934 -4.298066,9.6 -9.6,9.6 -5.301933,-1e-6 -9.5999986,-4.298067 -9.5999986,-9.6 0,-5.301933 4.2980656,-9.5999992 9.5999986,-9.6 z m -1.2,3.6 v 2.4 h 2.4 V 6 Z m -0.6,4.189831 v 2.4 h 0.6 V 14.4 H 8.9999994 v 2.4 h 1.7999996 2.4 1.8 v -2.4 h -1.8 v -1.810169 -2.4 h -2.4 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/partner.svg b/Themes/_res/svgs/settingsicons/partner.svg
deleted file mode 100644
index fa4cbdf960..0000000000
--- a/Themes/_res/svgs/settingsicons/partner.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12.037109 4.5644531 C 10.515007 4.5542257 8.963827 5.0040687 7.65625 5.8222656 L 1.1171875 10.185547 C 0.02754564 11.05829 -0.40882727 12.586805 0.46289062 13.677734 C 1.1166844 14.986849 2.6435842 15.205339 3.9511719 14.550781 L 9.3984375 10.839844 L 10.488281 10.185547 C 11.142075 9.7491747 11.796251 9.5318142 12.667969 9.75 C 12.885915 9.9681859 13.321138 10.186112 13.539062 10.404297 C 13.974933 10.622483 14.193036 10.622483 14.628906 10.404297 L 17.679688 8.4414062 C 17.897655 8.2232205 18.115623 7.785981 17.679688 7.3496094 C 16.590067 6.0404944 15.282519 5.1687936 13.539062 4.7324219 C 13.048723 4.6233289 12.544477 4.5678623 12.037109 4.5644531 z M 21.486328 8.9453125 C 20.98576 8.9453125 20.486815 9.0670409 20.078125 9.3125 L 19.423828 9.75 L 15.064453 12.804688 L 13.539062 13.677734 C 12.885269 14.114106 12.231093 14.113281 11.359375 14.113281 C 11.141451 13.895095 10.705379 13.67717 10.269531 13.458984 C 10.051586 13.240799 9.6163615 13.240799 9.3984375 13.458984 L 6.3476562 15.421875 C 6.1297104 15.640061 5.9109822 16.077191 6.1289062 16.513672 C 7.21857 17.822787 8.5260738 18.694488 10.269531 19.130859 C 10.923325 19.349045 11.359878 19.349609 12.013672 19.349609 C 13.539184 19.349609 14.846731 18.913759 16.154297 18.041016 L 22.910156 13.677734 C 23.564059 13.241363 24 12.368837 24 11.496094 C 24 11.059722 24.00017 10.623308 23.564453 9.96875 C 23.155764 9.2869193 22.320608 8.9453125 21.486328 8.9453125 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/party.png b/Themes/_res/svgs/settingsicons/party.png
new file mode 100644
index 0000000000..7278bf4e78
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/party.png differ
diff --git a/Themes/_res/svgs/settingsicons/party.svg b/Themes/_res/svgs/settingsicons/party.svg
deleted file mode 100644
index 1d07a30cf4..0000000000
--- a/Themes/_res/svgs/settingsicons/party.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 0.37614669,23.954702 c -0.05887,-0.02433 -0.162185,-0.103585 -0.229583,-0.176117 -0.251464,-0.270621 -0.233348,-0.355593 0.487463,-2.286362 0.36785801,-0.985345 0.68611801,-1.834795 0.70724601,-1.887668 0.03258,-0.08153 0.09632,-0.04044 0.419738,0.270623 0.870466,0.837211 2.138004,1.530388 3.59257,1.964667 0.264928,0.0791 0.517814,0.155779 0.561969,0.170403 0.09991,0.03309 -5.11438501,1.991191 -5.29855901,1.989745 -0.07359,-5.77e-4 -0.181971,-0.02096 -0.240844,-0.04529 z M 7.7620167,21.06328 c -1.933685,-0.349085 -3.263223,-0.817398 -4.335184,-1.527014 -0.571841,-0.378547 -0.928787,-0.700978 -1.249004,-1.128228 l -0.265562,-0.354328 0.121854,-0.326304 c 0.06702,-0.179467 0.320817,-0.863155 0.563994,-1.519307 l 0.442141,-1.193002 0.594694,0.580722 c 0.327082,0.319397 0.751243,0.702091 0.94258,0.850432 1.746505,1.354038 4.253846,2.543632 6.7436213,3.199472 0.580532,0.15292 0.651314,0.183128 0.535208,0.228406 -0.430906,0.168043 -3.5226013,1.296249 -3.5391703,1.291496 -0.01098,-0.0031 -0.260807,-0.0492 -0.555172,-0.102345 z M 13.610513,18.789834 C 9.6129587,18.245198 5.4651777,16.150436 3.7043647,13.786914 l -0.142704,-0.191552 0.820608,-2.21499 c 0.451334,-1.218245 0.89857,-2.4006761 0.993855,-2.6276251 0.190804,-0.454448 0.399367,-0.678572 0.80431,-0.864318 0.366776,-0.168239 1.108545,-0.148606 1.715385,0.0454 0.985533,0.315079 2.2056383,1.025829 3.4008413,1.981097 0.743649,0.5943631 2.158056,2.0151281 2.768313,2.7807551 0.99118,1.243534 1.714971,2.463489 2.030205,3.421928 0.09688,0.294561 0.123126,0.494036 0.123126,0.935877 0,0.521637 -0.0112,0.581734 -0.157694,0.845972 -0.217607,0.392516 -0.415394,0.548366 -0.985038,0.776184 -0.541547,0.216579 -0.650941,0.225105 -1.465059,0.114188 z m 1.285827,-1.426167 c 0.173187,-0.173051 -0.02321,-1.00642 -0.419676,-1.780841 -0.52518,-1.025829 -1.361405,-2.129963 -2.485736,-3.282118 -1.456225,-1.49226 -2.8563973,-2.5215951 -4.1324243,-3.0379441 -0.522061,-0.211254 -1.081254,-0.29301 -1.219573,-0.178306 -0.212523,0.17624 -0.02899,0.9811871 0.420839,1.8457201 1.342127,2.579459 4.5832293,5.593404 6.8416293,6.362126 0.417794,0.14221 0.890132,0.176089 0.994941,0.07136 z M 18.47,16.220751 c -0.120499,-0.120405 -0.120499,-0.995009 0,-1.115413 0.06981,-0.06975 0.237484,-0.08404 0.986312,-0.08404 1.107406,0 1.070416,-0.02218 1.070416,0.641744 0,0.663921 0.03699,0.641745 -1.070416,0.641745 -0.748828,0 -0.916506,-0.01429 -0.986312,-0.08404 z m -2.49254,-2.51831 c -0.676594,-0.132563 -0.73677,-0.264556 -0.529432,-1.161281 0.205209,-0.88752 0.577802,-1.479728 1.097996,-1.745183 0.211085,-0.107716 0.337785,-0.132836 0.662415,-0.131329 0.445349,0.0021 0.716502,0.111196 1.284499,0.51696 l 0.294364,0.210287 0.03866,-0.471513 c 0.07137,-0.870436 0.242805,-1.2844431 0.644983,-1.5576371 0.667643,-0.453522 1.236727,-0.379555 2.184298,0.283904 l 0.415958,0.29124 0.08064,-0.252557 c 0.04435,-0.138907 0.1087,-0.39695 0.143,-0.57343 0.110786,-0.570016 0.258473,-0.636987 1.049385,-0.475857 0.710651,0.144779 0.768633,0.280157 0.527262,1.231072 -0.2394,0.9431491 -0.542405,1.3961381 -1.125859,1.6831451 -0.307871,0.151445 -0.382302,0.167063 -0.681718,0.143048 -0.37223,-0.02986 -0.637963,-0.145775 -1.151721,-0.502409 -0.185388,-0.128691 -0.344403,-0.233983 -0.353366,-0.233983 -0.009,0 -0.03213,0.225042 -0.05148,0.500093 -0.06696,0.951848 -0.27828,1.355065 -0.860182,1.641309 -0.317497,0.156181 -0.385244,0.170127 -0.712404,0.146661 -0.4147,-0.02975 -0.650737,-0.13471 -1.253538,-0.557452 l -0.410309,-0.287747 -0.0813,0.254554 c -0.04471,0.140005 -0.109362,0.398947 -0.143661,0.575427 -0.110741,0.569785 -0.252587,0.632535 -1.06849,0.472678 z M 14.638726,9.5324389 c -0.392933,-0.260219 -0.534494,-0.393922 -0.534494,-0.504825 0,-0.135867 0.681973,-0.994172 1.29636,-1.631548 1.99751,-2.072256 4.468293,-3.38698 6.882939,-3.66247 0.787359,-0.08983 0.812196,-0.07159 0.812196,0.596431 0,0.336453 -0.02174,0.490925 -0.07685,0.54599 -0.04374,0.04371 -0.24549,0.09292 -0.468307,0.114221 -2.009241,0.192124 -4.147838,1.28246 -5.967847,3.04263 -0.329426,0.318595 -0.750902,0.774859 -0.936614,1.01392 -0.414667,0.533786 -0.553161,0.68012 -0.643685,0.68012 -0.03853,0 -0.202191,-0.08751 -0.363698,-0.194469 z m -4.159123,-0.995433 c -0.113193,-0.122797 -0.282389,-0.801537 -0.282389,-1.13282 0,-0.239266 0.174695,-0.381096 0.561968,-0.456247 0.176619,-0.03427 0.434865,-0.09857 0.573881,-0.142887 l 0.252756,-0.08057 -0.291469,-0.415631 c -0.663981,-0.946826 -0.738006,-1.515463 -0.284128,-2.18258 0.273409,-0.401862 0.687742,-0.573158 1.558863,-0.644476 l 0.471884,-0.03863 -0.210453,-0.294132 c -0.406082,-0.567551 -0.515297,-0.838491 -0.517366,-1.283489 -0.0015,-0.324374 0.02363,-0.450974 0.131433,-0.661894 0.265663,-0.51978503 0.858337,-0.89208503 1.746556,-1.09713303 0.911968,-0.21053 1.029347,-0.152679 1.166714,0.575033 0.04642,0.245909 0.0844,0.51245003 0.0844,0.59231303 0,0.2102 -0.193137,0.357748 -0.561968,0.42932 -0.176619,0.03427 -0.435764,0.09887 -0.57588,0.143551 l -0.254754,0.08124 0.295008,0.418288 c 0.162255,0.230059 0.354933,0.546913 0.428174,0.704119 0.324936,0.697448 0.03952,1.560452 -0.62254,1.882326 -0.292082,0.142002 -0.83205,0.24555 -1.290418,0.24746 -0.139823,5.83e-4 -0.254224,0.01194 -0.254224,0.02524 0,0.0133 0.105375,0.175739 0.234167,0.360981 0.354389,0.50972 0.472981,0.779573 0.502146,1.14261 0.02229,0.277482 0.0037,0.377999 -0.121401,0.656552 -0.268489,0.597803 -0.731134,0.910796 -1.714834,1.160135 -0.658894,0.167011 -0.880369,0.169457 -1.026126,0.01133 z M 7.7658397,3.8136899 c -0.124628,-0.124529 -0.124628,-1.846542 0,-1.971072 0.1205,-0.120404 0.995792,-0.120404 1.116291,0 0.124628,0.12453 0.124628,1.846543 0,1.971072 -0.120499,0.120405 -0.995791,0.120405 -1.116291,0 z M 20.270958,2.0111649 c -0.183962,-0.185466 -0.332959,-0.383258 -0.332959,-0.442002 0,-0.135512 1.275548,-1.41494403 1.41065,-1.41494403 0.128219,0 0.783703,0.656285 0.783703,0.784662 0,0.13732103 -1.282064,1.40796503 -1.42062,1.40796503 -0.06126,0 -0.251593,-0.144954 -0.440774,-0.335681 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/paymentmodals.png b/Themes/_res/svgs/settingsicons/paymentmodals.png
new file mode 100644
index 0000000000..943e8e91da
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/paymentmodals.png differ
diff --git a/Themes/_res/svgs/settingsicons/paymentmodals.svg b/Themes/_res/svgs/settingsicons/paymentmodals.svg
deleted file mode 100644
index d607bb8b88..0000000000
--- a/Themes/_res/svgs/settingsicons/paymentmodals.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 14.666667,0 v 2.6663773 h 4.78125 L 8.390625,13.725073 10.276041,15.607681 21.333333,4.5515895 V 9.3323211 H 24 V 0 Z M 3.1666667,0.0026 C 1.4202533,0.0026039 0,1.4227031 0,3.168927 v 17.66475 C 0,22.581487 1.4202533,24 3.1666667,24 H 20.833333 C 22.581333,24 24,22.581487 24,20.833677 v -6.165998 h -2.666667 v 6.665944 H 2.6666667 V 2.6689812 H 9.333333 V 0.0026039 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/pluginrepo.png b/Themes/_res/svgs/settingsicons/pluginrepo.png
new file mode 100644
index 0000000000..152781c53a
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/pluginrepo.png differ
diff --git a/Themes/_res/svgs/settingsicons/pluginrepo.svg b/Themes/_res/svgs/settingsicons/pluginrepo.svg
deleted file mode 100644
index 1e6792d06b..0000000000
--- a/Themes/_res/svgs/settingsicons/pluginrepo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 4.0800781 0 C 2.4895961 5.9211895e-16 1.1992188 1.343249 1.1992188 3 L 1.1992188 21 C 1.1992188 22.656722 2.4895961 24 4.0800781 24 L 22.800781 24 L 22.800781 3 L 21.359375 3 L 21.359375 22.5 L 4.0800781 22.5 C 3.2848371 22.5 2.640625 21.829081 2.640625 21 C 2.640625 20.170919 3.2848371 19.5 4.0800781 19.5 L 19.919922 19.5 L 19.919922 0 L 4.0800781 0 z M 10.166016 2.5 C 11.086017 2.5 11.832031 3.2460149 11.832031 4.1660156 L 11.832031 5.1660156 L 14.501953 5.1660156 C 15.235286 5.1660157 15.833984 5.7647143 15.833984 6.4980469 L 15.833984 9.1679688 L 16.833984 9.1679688 C 17.753984 9.1679688 18.5 9.9139846 18.5 10.833984 C 18.5 11.753984 17.753984 12.501953 16.833984 12.501953 L 15.833984 12.501953 L 15.833984 15.166016 C 15.833984 15.89935 15.235286 16.5 14.501953 16.5 L 11.966797 16.5 L 11.966797 15.5 C 11.966797 14.506668 11.15935 13.699219 10.166016 13.699219 C 9.1726836 13.699219 8.3671875 14.506668 8.3671875 15.5 L 8.3671875 16.5 L 5.8320312 16.5 C 5.0986973 16.5 4.5 15.89935 4.5 15.166016 L 4.5 12.632812 L 5.5 12.632812 C 6.4933326 12.632812 7.3007812 11.827316 7.3007812 10.833984 C 7.3007812 9.8406502 6.4933326 9.0332031 5.5 9.0332031 L 4.5058594 9.0332031 L 4.5058594 6.4980469 C 4.5058594 5.7647143 5.0986972 5.1660156 5.8320312 5.1660156 L 8.4980469 5.1660156 L 8.4980469 4.1660156 C 8.4980469 3.2460149 9.2460166 2.5 10.166016 2.5 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/plugins.png b/Themes/_res/svgs/settingsicons/plugins.png
new file mode 100644
index 0000000000..6b34c83ce6
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/plugins.png differ
diff --git a/Themes/_res/svgs/settingsicons/plugins.svg b/Themes/_res/svgs/settingsicons/plugins.svg
deleted file mode 100644
index 56c5fb5258..0000000000
--- a/Themes/_res/svgs/settingsicons/plugins.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 21.142857,11.428571 H 19.428571 V 6.8571429 C 19.428571,5.6 18.4,4.5714286 17.142857,4.5714286 H 12.571429 V 2.8571429 C 12.571429,1.28 11.291429,0 9.714286,0 8.137143,0 6.8571429,1.28 6.8571429,2.8571429 V 4.5714286 H 2.2857143 C 1.0285714,4.5714286 0.0114286,5.6 0.0114286,6.8571429 V 11.2 H 1.7142857 C 3.4171429,11.2 4.8,12.582857 4.8,14.285714 c 0,1.702857 -1.3828571,3.085715 -3.0857143,3.085715 H 0 v 4.342857 C 0,22.971429 1.0285714,24 2.2857143,24 H 6.6285714 V 22.285714 C 6.6285714,20.582857 8.011429,19.2 9.714286,19.2 11.417143,19.2 12.8,20.582857 12.8,22.285714 V 24 h 4.342857 C 18.4,24 19.428571,22.971429 19.428571,21.714286 v -4.571429 h 1.714286 C 22.72,17.142857 24,15.862857 24,14.285714 24,12.708571 22.72,11.428571 21.142857,11.428571 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/premium.svg b/Themes/_res/svgs/settingsicons/premium.svg
deleted file mode 100644
index 3a56d3072a..0000000000
--- a/Themes/_res/svgs/settingsicons/premium.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 14.788467,5.2306899 c 0.27683,-0.1663856 0.628056,-0.1495863 0.888087,0.043198 0.25919,0.1936006 0.377505,0.5231801 0.299988,0.8367761 l -1.600019,6.399813 c -0.08952,0.356746 -0.409544,0.606336 -0.77673,0.606336 H 2.4001992 c -0.367186,0 -0.6871778,-0.25043 -0.7767664,-0.606336 L 0.02348567,6.1106644 c -0.077589,-0.313596 0.0407985,-0.6431755 0.2999886,-0.8367761 0.2607981,-0.1919927 0.6111847,-0.208792 0.88877023,-0.043198 L 4.5585211,7.2386215 7.3352153,3.0731721 c 0.018971,-0.028451 0.045418,-0.047254 0.071949,-0.066105 0.015983,-0.011364 0.032003,-0.022751 0.046438,-0.036287 L 6.6832322,2.1996054 c -0.1551901,-0.1551901 -0.1551901,-0.4103844 0,-0.5655745 L 7.7175928,0.59967034 c 0.1552021,-0.1551901 0.4103844,-0.1551901 0.5655865,0 L 9.3175402,1.6340309 c 0.15519,0.1551901 0.15519,0.4103844 0,0.5655745 L 8.5471692,2.97078 c 0.014423,0.013812 0.030743,0.025391 0.047086,0.036995 0.026243,0.018623 0.05257,0.037307 0.071301,0.065397 L 11.442275,7.2386215 Z M 1.6003337,13.916703 H 14.399802 v 1.600019 H 1.6003337 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/privacy.png b/Themes/_res/svgs/settingsicons/privacy.png
new file mode 100644
index 0000000000..f15f0fdc97
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/privacy.png differ
diff --git a/Themes/_res/svgs/settingsicons/privacy.svg b/Themes/_res/svgs/settingsicons/privacy.svg
deleted file mode 100644
index a71cd61800..0000000000
--- a/Themes/_res/svgs/settingsicons/privacy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 9.1518213,22.71712 C 6.7923483,21.128158 4.7924663,18.828028 3.6299503,16.366236 2.0783183,13.080432 1.4410633,7.59899 2.3986723,5.775205 3.0469473,4.540551 10.595173,0 11.99939,0 c 1.404217,0 8.952443,4.540551 9.600718,5.775205 0.961931,1.832017 0.31946,7.307167 -1.246583,10.623381 C 18.679783,19.942864 14.200806,24 11.96175,24 11.464021,24 10.199553,23.422704 9.1518213,22.71712 Z M 14.95435,18.49333 c 1.487025,-1.487025 2.384791,-2.780041 2.913984,-4.196891 l 0.683761,-2.154793 H 15.327647 12.022132 L 11.917497,7.580179 11.812861,3.12588 8.5603353,5.075893 l -3.252526,1.950013 -0.01172,2.518135 -0.01172,2.597605 h 3.357512 3.3575127 l -1.02e-4,4.210685 c -6e-6,0.275421 0,4.290156 0,4.290156 0.221596,0 1.773026,-0.967121 2.955062,-2.149157 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/profile.png b/Themes/_res/svgs/settingsicons/profile.png
new file mode 100644
index 0000000000..508ec9ff77
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/profile.png differ
diff --git a/Themes/_res/svgs/settingsicons/profile.svg b/Themes/_res/svgs/settingsicons/profile.svg
deleted file mode 100644
index 92cbe8665e..0000000000
--- a/Themes/_res/svgs/settingsicons/profile.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 0.25971638,23.740007 c -0.39884934,-0.398849 -0.34026517,-1.967348 0.18927271,-5.067491 l 0.4650226,-2.722443 5.40939981,-5.480529 c 2.97517,-3.0142911 5.7021335,-5.4805291 6.0599205,-5.4805291 0.833241,0 6.627377,5.8116901 6.627377,6.6474551 0,0.346743 -2.466238,3.064672 -5.480529,6.039842 l -5.4805292,5.4094 -2.7224427,0.465023 c -3.100143,0.529537 -4.66864281,0.588122 -5.06749172,0.189272 z M 17.690349,7.1605449 c -3.945559,-3.805892 -4.029109,-4.008863 -2.359365,-5.731602 2.069904,-2.13559899 3.275919,-1.93959299 6.227654,1.012143 2.936253,2.936252 3.144347,4.161039 1.051597,6.189413 -0.750185,0.727107 -1.512808,1.322014 -1.694717,1.322014 -0.181909,0 -1.633236,-1.256386 -3.225169,-2.791968 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/questionmark.png b/Themes/_res/svgs/settingsicons/questionmark.png
new file mode 100644
index 0000000000..5ecb2a2743
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/questionmark.png differ
diff --git a/Themes/_res/svgs/settingsicons/questionmark.svg b/Themes/_res/svgs/settingsicons/questionmark.svg
deleted file mode 100644
index b4c8d9183f..0000000000
--- a/Themes/_res/svgs/settingsicons/questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12,0 C 5.3832,0 0,5.3844 0,12 0,18.618 5.3832,24 12,24 18.6168,24 24,18.618 24,12 24,5.3844 18.6168,0 12,0 Z m 0,19.5 c -0.828,0 -1.5,-0.6708 -1.5,-1.5 0,-0.828 0.672,-1.5 1.5,-1.5 0.828,0 1.5,0.672 1.5,1.5 0,0.8292 -0.672,1.5 -1.5,1.5 z m 1.2,-5.25 V 15.6 H 10.8 V 12 H 12 c 1.3248,0 2.4,-1.0764 2.4,-2.4 C 14.4,8.2752 13.3248,7.2 12,7.2 10.6752,7.2 9.6,8.2752 9.6,9.6 H 7.2 c 0,-2.646 2.154,-4.8 4.8,-4.8 2.646,0 4.8,2.154 4.8,4.8 0,2.2332 -1.5324,4.1148 -3.6,4.65 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/roles.svg b/Themes/_res/svgs/settingsicons/roles.svg
deleted file mode 100644
index 9c520a947e..0000000000
--- a/Themes/_res/svgs/settingsicons/roles.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 2.7,0 C 2.130708,0 1.643482,0.3178722 1.389258,0.7828125 H 1.2 V 1.5 12.9 24 h 2.4 v -9.6 h 6.516211 c 0,0 -2.916211,2.199945 -2.916211,3.104297 V 17.7 c 0,0.831 0.695526,1.5 1.559766,1.5 H 21.240234 C 22.104474,19.2 22.8,18.531 22.8,17.7 V 6.3 C 22.8,5.469 22.104474,4.8 21.240234,4.8 H 16.2 V 1.5 C 16.2,0.669 15.531,0 14.7,0 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/rules.svg b/Themes/_res/svgs/settingsicons/rules.svg
deleted file mode 100644
index 077c2b5a5c..0000000000
--- a/Themes/_res/svgs/settingsicons/rules.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 21.360026,22.500022 V 3.000006 h 1.440002 V 24 H 4.0800037 C 2.4895217,24 1.2,22.656766 1.2,21.000044 V 3.000006 C 1.2,1.343255 2.4895217,0 4.0800037,0 H 19.920024 V 19.499994 H 4.0800037 c -0.795241,0 -1.4400018,0.670969 -1.4400018,1.50005 0,0.829081 0.6447608,1.499978 1.4400018,1.499978 z M 14.859714,4.800009 9.040018,10.553911 6.750199,8.28778 4.8000047,10.204206 9.03973,14.400012 16.800044,6.720194 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/sessions.png b/Themes/_res/svgs/settingsicons/sessions.png
new file mode 100644
index 0000000000..6ec2b3e08e
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/sessions.png differ
diff --git a/Themes/_res/svgs/settingsicons/sessions.svg b/Themes/_res/svgs/settingsicons/sessions.svg
deleted file mode 100644
index b35d650554..0000000000
--- a/Themes/_res/svgs/settingsicons/sessions.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 15.238863,15.278476 c 0.02831,-5.11056 0.07406,-6.5708528 4.380569,-6.5708528 4.306511,0 4.380568,0.1110861 4.380568,6.5708528 0,6.459766 -0.07406,6.570853 -4.380568,6.570853 -5.185023,0.185601 -4.408877,-1.460293 -4.380569,-6.570853 z m 6.388329,-3.285427 c 0,-0.843818 -0.142111,-0.99278 -1.920581,-1.023099 -1.529407,-0.02607 -1.886667,0.09888 -1.962468,0.924602 -0.0758,0.825721 -0.04605,1.237135 1.962468,1.121596 1.775793,-0.102151 1.920581,-0.179281 1.920581,-1.023099 z M 0.27905044,20.215207 c -0.372067,-0.448314 -0.372067,-0.664012 0,-1.112325 C 0.66506443,18.637763 1.7330914,18.563065 6.8033393,18.646573 L 12.866,18.746423 v 1.883773 l -6.0626607,0.04131 c -0.00683,0.01033 -6.03583585,-0.0351 -6.52428886,-0.456308 z M 2.3501154,16.139846 c 0,0 0.034492,-10.8262813 0.5051092,-11.8591736 0.8122297,-1.78265 1.5037607,-2.1439025 9.0982114,-2.1439025 7.728854,0 9.513919,-0.00571 9.998781,1.7939887 0.711475,2.6408296 0.985274,2.6693635 -3.069551,2.5865803 C 16.052721,6.4595628 14.45805,7.1077753 13.698233,8.4376159 13.441311,8.8872842 12.9664,10.696377 12.931506,12.606071 L 12.866,16.191094 c -3.4898178,0.0371 -10.5158846,-0.05125 -10.5158846,-0.05125 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/settings.png b/Themes/_res/svgs/settingsicons/settings.png
new file mode 100644
index 0000000000..c6ecee1504
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/settings.png differ
diff --git a/Themes/_res/svgs/settingsicons/settings.svg b/Themes/_res/svgs/settingsicons/settings.svg
deleted file mode 100644
index eb336219a0..0000000000
--- a/Themes/_res/svgs/settingsicons/settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 21.2856,9.6 H 24 v 4.8 H 21.2868 C 20.9976,15.5172 20.52,16.5576 19.878,17.4768 L 21.6,19.2 19.2,21.6 17.478,19.8768 c -0.9216,0.642 -1.9596,1.1208 -3.078,1.4088 V 24 H 9.6 V 21.2856 C 8.4828,20.9976 7.4436,20.5188 6.5232,19.8768 L 4.8,21.6 2.4,19.2 4.1232,17.4768 C 3.4812,16.5588 3.0024,15.5184 2.7144,14.4 H 0 V 9.6 H 2.7144 C 3.0024,8.4816 3.48,7.4424 4.1232,6.5232 L 2.4,4.8 4.8,2.4 6.5232,4.1232 C 7.4424,3.48 8.4816,3.0024 9.6,2.7144 V 0 h 4.8 v 2.7132 c 1.1184,0.2892 2.1564,0.7668 3.078,1.4088 l 1.722,-1.7232 2.4,2.4 -1.7232,1.7244 c 0.642,0.9192 1.1208,1.9596 1.4088,3.0768 z M 12,16.8 c 2.65092,0 4.8,-2.14908 4.8,-4.8 0,-2.650968 -2.14908,-4.8 -4.8,-4.8 -2.650968,0 -4.8,2.149032 -4.8,4.8 0,2.65092 2.149032,4.8 4.8,4.8 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/stickers.svg b/Themes/_res/svgs/settingsicons/stickers.svg
deleted file mode 100644
index ea560c2693..0000000000
--- a/Themes/_res/svgs/settingsicons/stickers.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" fill-rule="evenodd" clip-rule="evenodd" d="m 14.400253,0.7951791 v 5.6879173 c 0,1.7254126 1.392362,3.1176358 3.118083,3.1176358 h 5.688846 c 0.70224,0 1.059241,-0.8448485 0.55944,-1.3446265 L 15.745095,0.23590637 C 15.245174,-0.26386802 14.400253,0.08121426 14.400253,0.7951791 Z m 3.090843,11.2398649 c -3.050763,0 -5.527253,-2.4767961 -5.527253,-5.5278852 V 0.06997693 H 2.3927662 C 1.0767454,0.06997693 0,1.1468286 0,2.4629824 V 21.607081 C 0,22.923132 1.0767454,24 2.3927662,24 H 21.53486 c 1.316041,0 2.392802,-1.076868 2.392802,-2.392919 v -9.572037 z m -3.091323,2.630543 c 0,1.325413 -1.074241,2.39988 -2.399522,2.39988 -1.325281,0 -2.3996181,-1.074467 -2.3996181,-2.39988 H 8.0009114 c 0,2.208941 1.7905577,3.99976 3.9993396,3.99976 2.208722,0 3.999244,-1.790819 3.999244,-3.99976 z M 5.3347129,15.9988 c 0,0.736393 -0.5968565,1.333333 -1.3331052,1.333333 -0.7362607,0 -1.3331052,-0.59694 -1.3331052,-1.333333 0,-0.736274 0.5968445,-1.333213 1.3331052,-1.333213 0.7362487,0 1.3331052,0.596939 1.3331052,1.333213 z m 14.6641461,1.333333 c 0.73632,0 1.333081,-0.59694 1.333081,-1.333333 0,-0.736274 -0.596761,-1.333213 -1.333081,-1.333213 -0.736201,0 -1.333082,0.596939 -1.333082,1.333213 0,0.736393 0.596881,1.333333 1.333082,1.333333 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/streamermode.png b/Themes/_res/svgs/settingsicons/streamermode.png
new file mode 100644
index 0000000000..a20cd3e4a4
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/streamermode.png differ
diff --git a/Themes/_res/svgs/settingsicons/streamermode.svg b/Themes/_res/svgs/settingsicons/streamermode.svg
deleted file mode 100644
index 02e049fb8c..0000000000
--- a/Themes/_res/svgs/settingsicons/streamermode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 23.4312,7.3788 C 23.0772,7.1592 22.6344,7.1412 22.2636,7.326 L 19.2,8.8584 V 6 C 19.2,4.6764 18.1236,3.6 16.8,3.6 H 2.4 C 1.0764,3.6 0,4.6764 0,6 v 12 c 0,1.3248 1.0764,2.4 2.4,2.4 h 14.4 c 1.3236,0 2.4,-1.0752 2.4,-2.4 v -2.8584 l 3.0636,1.5312 C 22.4328,16.758 22.6164,16.8 22.8,16.8 c 0.2196,0 0.438,-0.0612 0.6312,-0.1788 C 23.784,16.4016 24,16.0164 24,15.6 V 8.4 C 24,7.9836 23.784,7.5984 23.4312,7.3788 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/subscriptions.png b/Themes/_res/svgs/settingsicons/subscriptions.png
new file mode 100644
index 0000000000..d049e55b41
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/subscriptions.png differ
diff --git a/Themes/_res/svgs/settingsicons/subscriptions.svg b/Themes/_res/svgs/settingsicons/subscriptions.svg
deleted file mode 100644
index 35489afc67..0000000000
--- a/Themes/_res/svgs/settingsicons/subscriptions.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 4.78354,23.337271 C 4.0738396,23.050901 4.1907436,21.835821 5.2588408,18.397082 5.7847612,16.703882 6.2176588,15.19776 6.220834,15.050143 6.224074,14.902526 4.8412636,13.789901 3.1480636,12.577643 -1.4427717,9.2908038 -1.1319909,8.5002809 4.8692932,8.1993996 L 8.7070231,8.0069904 9.7919612,4.4823623 c 1.6260898,-5.28266393 2.7877528,-5.28266393 4.4138428,0 l 1.084938,3.5246281 3.83773,0.1924092 c 6.004604,0.3010479 6.314815,1.0943638 1.721229,4.4017704 -1.6932,1.219113 -3.075946,2.329249 -3.07277,2.466968 0.0032,0.137721 0.436073,1.635744 0.961993,3.328944 1.114125,3.586926 1.187152,4.639309 0.344369,4.962715 -0.726133,0.278644 -0.731568,0.275681 -4.289929,-2.338194 L 12.00798,18.975536 8.8567297,21.283832 c -1.7331885,1.269564 -3.2650905,2.133651 -3.3863421,2.116941 -0.1212516,-0.0167 -0.4222848,0.04325 -0.6868476,-0.0635 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/template.svg b/Themes/_res/svgs/settingsicons/template.svg
deleted file mode 100644
index 5bb6a07433..0000000000
--- a/Themes/_res/svgs/settingsicons/template.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 2.109375 0 C 0.94621875 0 0 0.94621875 0 2.109375 L 0 5 L 24 5 L 24 2.109375 C 24 0.94621875 23.053781 0 21.890625 0 L 2.109375 0 z M 0 8 L 0 21.84375 C 0 23.006906 0.94621875 24 2.109375 24 L 6 24 L 6 8 L 0 8 z M 9 8 L 9 17 L 24 17 L 24 8 L 9 8 z M 9 20 L 9 24 L 21.890625 24 C 23.053781 24 24 23.006906 24 21.84375 L 24 20 L 9 20 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/text.png b/Themes/_res/svgs/settingsicons/text.png
new file mode 100644
index 0000000000..bd47fa8308
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/text.png differ
diff --git a/Themes/_res/svgs/settingsicons/text.svg b/Themes/_res/svgs/settingsicons/text.svg
deleted file mode 100644
index 0ed141ff71..0000000000
--- a/Themes/_res/svgs/settingsicons/text.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.227437,7.5913776e-6 C 5.8008528,7.5913776e-6 2.9230543,0.13984759 2.2763692,0.43449759 0.45423604,1.2647166 0.28656524,2.1614446 0.30057434,10.977986 c 0.013755,8.655211 0.1434443,9.382027 1.84445386,10.324824 0.5780805,0.320405 2.2942086,0.485555 5.1301086,0.494126 l 4.2618392,0.01278 0.554472,-1.072027 c 1.104643,-2.136143 0.996104,-2.199429 -3.8181192,-2.199429 -5.1042134,0 -5.4478391,-0.240643 -3.624302,-2.543046 1.614228,-2.038129 2.362961,-2.38485 3.5171,-1.628629 0.50777,0.332704 1.039802,0.466734 1.182779,0.29818 0.142976,-0.168554 0.7940312,-1.001885 1.4461712,-1.851553 1.305018,-1.700302 2.742555,-2.055297 3.847227,-0.950626 0.549439,0.54944 0.634714,0.535854 1.137342,-0.181747 0.452094,-0.645455 0.909125,-0.775977 2.726923,-0.775977 1.20134,0 2.500672,0.169318 2.887373,0.376274 0.676954,0.362294 0.703562,0.214208 0.703562,-3.9814073 0,-7.34906211 0.07299,-7.2997201086224 -10.870067,-7.2997211086224 z M 5.4313928,3.0897156 c 0.209174,-9.48e-4 0.430423,0.05276 0.648896,0.169679 0.547503,0.293014 0.952625,0.293014 1.500128,0 0.873891,-0.467693 1.794757,0.07914 1.794757,1.066347 0,0.3309339 0.327146,0.8823086 0.7269902,1.2246661 0.399844,0.3423573 0.72699,0.7886766 0.72699,0.9925123 0,0.2038354 -0.327146,0.6508646 -0.72699,0.9932218 -0.3998442,0.3423575 -0.7269902,0.8930225 -0.7269902,1.2239564 0,0.9872065 -0.920866,1.5347508 -1.794757,1.0670569 -0.524204,-0.2805437 -0.962,-0.2884785 -1.453271,-0.025557 -0.386701,0.2069559 -0.762493,0.3762749 -0.835613,0.3762749 -0.353764,0 -1.005291,-0.9366688 -1.005291,-1.4454619 0,-0.3154291 -0.327146,-0.8539108 -0.72699,-1.1962683 C 3.1594072,7.1937856 2.8322612,6.7467564 2.8322612,6.542921 c 0,-0.2038357 0.327146,-0.650155 0.7269906,-0.9925122 0.399844,-0.3423576 0.72699,-0.8937323 0.72699,-1.2246662 0,-0.740405 0.517631,-1.233178 1.145151,-1.236026 z M 19.989658,13.226402 c -0.0048,8.36e-4 -0.0057,0.0078 -0.0057,0.0078 H 18.7742 17.563733 l -0.01136,0.02982 c -0.0408,0.0063 -0.295539,0.349306 -1.881372,4.910735 -0.03274,0.09417 -0.05753,0.160194 -0.08945,0.251322 -2.087363,5.458973 -2.134752,5.554862 -1.138052,5.534072 0.104095,0.01465 0.218294,0.0249 0.354976,0.03053 1.515346,0.06245 1.117361,-0.178201 1.294952,-1.052149 0.0092,-0.0252 0.01849,-0.04531 0.02769,-0.07171 0.214568,-0.61551 0.333034,-0.883472 0.839872,-1.000321 0.359138,-0.0534 0.892755,-0.0568 1.730862,-0.0568 2.287353,0 2.363023,0.03031 2.732603,1.090485 0.01789,0.05132 0.03613,0.093 0.05396,0.139861 0.108089,0.705211 -0.103755,0.935786 0.979732,0.922226 0.12584,0.01768 0.262669,0.0284 0.425971,0.0284 1.126596,0 1.204613,0.04513 -0.516135,-4.463464 -0.15528,-0.430422 -0.312848,-0.866448 -0.493416,-1.385826 -1.617642,-4.652931 -1.851655,-4.920853 -1.884918,-4.914991 z m -1.187039,2.666578 c 0.07745,0.0662 0.169496,0.208449 0.272622,0.413192 0.276597,0.732089 0.713661,1.987952 0.983282,2.814957 0.136676,0.784609 -0.244842,0.837743 -1.338258,0.837743 -0.327179,0 -0.61539,-0.01258 -0.859042,-0.02982 -0.387003,-0.09638 -0.479916,-0.342449 -0.338647,-0.947075 0.21693,-0.660494 0.521749,-1.548432 0.778817,-2.259065 0.204465,-0.486234 0.376893,-0.781115 0.501226,-0.829934 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/textcomponent.png b/Themes/_res/svgs/settingsicons/textcomponent.png
new file mode 100644
index 0000000000..28e8f6ad9e
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/textcomponent.png differ
diff --git a/Themes/_res/svgs/settingsicons/textcomponent.svg b/Themes/_res/svgs/settingsicons/textcomponent.svg
deleted file mode 100644
index 53f2ff41bd..0000000000
--- a/Themes/_res/svgs/settingsicons/textcomponent.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 0,1.091 V 4.3636999 H 6.5454546 V 22.909 H 9.818182 V 4.3636999 h 6.545455 V 1.091 Z M 12,8.7272994 V 12 h 4.363637 v 10.909 h 3.272726 V 12 H 24 V 8.7272994 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/textplayground.png b/Themes/_res/svgs/settingsicons/textplayground.png
new file mode 100644
index 0000000000..101976edda
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/textplayground.png differ
diff --git a/Themes/_res/svgs/settingsicons/textplayground.svg b/Themes/_res/svgs/settingsicons/textplayground.svg
deleted file mode 100644
index 23146653c1..0000000000
--- a/Themes/_res/svgs/settingsicons/textplayground.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 6,3.5 -6,17 h 2 l 1.6935937,-5 H 10.307109 L 12,20.5 h 2 L 8,3.5 Z M 6.867734,6.1289062 7.134531,6.129375 9.63,13.5 H 4.3710938 Z M 16,8.5 v 2 h 5 a 1.0008,1.0008 0 0 1 1,1 v 2 h -4 a 3.0033,3.0033 0 0 0 -3,3 v 1 a 3.0033,3.0033 0 0 0 3,3 h 6 v -9 a 3.0033,3.0033 0 0 0 -3,-3 z m 2,7 h 4 v 3 h -4 a 1.0008,1.0008 0 0 1 -1,-1 v -1 a 1.0008,1.0008 0 0 1 1,-1 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/themerepo.png b/Themes/_res/svgs/settingsicons/themerepo.png
new file mode 100644
index 0000000000..fcede6300f
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/themerepo.png differ
diff --git a/Themes/_res/svgs/settingsicons/themerepo.svg b/Themes/_res/svgs/settingsicons/themerepo.svg
deleted file mode 100644
index 7a7498c9df..0000000000
--- a/Themes/_res/svgs/settingsicons/themerepo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 4.0800781 0 C 2.4895958 5.9211895e-16 1.1992188 1.343249 1.1992188 3 L 1.1992188 21 C 1.1992188 22.656722 2.4895958 24 4.0800781 24 L 22.800781 24 L 22.800781 3 L 21.359375 3 L 21.359375 22.5 L 4.0800781 22.5 C 3.2848368 22.5 2.640625 21.829081 2.640625 21 C 2.640625 20.170919 3.2848368 19.5 4.0800781 19.5 L 19.919922 19.5 L 19.919922 0 L 4.0800781 0 z M 13.386719 2.5 C 13.507524 2.5 13.626592 2.5445557 13.71875 2.6367188 L 14.203125 3.1191406 C 14.341867 3.2579236 14.37949 3.4695295 14.298828 3.6484375 L 14.169922 3.9296875 L 14.4375 3.8007812 C 14.618197 3.7137013 14.832745 3.7526712 14.974609 3.8945312 L 16.513672 5.4296875 C 16.673194 5.5891474 16.69597 5.8400649 16.570312 6.0273438 L 15.566406 7.5273438 L 17.052734 6.5136719 C 17.240101 6.3863417 17.492135 6.412051 17.652344 6.5722656 L 18.361328 7.2773438 C 18.545673 7.4616964 18.545673 7.7609913 18.361328 7.9453125 L 14.615234 11.695312 L 9.3046875 6.3847656 L 13.052734 2.6367188 C 13.144904 2.5445588 13.265911 2.5 13.386719 2.5 z M 8.6074219 7.0820312 L 13.917969 12.392578 L 12.833984 13.476562 C 12.649668 13.660884 12.350331 13.660883 12.166016 13.476562 L 11.138672 12.447266 C 10.940919 12.249547 10.664308 12.153094 10.384766 12.183594 C 10.106106 12.214214 9.8614876 12.367332 9.7109375 12.603516 C 7.7839475 15.626636 7.5028018 15.909334 7.4101562 16.001953 C 6.7462802 16.665911 5.6633073 16.667233 4.9980469 16.001953 C 4.3334463 15.337303 4.3334463 14.254432 4.9980469 13.589844 C 5.0906289 13.497224 5.3732927 13.216233 8.3964844 11.289062 C 8.6332284 11.138133 8.7878015 10.893776 8.8183594 10.615234 C 8.8489525 10.336503 8.7509614 10.059558 8.5527344 9.8613281 L 7.5234375 8.8339844 C 7.4348865 8.7454894 7.3867188 8.6251874 7.3867188 8.5 C 7.3867188 8.3748114 7.4349143 8.2545393 7.5234375 8.1660156 L 8.6074219 7.0820312 z M 6.234375 14.101562 C 6.0636263 14.101562 5.8920017 14.164628 5.7617188 14.294922 C 5.5011532 14.555463 5.5011533 14.977709 5.7617188 15.238281 C 6.022253 15.498855 6.4445126 15.498855 6.7050781 15.238281 C 6.9656438 14.977709 6.9656438 14.555463 6.7050781 14.294922 C 6.5748112 14.164632 6.4051234 14.101562 6.234375 14.101562 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/themes.png b/Themes/_res/svgs/settingsicons/themes.png
new file mode 100644
index 0000000000..16f62d4efe
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/themes.png differ
diff --git a/Themes/_res/svgs/settingsicons/themes.svg b/Themes/_res/svgs/settingsicons/themes.svg
deleted file mode 100644
index f8763e8257..0000000000
--- a/Themes/_res/svgs/settingsicons/themes.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 15.234287,-2.5000473e-7 C 15.02721,-2.5000473e-7 14.820056,0.07834478 14.662059,0.23631857 L 8.2386669,6.6598939 17.339613,15.761099 23.763006,9.337523 c 0.315992,-0.3159477 0.315992,-0.8284847 0,-1.1444862 L 22.548244,6.9801939 C 22.273625,6.705567 21.84214,6.6642856 21.52097,6.8825414 l -2.552561,1.7343068 1.724492,-2.5702114 c 0.21539,-0.3210182 0.173831,-0.750065 -0.0996,-1.0233972 L 17.958711,2.3905307 C 17.715539,2.147353 17.344681,2.0830719 17.034946,2.2323338 L 16.579898,2.4530282 16.798634,1.9686723 C 16.936887,1.6620029 16.870459,1.3023022 16.632629,1.0644109 L 15.806514,0.23631857 C 15.648545,0.07834478 15.441364,-2.5000473e-7 15.234287,-2.5000473e-7 Z M 7.0434355,7.8551595 5.1841865,9.7144613 c -0.151739,0.1517432 -0.2363122,0.3576557 -0.2363122,0.5722437 0,0.214587 0.084519,0.420554 0.2363122,0.572243 l 1.7635523,1.763603 c 0.3397809,0.33979 0.505526,0.80928 0.4530942,1.287058 -0.052377,0.477455 -0.3168012,0.899444 -0.7226072,1.158157 -5.1821053,3.303397 -5.6651266,3.786402 -5.82382411,3.945158 -1.13920225,1.139181 -1.13920225,2.993361 0,4.13265 1.14033501,1.140368 2.99457091,1.138102 4.13253241,0 0.1588054,-0.158756 0.6419574,-0.642006 3.9450452,-5.823989 0.2580588,-0.404847 0.680468,-0.668188 1.1581247,-0.720676 0.479168,-0.05227 0.94805,0.112228 1.287022,0.451154 l 1.763552,1.763603 c 0.315939,0.315948 0.828515,0.315948 1.144454,0 l 1.859249,-1.859302 z M 2.9714457,19.885937 c 0.2926829,0 0.5852459,0.110645 0.808539,0.333971 0.4466403,0.446598 0.4466403,1.170471 0,1.617124 -0.4466402,0.446653 -1.1704915,0.446653 -1.6170779,0 -0.4466401,-0.446653 -0.4466401,-1.170526 0,-1.617124 0.2233201,-0.223326 0.5158561,-0.333971 0.8085389,-0.333971 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/threads.svg b/Themes/_res/svgs/settingsicons/threads.svg
deleted file mode 100644
index 5937354453..0000000000
--- a/Themes/_res/svgs/settingsicons/threads.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 4.2353102,18.352992 v 5.647074 l 7.5303738,-5.647074 h 9.410779 C 22.735055,18.352992 24,17.086635 24,15.529455 V 2.8235372 C 24,1.2649447 22.735055,0 21.176463,0 H 2.8235416 C 1.2649448,0 0,1.2649447 0,2.8235372 V 15.529455 c 0,1.55718 1.2649448,2.823537 2.8235416,2.823537 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/updatecheck.svg b/Themes/_res/svgs/settingsicons/updatecheck.svg
deleted file mode 100644
index b8f8d47cf1..0000000000
--- a/Themes/_res/svgs/settingsicons/updatecheck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.111347,0.18979943 3.409341,3.6116905 C 2.6171347,3.9637822 2.1,4.7559885 2.1,5.6252149 V 10.796562 C 2.1,16.903152 6.3251003,22.613639 12.002579,24 17.680057,22.613639 21.905158,16.903152 21.905158,10.796562 V 5.6252149 c 0,-0.8692264 -0.517135,-1.6614327 -1.309341,-2.0135244 L 12.893811,0.18979943 c -0.561146,-0.25306593 -1.221318,-0.25306593 -1.782464,0 z M 9.0208023,16.617077 6.1710602,13.767335 c -0.4291118,-0.429112 -0.4291118,-1.122292 0,-1.551404 0.4291117,-0.429112 1.1222922,-0.429112 1.551404,0 L 9.802006,14.28447 16.271691,7.8147851 c 0.429111,-0.4291117 1.122292,-0.4291117 1.551404,0 0.429111,0.4291117 0.429111,1.1222923 0,1.551404 l -7.250889,7.2508879 c -0.418109,0.429112 -1.122292,0.429112 -1.5514037,0 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/updates.png b/Themes/_res/svgs/settingsicons/updates.png
new file mode 100644
index 0000000000..96ffb96978
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/updates.png differ
diff --git a/Themes/_res/svgs/settingsicons/updates.svg b/Themes/_res/svgs/settingsicons/updates.svg
deleted file mode 100644
index 10d9999ec1..0000000000
--- a/Themes/_res/svgs/settingsicons/updates.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 12.000979,-8.8676194e-5 C 5.3736798,-8.8676194e-5 -5.1193583e-8,5.373591 -5.1193583e-8,12.000891 -5.1193583e-8,18.62813 5.3736798,23.999737 12.000979,23.999721 c 0.662738,0 1.198809,-0.538217 1.198809,-1.200957 0,-0.66274 -0.536071,-1.198809 -1.198809,-1.198809 -5.3018386,0 -9.601213,-4.297201 -9.601213,-9.599064 0,-5.3018395 4.2993744,-9.6012136 9.601213,-9.6012136 5.301878,0 9.599064,4.2993741 9.599064,9.6012136 0,0.662738 0.53607,1.198809 1.198809,1.198809 0.66274,0 1.200957,-0.536071 1.200957,-1.198809 0,-6.6273 -5.371591,-12.000979676194 -11.99883,-12.000979676194 z m 0,3.600723376194 c -0.66274,0 -1.200958,0.536106 -1.200958,1.1988089 v 7.2014474 c 0,0.318261 0.127209,0.621488 0.352338,0.84647 l 3.598575,3.600724 c 0.468593,0.468593 1.228647,0.468593 1.697239,0 0.468593,-0.468592 0.468593,-1.228647 0,-1.697239 L 13.199788,11.502461 V 4.7994436 c 0,-0.6627395 -0.53607,-1.1988089 -1.198809,-1.1988089 z M 22.981466,16.076411 c -0.285266,0.0082 -0.565176,0.139526 -0.754089,0.382415 l -3.944469,5.07238 -1.51892,-1.463063 c -0.393676,-0.379719 -1.021157,-0.367983 -1.400758,0.02578 -0.37972,0.393674 -0.367984,1.021156 0.02578,1.400758 l 2.311682,2.227894 c 0.20224,0.195187 0.476014,0.294994 0.756238,0.274996 0.280282,-0.02 0.540777,-0.158449 0.713269,-0.380267 l 4.621215,-5.942483 c 0.335846,-0.431714 0.257782,-1.054173 -0.17402,-1.390017 -0.188875,-0.14693 -0.414055,-0.214803 -0.635928,-0.208393 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/voice.png b/Themes/_res/svgs/settingsicons/voice.png
new file mode 100644
index 0000000000..e0123eafec
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/voice.png differ
diff --git a/Themes/_res/svgs/settingsicons/voice.svg b/Themes/_res/svgs/settingsicons/voice.svg
deleted file mode 100644
index 40a1820f09..0000000000
--- a/Themes/_res/svgs/settingsicons/voice.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 11.736328 0.00390625 C 11.321474 0.030131472 10.903772 0.20030709 10.244141 0.51953125 C 8.8896417 1.0771733 8.1174855 1.8439119 7.6914062 3.2363281 C 7.6906944 3.2383142 7.6901634 3.2401992 7.6894531 3.2421875 C 7.3367489 4.2295162 7.1855469 5.4925687 7.1855469 7.1445312 C 7.1855469 7.6581106 7.2016221 8.1327878 7.234375 8.578125 C 7.2816655 9.7324968 7.4366268 10.584132 7.7148438 11.25 C 8.4836096 13.089916 10.105193 14.159675 11.847656 14.189453 C 11.949235 14.191189 12.050088 14.194886 12.152344 14.189453 C 13.894807 14.159675 15.516391 13.089916 16.285156 11.25 C 16.563374 10.584132 16.718334 9.7324968 16.765625 8.578125 C 16.798378 8.1327878 16.814453 7.6581106 16.814453 7.1445312 C 16.814453 5.4925687 16.663252 4.2295162 16.310547 3.2421875 C 16.309953 3.2402385 16.309189 3.2382747 16.308594 3.2363281 C 15.882514 1.8439119 15.110358 1.0771733 13.755859 0.51953125 C 12.959387 0.13408436 12.515567 -0.027158095 12 0.009765625 C 11.911421 0.0034218463 11.822389 -0.0015341464 11.736328 0.00390625 z M 3.5722656 8.5488281 C 2.4674668 8.5488281 2.2531735 9.7545143 2.9394531 12.115234 C 3.8064785 15.097696 6.336008 17.756126 8.9785156 18.462891 C 10.668703 18.914946 10.796875 19.043171 10.796875 20.271484 C 10.796875 21.504974 10.706725 21.591797 9.4414062 21.591797 C 7.7773236 21.591797 6.8422839 22.502388 7.5859375 23.398438 C 7.9675487 23.858251 9.0096421 24 12 24 C 12.373795 24 12.717763 23.996972 13.033203 23.992188 C 15.241282 23.958689 16.080152 23.800774 16.414062 23.398438 C 17.157717 22.502388 16.222676 21.591797 14.558594 21.591797 C 13.293275 21.591797 13.203125 21.504974 13.203125 20.271484 C 13.203125 19.196709 13.302177 18.963148 14.458984 18.619141 C 14.624243 18.569997 14.810212 18.519398 15.021484 18.462891 C 17.663993 17.756126 20.193522 15.097696 21.060547 12.115234 C 21.746826 9.7545143 21.532533 8.5488281 20.427734 8.5488281 C 19.759278 8.5488281 19.325412 9.3895367 19.025391 11.265625 C 18.899126 12.055183 18.449092 12.958838 17.830078 13.789062 C 17.034205 14.856494 15.959145 15.804239 14.929688 16.234375 C 14.203773 16.537681 13.307941 16.70818 12.392578 16.746094 C 11.607981 16.778591 10.808673 16.713267 10.085938 16.550781 C 9.965481 16.5237 9.8461991 16.493434 9.7304688 16.460938 C 9.4990077 16.395943 9.2777163 16.321034 9.0703125 16.234375 C 7.2401651 15.469691 5.2632148 13.070328 4.9746094 11.265625 C 4.674587 9.3895367 4.2407224 8.5488281 3.5722656 8.5488281 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/welcome.svg b/Themes/_res/svgs/settingsicons/welcome.svg
deleted file mode 100644
index 0a63a418de..0000000000
--- a/Themes/_res/svgs/settingsicons/welcome.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 21.599609,1.8890625 V 3.3128906 L 3.5996094,7.2757812 V 19.723047 c 0,0.545684 0.3749562,1.020023 0.9101562,1.154297 l 4.8007813,1.1875 c 0.096,0.02261 0.1930625,0.03516 0.2890625,0.03516 0.3732,0 0.7305376,-0.171451 0.9609376,-0.474609 l 2.962891,-3.916016 8.076171,1.777344 v 1.423828 H 24 V 1.8890625 Z M 0,7.2699219 V 16.156641 H 2.4003906 V 7.2699219 Z M 6,16.051172 10.953125,17.142969 9.1171875,19.566797 6,18.793359 Z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/widgets.svg b/Themes/_res/svgs/settingsicons/widgets.svg
deleted file mode 100644
index ffef3feb21..0000000000
--- a/Themes/_res/svgs/settingsicons/widgets.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="m 12,1.0908172 a 2.2,2.2 0 0 0 -0.184304,0.00906 2.2,2.2 0 0 0 -0.116655,0.014382 2.2,2.2 0 0 0 -0.100142,0.015447 2.2,2.2 0 0 0 -0.102272,0.022373 2.2,2.2 0 0 0 -0.114525,0.029297 2.2,2.2 0 0 0 -0.09322,0.031427 2.2,2.2 0 0 0 -0.108,0.038885 2.2,2.2 0 0 0 -0.108,0.049006 2.2,2.2 0 0 0 -0.08523,0.041016 2.2,2.2 0 0 0 -0.106002,0.060192 2.2,2.2 0 0 0 -0.08469,0.052202 2.2,2.2 0 0 0 -0.09215,0.065519 2.2,2.2 0 0 0 -0.08416,0.064453 2.2,2.2 0 0 0 -0.08416,0.074041 2.2,2.2 0 0 0 -0.0783,0.072443 2.2,2.2 0 0 0 -0.07244,0.078302 2.2,2.2 0 0 0 -0.07404,0.084162 2.2,2.2 0 0 0 -0.06445,0.084162 2.2,2.2 0 0 0 -0.066,0.092152 2.2,2.2 0 0 0 -0.0522,0.084695 2.2,2.2 0 0 0 -0.06019,0.106001 2.2,2.2 0 0 0 -0.04102,0.085228 2.2,2.2 0 0 0 -0.049005,0.1082 2.2,2.2 0 0 0 -0.038885,0.108 2.2,2.2 0 0 0 -0.031427,0.093217 2.2,2.2 0 0 0 -0.029297,0.1145242 2.2,2.2 0 0 0 -0.022373,0.1022728 2.2,2.2 0 0 0 -0.015447,0.1001417 2.2,2.2 0 0 0 -0.01438,0.116655 2.2,2.2 0 0 0 -0.00906,0.184304 2.2,2.2 0 0 0 0.00799,0.155007 2.2,2.2 0 0 0 0.010653,0.113459 2.2,2.2 0 0 0 0.015448,0.1006748 2.2,2.2 0 0 0 0.025036,0.1241119 2.2,2.2 0 0 0 0.020772,0.081499 2.2,2.2 0 0 0 0.037287,0.1225142 2.2,2.2 0 0 0 0.032493,0.088956 2.2,2.2 0 0 0 0.050071,0.1182527 2.2,2.2 0 0 0 0.03622,0.074574 2.2,2.2 0 0 0 0.06392,0.118253 2.2,2.2 0 0 0 0.04581,0.074041 2.2,2.2 0 0 0 0.07351,0.108 2.2,2.2 0 0 0 0.05007,0.066051 2.2,2.2 0 0 0 0.09002,0.1075995 2.2,2.2 0 0 0 0.05007,0.053267 2.2,2.2 0 0 0 0.105468,0.103338 2.2,2.2 0 0 0 0.05114,0.044744 2.2,2.2 0 0 0 0.116122,0.093217 2.2,2.2 0 0 0 0.057,0.040483 2.2,2.2 0 0 0 0.151812,0.099076 V 6.545367 h -0.71005 c -4.4414396,0 -8.0172238,3.3127829 -8.0172238,7.428089 0,0.04733 0.00278,0.09404 0.00374,0.141158 -8.25e-4,0.02189 -0.00374,0.04343 -0.00374,0.066 v 0.0016 H 1.09091 C 0.48654499,14.181728 0,14.668273 0,15.272637 v 3.272727 c 0,0.604363 0.48654499,1.091 1.09091,1.091 h 1.0909082 v 1.462713 c 0,1.002873 0.973092,1.810014 2.1818193,1.810014 H 19.636364 c 1.208727,0 2.181818,-0.807141 2.181818,-1.810014 v -1.462713 h 1.091 C 23.513455,19.636273 24,19.149727 24,18.545364 v -3.272718 c 0,-0.604364 -0.486545,-1.091 -1.091,-1.091 h -1.091 v -0.0016 c 0,-0.02209 -0.0028,-0.04363 -0.0037,-0.066 9.5e-4,-0.04711 0.0037,-0.09383 0.0037,-0.141158 0,-4.1153061 -3.575783,-7.428089 -8.017223,-7.428089 H 13.09091 V 5.1598952 a 2.2,2.2 0 0 0 0.151811,-0.099077 2.2,2.2 0 0 0 0.057,-0.040483 2.2,2.2 0 0 0 0.116122,-0.093217 2.2,2.2 0 0 0 0.05114,-0.044744 2.2,2.2 0 0 0 0.105469,-0.103338 2.2,2.2 0 0 0 0.05007,-0.053267 2.2,2.2 0 0 0 0.09002,-0.1075995 2.2,2.2 0 0 0 0.05007,-0.066051 2.2,2.2 0 0 0 0.07351,-0.108 2.2,2.2 0 0 0 0.04581,-0.074041 2.2,2.2 0 0 0 0.06392,-0.118253 2.2,2.2 0 0 0 0.03622,-0.074574 2.2,2.2 0 0 0 0.05007,-0.1182527 2.2,2.2 0 0 0 0.03249,-0.088956 2.2,2.2 0 0 0 0.03729,-0.1225142 2.2,2.2 0 0 0 0.02078,-0.081499 2.2,2.2 0 0 0 0.02504,-0.1241119 2.2,2.2 0 0 0 0.01545,-0.100675 2.2,2.2 0 0 0 0.01065,-0.1134588 2.2,2.2 0 0 0 0.008,-0.155007 2.2,2.2 0 0 0 -0.0091,-0.184304 2.2,2.2 0 0 0 -0.01438,-0.116655 2.2,2.2 0 0 0 -0.01545,-0.1001417 2.2,2.2 0 0 0 -0.02237,-0.1022728 2.2,2.2 0 0 0 -0.0293,-0.1145242 2.2,2.2 0 0 0 -0.03143,-0.093217 2.2,2.2 0 0 0 -0.03888,-0.108 2.2,2.2 0 0 0 -0.04901,-0.1082 2.2,2.2 0 0 0 -0.04101,-0.085227 A 2.2,2.2 0 0 0 13.870722,2.154037 2.2,2.2 0 0 0 13.818522,2.069342 2.2,2.2 0 0 0 13.753002,1.97719 2.2,2.2 0 0 0 13.688552,1.893028 2.2,2.2 0 0 0 13.614512,1.808866 2.2,2.2 0 0 0 13.542072,1.730563 2.2,2.2 0 0 0 13.463772,1.65812 2.2,2.2 0 0 0 13.379612,1.584079 2.2,2.2 0 0 0 13.295452,1.519626 2.2,2.2 0 0 0 13.203302,1.454107 2.2,2.2 0 0 0 13.118612,1.401905 2.2,2.2 0 0 0 13.012611,1.341713 2.2,2.2 0 0 0 12.927381,1.300697 2.2,2.2 0 0 0 12.819248,1.251691 2.2,2.2 0 0 0 12.711116,1.212806 2.2,2.2 0 0 0 12.617896,1.181379 2.2,2.2 0 0 0 12.503372,1.152082 2.2,2.2 0 0 0 12.401099,1.129709 2.2,2.2 0 0 0 12.300957,1.114262 2.2,2.2 0 0 0 12.184302,1.09988 2.2,2.2 0 0 0 11.999998,1.09082 Z M 7.0917,13.090817 A 2.73,2.73 0 0 1 9.8181821,15.818089 2.73,2.73 0 0 1 7.0917,18.545362 2.73,2.73 0 0 1 4.363637,15.818089 2.73,2.73 0 0 1 7.0917,13.090817 Z m 9.8181813,0 a 2.73,2.73 0 0 1 2.727272,2.727272 2.73,2.73 0 0 1 -2.727272,2.73 2.73,2.73 0 0 1 -2.73,-2.73 2.73,2.73 0 0 1 2.73,-2.727272 z"/></svg>
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/windows.png b/Themes/_res/svgs/settingsicons/windows.png
new file mode 100644
index 0000000000..6bcae2a8ad
Binary files /dev/null and b/Themes/_res/svgs/settingsicons/windows.png differ
diff --git a/Themes/_res/svgs/settingsicons/windows.svg b/Themes/_res/svgs/settingsicons/windows.svg
deleted file mode 100644
index 2fa154e258..0000000000
--- a/Themes/_res/svgs/settingsicons/windows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="black" d="M 1.265,11.368421 V 4.7368421 L 8.843947,3.0694737 V 11.254737 L 1.265,11.368421 M 22.738684,0 V 11.052632 L 10.107105,11.242105 V 2.7915789 L 22.738684,0 M 1.265,12.631579 8.843947,12.745263 v 8.602105 L 1.265,19.894737 v -7.263158 m 21.473684,0.315789 V 24 L 10.107105,21.587368 v -8.829473 z"/></svg>
\ No newline at end of file