diff --git a/.config/awesome/jupiter_menu.lua b/.config/awesome/jupiter_menu.lua
index 53e6acf7..e3fce354 100644
--- a/.config/awesome/jupiter_menu.lua
+++ b/.config/awesome/jupiter_menu.lua
@@ -17,7 +17,7 @@ accessoriesmenu = {
 }
 audiomenu = {
     { "ableton live", "/home/hanez/bin/ableton.sh", "/home/hanez/.config/awesome/icons/live2.png" },
-    { "ardour", "/usr/bin/ardour8", "/usr/share/icons/hicolor/48x48/apps/ardour8.png" },
+    { "ardour", "/usr/bin/ardour8", "/usr/share/icons/hicolor/48x48/apps/ardour9.png" },
     { "audacity", "/usr/bin/audacity", "/usr/share/icons/hicolor/32x32/audacity.png" },
     --{ "bitwig studio", "/home/hanez/bin/bitwigstudio.sh", "/home/hanez/.config/awesome/icons/bitwigstudio.png" },
     { "mixxx", "/usr/bin/mixxx", "/usr/share/icons/hicolor/scalable/apps/mixxx.svg" },
@@ -54,8 +54,8 @@ developmentmenu = {
     { "cmake gui", "/usr/bin/cmake-gui", "/usr/share/icons/hicolor/64x64/apps/cmake.png" },
     { "codeblocks", "/usr/bin/codeblocks", "/usr/share/icons/hicolor/64x64/apps/codeblocks.png" },
 --    { "codelite", "/usr/bin/codelite", "/usr/share/icons/hicolor/32x32/apps/codelite.png" },
-    { "ddd", "/usr/bin/ddd", "/usr/share/pixmaps/ddd.xpm" },
-    { "doxywizard", "/usr/bin/doxywizard", "" },
+    { "ddd", "/usr/bin/ddd", appicon },
+    { "doxywizard", "/usr/bin/doxywizard", appicon },
     { "eclipse", "/usr/bin/eclipse", "/usr/share/icons/hicolor/32x32/apps/eclipse.png" },
     { "fluid", "/usr/bin/fluid", "/usr/share/icons/hicolor/48x48/apps/fluid.png" },
     { "gambas3", "/usr/bin/gambas3 ", "/usr/share/pixmaps/gambas3.png" },
@@ -66,7 +66,7 @@ developmentmenu = {
     { "kdevelop", "/usr/bin/kdevelop", "/usr/share/icons/hicolor/48x48/apps/kdevelop.png" },
     { "lazarus", "/usr/bin/lazarus", "/usr/share/pixmaps/lazarus.png" },
     { "liteide", "/usr/bin/liteide", "/usr/share/pixmaps/liteide.png" },
-    { "meld", "/usr/bin/meld", "/usr/share/icons/hicolor/scalable/apps/org.gnome.meld.svg" },
+    { "meld", "/usr/bin/meld", "/usr/share/icons/hicolor/scalable/apps/org.gnome.Meld.svg" },
     { "netbeans", "/usr/bin/netbeans", "/usr/share/pixmaps/netbeans.png" },
     { "openmv ide", "/usr/bin/openmvide", "/usr/share/pixmaps/openmv-ide.png" },
     { "qgit", "/usr/bin/qgit", "/usr/share/icons/hicolor/48x48/apps/qgit.png" },
@@ -77,9 +77,9 @@ developmentmenu = {
     { "theide", "/usr/bin/theide", "/usr/share/pixmaps/theide.png" },
     { "thonny", "/usr/bin/thonny", "/usr/share/icons/hicolor/48x48/apps/org.thonny.Thonny.png" },
     { "vscode", "/usr/bin/code", "/usr/share/pixmaps/com.visualstudio.code.oss.png" },
-    { "wxformbuilder", "/usr/bin/wxformbuilder", "/usr/share/pixmaps/wxformbuilder.png" },
-    { "wxglade", "/usr/bin/wxglade", "/usr/share/icons/hicolor/32x32/apps/wxglade.png" },
-    { "zerobrane studio", "/usr/bin/zbstudio", "/usr/share/icons/hicolor/32x32/apps/zbstudio.png" },
+    { "wxformbuilder", "/usr/bin/wxformbuilder", "/usr/share/icons/hicolor/48x48/apps/org.wxformbuilder.wxFormBuilder.png" },
+    { "wxglade", "/usr/bin/wxglade", "/usr/share/icons/hicolor/32x32/apps/wxGlade.png" },
+---    { "zerobrane studio", "/usr/bin/zbstudio", "/usr/share/icons/hicolor/32x32/apps/zbstudio.png" },
 }
 emulationmenu = {
     { "86box", "/usr/bin/86Box", "/usr/share/icons/hicolor/48x48/apps/net.86box.86Box.png" },
@@ -95,7 +95,7 @@ engineeringmenu = {
     { "eagle", "/home/hanez/bin/eagle.sh", "/usr/share/pixmaps/eagle.png" },
     { "energia", "/usr/bin/energia", "/usr/share/pixmaps/energia.png" },
     { "fritzing", "/usr/bin/Fritzing", "/usr/share/pixmaps/fritzing.png" },
-    { "freecad", "/usr/bin/freecad", "/usr/share/icons/hicolor/scalable/apps/freecad.svg" },
+    { "freecad", "/usr/bin/freecad", "/usr/share/icons/hicolor/scalable/apps/org.freecad.FreeCAD.svg" },
     { "kicad", "/usr/bin/kicad", "/usr/share/icons/hicolor/48x48/apps/kicad.png" },
     { "kingstvis", "/opt/kingstvis/KingstVIS", "/usr/share/icons/hicolor/48x48/KingstVIS.png" },
     { "ldcad", "/usr/bin/LDCad", "/usr/share/LDCad/resources/LDCad-128x128.png" },
@@ -104,15 +104,15 @@ engineeringmenu = {
     { "librepcb", "/usr/bin/librepcb", "/usr/share/icons/hicolor/scalable/apps/org.librepcb.LibrePCB.svg" },
     { "openmv", "/usr/bin/openmvide", "/usr/share/pixmaps/openmv-ide.png" },
     { "openscad", "/usr/bin/openscad", "/usr/share/icons/hicolor/48x48/apps/openscad.png" },
-    { "processing", "/usr/bin/processing", "/usr/share/pixmaps/processing.png" },
+    { "processing", "/usr/bin/processing", "/usr/share/icons/hicolor/48x48/mimetypes/processing-pde.png" },
     { "prusa slicer", "/usr/bin/prusa-slicer", "/usr/share/PrusaSlicer/icons/PrusaSlicer.svg" },
     { "pulseview", "/usr/bin/pulseview", "/usr/share/icons/hicolor/scalable/apps/pulseview.svg" },
-    { "qcad", "/usr/bin/qcad", "/usr/share/pixmaps/qcad_icon.png" },
+    { "qcad", "/usr/bin/qcad", "/usr/share/icons/hicolor/scalable/apps/org.qcad.QCAD.svg" },
     { "qtresistors", "/usr/bin/qtResistors", "/usr/share/icons/hicolor/64x64/apps/qtResistors.png" },
     { "simulide", "/usr/bin/simulide", "/usr/share/icons/hicolor/256x256/simulide.png" },
-    { "savvycan", "/usr/bin/SavvyCAN", "/usr/share/icons/icons/hicolor/scalable/apps/SavvyCAN.png" },
+    { "savvycan", "/usr/bin/SavvyCAN", "/usr/share/icons/hicolor/scalable/apps/SavvyCAN.png" },
     { "stm32cubemx", "/usr/bin/stm32cubemx", "/usr/share/pixmaps/stm32cubemx.png" },
-    { "superslicer", "/usr/bin/superslicer", "/usr/share/icons/SuperSlicer.svg" },
+    { "superslicer", "/usr/bin/superslicer", "/usr/share/icons/hicolor/32x32/apps/SuperSlicer.png" },
     { "ultimaker cura", "/usr/bin/UltiMaker-Cura", "/usr/share/pixmaps/cura-icon.png" },
     { "upyloader", "/usr/bin/upyloader", "/usr/share/pixmaps/upyloader.svg" },
 }
@@ -148,7 +148,7 @@ graphicsmenu = {
     { "font manager", "/usr/bin/font-manager", "/usr/share/icons/gnome/48x48/apps/preferences-desktop-font.png" },
     { "font viewer", "/usr/bin/gnome-font-viewer", "/usr/share/icons/gnome/48x48/apps/preferences-desktop-font.png" },
     { "gimp", "/usr/bin/gimp", "/usr/share/icons/hicolor/48x48/apps/gimp.png" },
-    { "gmic", "/usr/bin/gmic_qt", "" },
+    { "gmic", "/usr/bin/gmic_qt", "/usr/share/icons/hicolor/scalable/apps/gmic_qt.svg" },
     { "gpick", "/usr/bin/gpick", "/usr/share/icons/hicolor/48x48/apps/gpick.png" },
     { "image scan!", "/usr/bin/iscan", "/usr/share/icons/gnome/48x48/devices/scanner.png" },
     { "inkscape", "/usr/bin/inkscape", "/usr/share/icons/hicolor/48x48/apps/org.inkscape.Inkscape.png" },
@@ -160,7 +160,7 @@ graphicsmenu = {
     { "screenshooter", "/usr/bin/xfce4-screenshooter", "/usr/share/icons/hicolor/scalable/apps/org.xfce.screenshooter.svg" },
     { "scribus", "/usr/bin/scribus", "/usr/share/icons/hicolor/32x32/apps/scribus.png" },
     { "viewnior", "/usr/bin/viewnior", "/usr/share/icons/hicolor/48x48/apps/viewnior.png" },
-    { "wacom", "/usr/bin/kde_wacom_tabletfinder", "/usr/share/icons/Vimix/scalable/apps/csd-wacom.svg" },
+    { "wacom", "/usr/bin/kde_wacom_tabletfinder", appicon },
     { "xsane scanning", "/usr/bin/xsane", "/usr/share/pixmaps/xsane.xpm" },
 }
 hackingmenu = {
@@ -177,7 +177,7 @@ internetmenu = {
     { "chromium (incognito)", "/usr/bin/chromium --incognito", "/usr/share/icons/hicolor/48x48/apps/chromium.png" },
     { "edge", "/usr/bin/microsoft-edge-stable", "/usr/share/icons/hicolor/48x48/apps/microsoft-edge.png" },
     { "edge (private)", "/usr/bin/microsoft-edge-stable --inprivate", "/usr/share/icons/hicolor/48x48/apps/microsoft-edge.png" },
-    { "electrum", "/usr/bin/electrum", "/usr/share/icons/hicolor/128x128/apps/electrum.png" },
+    { "electrum", "/usr/bin/electrum", "/usr/share/pixmaps/electrum.png" },
     { "firefox", "/usr/bin/firefox", "/usr/share/icons/hicolor/48x48/apps/firefox.png" },
     { "firefox (private)", "/usr/bin/firefox --private-window", "/usr/share/icons/hicolor/48x48/apps/firefox.png" },
     { "gftp", "/usr/bin/gftp-gtk", "/usr/share/icons/hicolor/scalable/apps/gftp.svg" },
@@ -185,28 +185,27 @@ internetmenu = {
     { "liferea", "/usr/bin/liferea", "/usr/share/icons/hicolor/scalable/apps/net.sourceforge.liferea.svg" },
     { "luakit", "/usr/bin/luakit", "/usr/share/pixmaps/luakit.svg" },
     { "mega", "/usr/bin/megasync", "/usr/share/icons/hicolor/48x48/apps/mega.png" },
-    { "nextcloud", "/usr/bin/nextcloud", "/usr/share/icons/hicolor/48x48/apps/Nextcloud.png" },
+---    { "nextcloud", "/usr/bin/nextcloud", "/usr/share/icons/hicolor/48x48/apps/Nextcloud.png" },
     { "opera", "/usr/bin/opera", "/usr/share/pixmaps/opera.xpm" },
     { "qutebrowser", "/usr/bin/qutebrowser", "/usr/share/icons/hicolor/scalable/apps/qutebrowser.svg" },
-    { "rssguard", "/usr/bin/rssguard", "/usr/share/icons/hicolor/256x256/apps/io.github.martinrotter.rssguard.png" },
-    { "seamonkey", "/usr/bin/seamonkey", "/usr/share/pixmaps/seamonkey.png" },
+    { "rssguard", "/usr/bin/rssguard", "/usr/share/icons/hicolor/512x512/apps/io.github.martinrotter.rssguard.png" },
+---    { "seamonkey", "/usr/bin/seamonkey", "/usr/share/pixmaps/seamonkey.png" },
     { "tor browser", "/usr/bin/tor-browser", "/usr/share/icons/hicolor/scalable/apps/tor-browser.svg" },
-    { "transmission", "/usr/bin/transmission-gtk", "/usr/share/icons/hicolor/scalable/apps/transmission.svg" },
-    { "vimb", "/usr/bin/vimb", "" },
+    { "transmission", "/usr/bin/transmission-gtk", "/usr/share/icons/hicolor/scalable/apps/transmission-gtk.svg" },
+    { "vimb", "/usr/bin/vimb", appicon },
 }
 multimediamenu = {
-    { "acidrip", "/usr/bin/acidrip", "/usr/share/icons/Vimix/scalable/apps/acidrip.svg" },
-    { "audex", "/usr/bin/audex", "/usr/share/icons/hicolor/48x48/apps/audex.png" },
+    { "acidrip", "/usr/bin/acidrip", "/usr/share/pixmaps/acidrip.png" },
+    { "audex", "/usr/bin/audex", "/usr/share/icons/hicolor/scalable/apps/org.kde.audex.svg" },
     { "brasero", "/usr/bin/brasero", "/usr/share/icons/hicolor/48x48/apps/brasero.png" },
     { "demon editor", "/usr/bin/demon-editor", "/usr/share/icons/hicolor/scalable/apps/demon-editor.svg" },
-    { "handbrake", "/usr/bin/ghb", "/usr/share/icons/hicolor/scalable/apps/hb-icon.svg" },
+    { "handbrake", "/usr/bin/ghb", "/usr/share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg" },
     { "k3b", "/usr/bin/k3b", "/usr/share/icons/hicolor/48x48/apps/k3b.png" },
-    { "k9copy", "/usr/bin/k9copy", "/usr/share/icons/hicolor/48x48/actions/k9copy.png" },
     { "kaffeine", "/usr/bin/kaffeine", "/usr/share/icons/hicolor/scalable/apps/kaffeine.svg" },
     { "mediathekview", "/home/hanez/opt/MediathekView/MediathekView", "/home/hanez/opt/MediathekView/MediathekView.svg" },
     { "plex", "/usr/bin/Plex", "/usr/share/icons/hicolor/256x256/apps/tv.plex.PlexDesktop.png" },
     { "shortwave", "/usr/bin/shortwave", "/usr/share/icons/hicolor/scalable/apps/de.haeckerfelix.Shortwave.svg" },
-    { "spotiflyer", "/opt/spotiflyer/bin/SpotiFlyer", "/opt/spotiflyer/lib/SpotiFlyer.png" },
+    { "spotiflyer", "/usr/lib/spotiflyer/bin/SpotiFlyer", "/usr/share/pixmaps/spotiflyer.png" },
     { "spotify", "/usr/bin/spotify-tray", "/usr/share/pixmaps/spotify-client.png" },
     { "spotube", "/usr/bin/spotube", "/usr/share/icons/spotube/spotube-logo.png" },
     { "sound juicer", "/usr/bin/sound-juicer", "/usr/share/icons/hicolor/48x48/apps/org.gnome.SoundJuicer.png" },
@@ -215,19 +214,19 @@ multimediamenu = {
     { "youtube downloader", "/usr/bin/youtube-dl-gui", "/usr/share/icons/hicolor/1024x1024/apps/youtube-dl-gui-bin.png" },
 }
 networkmenu = {
-    { "ettercap", "/usr/bin/ettercap -G", "/usr/share/pixmaps/ettercap.svg" },
+    { "ettercap", "/usr/bin/ettercap -G", "/usr/share/icons/hicolor/scalable/apps/ettercap.svg" },
     { "fwbuilder", "/usr/bin/fwbuilder", "/usr/share/icons/hicolor/48x48/apps/fwbuilder.png" },
-    { "gns3", "/usr/bin/gns3", "/usr/share/icons/hicolor/48x48/apps/gns3.png" },
+    { "gns3", "/usr/bin/gns3", "/usr/share/pixmaps/gns3.png" },
     { "gufw", "/usr/bin/gufw_fixed", "/usr/share/icons/hicolor/scalable/apps/gufw.svg" },
-    { "wireshark", "/usr/bin/wireshark-gtk", "/usr/share/icons/hicolor/48x48/apps/wireshark.png" },
-    { "zenmap", "/usr/bin/gksu /usr/bin/zenmap", "/usr/share/zenmap/pixmaps/zenmap.png" },
+    { "wireshark", "/usr/bin/wireshark-gtk", "/usr/share/icons/hicolor/48x48/apps/org.wireshark.Wireshark.png" },
+    { "zenmap", "/usr/bin/gksu /usr/bin/zenmap", "/usr/share/pixmaps/zenmap.png" },
 }
 officemenu = {
     --{ "calendar", "/usr/bin/io.elementary.calendar", "/usr/share/icons/elementary/apps/48/office-calendar.svg" },
     { "calligra sheets", "/usr/bin/calligrsheets", "/usr/share/icons/hicolor/scalable/apps/org.kde.calligra.sheets.svg" },
     { "calligra stage", "/usr/bin/calligrastage", "/usr/share/icons/hicolor/scalable/apps/org.kde.calligra.stage.svg" },
     { "calligra words", "/usr/bin/calligrawords", "/usr/share/icons/hicolor/scalable/apps/org.kde.calligra.words.svg" },
-    { "gimagereader (ocr)", "/usr/bin/gimagereader-gtk", "" },
+    { "gimagereader (ocr)", "/usr/bin/gimagereader-gtk", appicon },
     { "grisbi", "/usr/bin/grisbi", "/usr/share/icons/hicolor/scalable/apps/grisbi.svg" },
     { "libreoffice base", "/usr/bin/libreoffice --base", "/usr/share/icons/hicolor/48x48/apps/libreoffice-base.png" },
     { "libreoffice calc", "/usr/bin/libreoffice --calc", "/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png" },
@@ -239,31 +238,31 @@ officemenu = {
     { "pdfslicer", "/usr/bin/pdfslicer", "/usr/share/icons/hicolor/scalable/apps/com.github.junrrein.PDFSlicer.svg" },
 }
 privacymenu = {
-    { "ausweisapp 2", "/usr/bin/AusweisApp2", "/usr/share/icons/hicolor/scalable/apps/AusweisApp2.svg" },
+---    { "ausweisapp 2", "/usr/bin/AusweisApp2", "/usr/share/icons/hicolor/scalable/apps/AusweisApp2.svg" },
     { "cryptomator", "/usr/bin/cryptomator", "/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.svg" },
-    { "gnu privacy agent", "/usr/bin/gpa", "/usr/share/pixmaps/gpa.png" },
+---    { "gnu privacy agent", "/usr/bin/gpa", "/usr/share/pixmaps/gpa.png" },
     { "keepassxc", "/usr/bin/keepassxc", "/usr/share/icons/hicolor/scalable/apps/keepassxc.svg" },
     { "kleopatra", "/usr/bin/kleopatra", "/usr/share/icons/hicolor/48x48/apps/kleopatra.png" },
-    { "open ecard", "/opt/open-ecard-app/bin/open-ecard-app", "/opt/open-ecard-app/lib/open-ecard-app.png" },
+---    { "open ecard", "/opt/open-ecard-app/bin/open-ecard-app", "/opt/open-ecard-app/lib/open-ecard-app.png" },
     { "seahorse", "/usr/bin/seahorse", "/usr/share/icons/hicolor/scalable/apps/org.gnome.seahorse.Application.svg" },
     { "tor browser", "/usr/bin/tor-browser", "/usr/share/icons/hicolor/scalable/apps/tor-browser.svg" },
     { "veracrypt", "/usr/bin/veracrypt", "/usr/share/icons/hicolor/scalable/apps/tor-browser.svg" },
-    { "yubikey athenticator", "/usr/bin/yubioath-desktop", "/usr/share/pixmaps/com.yubico.yubioath.svg" },
+---    { "yubikey athenticator", "/usr/bin/yubioath-desktop", "/usr/share/pixmaps/com.yubico.yubioath.svg" },
     { "yubikey manager", "/usr/bin/ykman-gui", "/usr/share/pixmaps/ykman.png" },
     { "yubikey personalization tool", "/usr/bin/yubikey-personalization-gui", "/usr/share/icons/hicolor/48x48/apps/yubikey-personalization-gui.png" },
-    { "yubikey piv manager", "/usr/bin/pivman", "/usr/share/pixmaps/pivman.xpm" },
+---    { "yubikey piv manager", "/usr/bin/pivman", "/usr/share/pixmaps/pivman.xpm" },
     { "zulucrypt", "/usr/bin/zuluCrypt-gui", "/usr/share/pixmaps/zuluCrypt.papirus.dark.png" },
 }
 radiomenu = {
-    { "gnuradio", "/usr/bin/gnuradio-companion", "/usr/share/gnuradio/grc/freedesktop/grc-icon-48.png" },
-    { "gqrx", "/usr/bin/gqrx", "/usr/share/pixmaps/gqrx.svg" },
+    { "gnuradio", "/usr/bin/gnuradio-companion", icondir .. "radio.svg" },
+    { "gqrx", "/usr/bin/gqrx", "/usr/share/icons/hicolor/scalable/apps/gqrx.svg" },
     { "urh", "/usr/bin/urh", "/usr/share/pixmaps/urh.png" },
 }
 sciencemenu = {
     { "epsilon", "/usr/bin/numworks-epsilon", "/usr/share/pixmaps/numworks-epsilon.png" },
-    { "firebird nspire", "/usr/bin/firebird-emu", "/usr/share/icons/hicolor/512x512/apps/org.firebird-emus.firebird-emu.png" },
+    { "firebird nspire", "/usr/bin/firebird-emu", "/usr/local/share/icons/hicolor/512x512/apps/org.firebird-emus.firebird-emu.png" },
     { "google earth", "/usr/bin/google-earth-pro", "/opt/google/earth/pro/product_logo_32.xpm" },
-    { "gpredict", "/usr/bin/gpredict", "/usr/share/pixmaps/gpredict-icon.png" },
+    { "gpredict", "/usr/bin/gpredict", "/usr/share/icons/hicolor/scalable/apps/gpredict.svg" },
     { "hp 15c", "/usr/bin/hp15c", "/usr/share/icons/hicolor/48x48/apps/hp15c.png" },
     { "stellarium", "/usr/bin/stellarium", "/usr/share/icons/hicolor/48x48/apps/stellarium.png" },
     { "viking", "/usr/bin/viking", "/usr/share/icons/hicolor/48x48/apps/viking.png" },
@@ -271,22 +270,20 @@ sciencemenu = {
 }
 systemmenu = {
     { "baobab", "/usr/bin/baobab", "/usr/share/help/C/baobab/media/org.gnome.baobab.svg" },
-    { "mibbrowser", "/usr/bin/imibrowser", "/usr/share/icons/hicolor/48x48/apps/imibrowser.png" },
+---    { "mibbrowser", "/usr/bin/imibrowser", "/usr/share/icons/hicolor/48x48/apps/imibrowser.png" },
     { "gnome disks", "/usr/bin/gnome-disks", "/usr/share/icons/hicolor/scalable/apps/org.gnome.DiskUtility.svg" },
     { "gnome firmware", "/usr/bin/gnome-firmware", "/usr/share/icons/hicolor/scalable/apps/org.gnome.Firmware.svg" },
     { "gparted", "/usr/bin/gparted", "/usr/share/icons/hicolor/48x48/apps/gparted.png" },
     { "gpu viewer", "/usr/bin/gpu-viewer", "/usr/share/icons/hicolor/512x512/apps/io.github.arunsivaramanneo.GPUViewer.png" },
     { "gst", "/usr/bin/gst", "/usr/share/icons/hicolor/32x32@2x/apps/com.leinardi.gst.png" },
-    { "hardinfo2", "/usr/bin/hardinfo2", "/usr/share/icons/hicolor/256x256/apps/hardinfo2.png" },
-    { "ksysguard", "/usr/bin/ksysguard", "/usr/share/icons/hicolor/16x16/apps/ksysguardd.png" },
+    { "hardinfo2", "/usr/bin/hardinfo2", "/usr/share/hardinfo2/pixmaps/hardinfo2.svg" },
     { "nomachine", "/usr/bin/nomachine-client", "/usr/share/NX/share/icons/48x48/NoMachine-desktop.png" },
     { "partition manager", "/usr/bin/partitionmanager", "/usr/share/icons/hicolor/scalable/apps/partitionmanager.svg" },
     --{ "podman desktop", "/usr/bin/podman-desktop", "/usr/share/icons/hicolor/scalable/apps/podman-desktop.svg" },
-    { "printer", "/usr/bin/system-config-printer", "/usr/share/icons/Adwaita/48x48/legacy/printer-printing.png" },
+    { "printer", "/usr/bin/system-config-printer", icondir .. "printer.svg" },
     { "rustdesk", "/usr/bin/rustdesk", "/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" },
-    { "sysprof", "/usr/bin/sysprof", "/usr/share/icons/hicolor/scalable/apps/org.gnome.Sysprof.svg" },
-    { "sysmon", "/usr/bin/sysmon", "/home/hanez/.config/awesome/icons/sysmon.png" },
-    { "teamviewer", "/usr/bin/teamviewer", "/usr/share/icons/hicolor/48x48/apps/TeamViewer.png" },
+    { "systemmonitor", "/usr/bin/plasma-systemmonitor", "/home/hanez/.config/awesome/icons/sysmon.png" },
+    { "teamviewer", "/usr/bin/teamviewer", "/usr/share/icons/hicolor/scalable/apps/TeamViewer.svg" },
 }
 toolsmenu = {
     { "engrampa", "/usr/bin/engrampa", "/usr/share/icons/hicolor/32x32/apps/engrampa.png" },
@@ -296,13 +293,13 @@ toolsmenu = {
 }
 utilitiesmenu = {
     { "arandr", "/usr/bin/arandr", "/usr/share/icons/hicolor/scalable/devices/video-television.svg" },
-    { "file search tool", "/usr/bin/gnome-search-tool", "/usr/share/icons/Adwaita/48x48/legacy/system-search.png" },
+    { "file search tool", "/usr/bin/gnome-search-tool", icondir .. "search.svg" },
     { "furiusisomount", "/usr/bin/furiusisomount", "/usr/share/furiusisomount/pix/furiusisomount.png" },
     { "grsync", "/usr/bin/grsync", "/usr/share/icons/hicolor/128x128/apps/grsync.png" },
-    { "gtk appearance", "/usr/bin/lxappearance", "/usr/share/icons/nuoveXT2/96x96/apps/preferences-desktop-theme.png" },
-    { "qt5 configuration tool", "/usr/bin/qt5ct", "/usr/share/icons/nuoveXT2/96x96/apps/preferences-desktop-theme.png" },
-    { "qt6 configuration tool", "/usr/bin/qt6ct", "/usr/share/icons/nuoveXT2/96x96/apps/preferences-desktop-theme.png" },
-    { "raspberry pi imager", "/usr/bin/rpi-imager", "/usr/share/icons/hicolor/128x128/apps/rpi-imager.png" },
+    { "gtk appearance", "/usr/bin/lxappearance", appicon },
+    { "qt5 configuration tool", "/usr/bin/qt5ct", appicon },
+    { "qt6 configuration tool", "/usr/bin/qt6ct", appicon },
+    { "raspberry pi imager", "/usr/bin/rpi-imager", appicon },
 }
 videomenu = {
     { "obs", "/usr/bin/obs", "/usr/share/icons/hicolor/256x256/apps/com.obsproject.Studio.png" },
@@ -337,7 +334,7 @@ mainmenu = awful.menu({ items = {
     { "privacy >", privacymenu, icondir .. "privacy.svg" },
     { "radio >", radiomenu, icondir .. "radio.svg" },
     { "science >", sciencemenu, icondir .. "science.svg" },
-    { "system >", systemmenu, icondir .. "system.svg" },
+    { "system >", systemmenu, icondir .. "gear.svg" },
     { "tools >", toolsmenu, icondir .. "tools.svg" },
     { "utilities >", utilitiesmenu, icondir .. "utilities.svg" },
     { "video >", videomenu, icondir .. "video.svg" },