diff --git a/wiki-rtd/docs/wiki_icons/kennynl/controllers/controller_steamdeck.png b/wiki-rtd/docs/wiki_icons/kennynl/controllers/controller_steamdeck.png
index 16d16f6..76441e8 100644
Binary files a/wiki-rtd/docs/wiki_icons/kennynl/controllers/controller_steamdeck.png and b/wiki-rtd/docs/wiki_icons/kennynl/controllers/controller_steamdeck.png differ
diff --git a/wiki-rtd/docs/wiki_icons/pixelitos/io.github.antimicrox.antimicrox.png b/wiki-rtd/docs/wiki_icons/pixelitos/antimicrox.png
similarity index 100%
rename from wiki-rtd/docs/wiki_icons/pixelitos/io.github.antimicrox.antimicrox.png
rename to wiki-rtd/docs/wiki_icons/pixelitos/antimicrox.png
diff --git a/wiki-rtd/docs/wiki_icons/pixelitos/linux.png b/wiki-rtd/docs/wiki_icons/pixelitos/linux.png
new file mode 100644
index 0000000..594890a
Binary files /dev/null and b/wiki-rtd/docs/wiki_icons/pixelitos/linux.png differ
diff --git a/wiki-rtd/docs/wiki_icons/pixelitos/linux.xpm b/wiki-rtd/docs/wiki_icons/pixelitos/linux.xpm
deleted file mode 100644
index d2cc5c5..0000000
--- a/wiki-rtd/docs/wiki_icons/pixelitos/linux.xpm
+++ /dev/null
@@ -1,142 +0,0 @@
-/* XPM */
-static char * distributor_logo_linux_xpm[] = {
-"112 128 11 1",
-" 	c None",
-".	c #4E4E4E",
-"+	c #4F4F4F",
-"@	c #4C4C4C",
-"#	c #FFFFFF",
-"$	c #EAB108",
-"%	c #EAAF0A",
-"&	c #4D4D4D",
-"*	c #E9B109",
-"=	c #E7B00A",
-"-	c #E9B008",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                        ................................                                        ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                ................++++++++++++++++................                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                @@@@@@@@########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........########................########........                                ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                                ........................................................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ........................$$$$$$$$$$$$$$$$........................                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................$$$$$$$$%%%%%%%%$$$$$$$$$$$$$$$$++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                        ................########$$$$$$$$$$$$$$$$########++++++++........                        ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........................################################........................                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                ........++++++++################################################++++++++........                ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"                &&&&&&&&++++++++################################################................$$$$$$$$        ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"        $$$$$$$$$$$$$$$$$$$$$$$$################################################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$********$$$$$$$$################################$$$$$$$$========********$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$--------$$$$$$$$########################$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........................$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$        ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                ",
-"        $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                        $$$$$$$$$$$$$$$$$$$$$$$$                "};
diff --git a/wiki-rtd/docs/wiki_icons/pixelitos/org.openmw.OpenMW.png b/wiki-rtd/docs/wiki_icons/pixelitos/org.openmw.OpenMW.png
deleted file mode 100644
index b7f7807..0000000
Binary files a/wiki-rtd/docs/wiki_icons/pixelitos/org.openmw.OpenMW.png and /dev/null differ
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index e12566c..44fc712 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -59,17 +59,29 @@ plugins:
 nav:
   - Wiki Home 🏠: index.md
   - Blog: blog/index.md
+
   - What is RetroDECK <img src="../../wiki_icons/retrodeck/icon-rd.svg" width="20"> : wiki_about/what-is-retrodeck.md
-  - What is the story & goals behind RetroDECK <img src="../../../../wiki_icons/pixelitos/folder-blue-video.png" width="20">: wiki_about/story-goals.md
-  - What is included in RetroDECK <img src="../../../wiki_icons/pixelitos/folder-blue-games.png" width="20">: wiki_about/what-is-included.md
-  - Start using RetroDECK <img src="../../wiki_icons/retrodeck/rd_icon_circle_180x180.png" width="20"> : wiki_general/retrodeck-start.md
-  - Add RetroDECK to Steam ✅: wiki_general/add-to-steam.md
-  - Supported Devices đŸ“ē: wiki_general/supported-devices.md
-  - Supported Controllers 🕹ī¸: wiki_general/supported-controllers.md
-  - Change Controller Order 4ī¸âƒŖ: wiki_rd_controls/change-controller-order-steam.md
+
+  - What is the story & goals behind RetroDECK <img src="../../wiki_icons/pixelitos/video-x-generic.png" width="20">: wiki_about/story-goals.md
+
+  - What is included in RetroDECK <img src="../../wiki_icons/pixelitos/folder-blue-games.png" width="20">: wiki_about/what-is-included.md
+
+  - Start using RetroDECK <img src="../../wiki_icons/pixelitos/retrodeck.png" width="20"> : wiki_general/retrodeck-start.md
+
+  - Add RetroDECK to Steam <img src="../../wiki_icons/pixelitos/steam.png" width="20">: wiki_general/add-to-steam.md
+
+  - Supported Devices <img src="../../wiki_icons/pixelitos/preferences-system-splash.png" width="20">: wiki_general/supported-devices.md
+
+  - Supported Controllers <img src="../../wiki_icons/pixelitos/antimicrox.png" width="20">: wiki_general/supported-controllers.md
+
+  - Change Controller Order <img src="../../wiki_icons/pixelitos/list-add.png" width="20">: wiki_rd_controls/change-controller-order-steam.md
+
   - Different Button Prompts in Games ❓: wiki_rd_controls/diffrent-game-inputs.md
-  - Version History 📖: wiki_rd_versions/version-history.md
+
+  - Version History <img src="../../wiki_icons/pixelitos/text-x-generic.png" width="20">: wiki_rd_versions/version-history.md
+
   - How to Contribute? ❤ī¸: wiki_community/contibute-rd.md
+
   - Bugs & Known Issues 🐜: wiki_bugs/known-issues.md
 
   - FAQ ❔:
@@ -81,7 +93,7 @@ nav:
     - RetroDECK Usage: wiki_faq/faq-rd-usage.md
     - Steam Deck: wiki_faq/faq-rd-steamdeck.md
 
-  - Guides - RetroDECK Controls & Hotkeys 🎮:
+  - Guides - RetroDECK Controls & Hotkeys <img src="../../wiki_icons/pixelitos/pcsxr-icon.png" width="20">:
 
     - RetroDECK & Udev Rules: wiki_rd_controls/about-udev.md
     - Generic Standard - Hotkeys & Layout: wiki_rd_controls/hotkeys-generic-standard.md
@@ -98,7 +110,7 @@ nav:
     - RetroDECK Configurator 🧰: wiki_configurator/configurator.md
     - Ponzu: wiki_configurator/ponzu.md
 
-  - Guides - Files & Game Management 📂:
+  - Guides - Files & Game Management <img src="../../wiki_icons/pixelitos/folder-green-open.png" width="20">:
 
     - Game Compability Lists: wiki_management/compatibility-lists.md
     - Manage your BIOS/Firmware: wiki_management/bios-firmware.md
@@ -107,14 +119,14 @@ nav:
     - Scraping Game Media: wiki_management/about-scraping.md
     - Spreading Files over Multiple Drives: wiki_management/spread-files.md
 
-  - Guides - Steam Deck 🕹ī¸:
+  - Guides - Steam Deck <img src="../../../wiki_icons/kennynl/controllers/controller_steamdeck.png" width="30">:
 
     - RetroDECK Installation and Updates: wiki_devices/steamdeck/steamdeck-start.md
     - Optimizations: wiki_devices/steamdeck/steamdeck-optimize.md
     - Recommended Software: wiki_devices/steamdeck/steamdeck-software.md
     - Steam Deck - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
 
-  - Guides - Linux Desktop 🐧:
+  - Guides - Linux Desktop <img src="../../wiki_icons/pixelitos/linux.png" width="20">:
 
     - Installation and Updates: wiki_devices/linux_desktop/linux-install.md
     - Recommended Software: wiki_devices/linux_desktop/linux-software.md