diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java
index cef53d263..fceca547e 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java
@@ -8,6 +8,7 @@ import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.core.AppRestart;
 import io.xpipe.app.util.PlatformThread;
 
+import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -31,7 +32,7 @@ public class AppPrefsSidebarComp extends SimpleComp {
                 .toList();
         var buttons = effectiveCategories.stream()
                 .<Comp<?>>map(appPrefsCategory -> {
-                    return new ButtonComp(AppI18n.observable(appPrefsCategory.getId()), appPrefsCategory.getIcon().createGraphicNode(), () -> {
+                    return new ButtonComp(AppI18n.observable(appPrefsCategory.getId()), new ReadOnlyObjectWrapper<>(appPrefsCategory.getIcon()), () -> {
                                 AppPrefs.get().getSelectedCategory().setValue(appPrefsCategory);
                             })
                             .apply(struc -> {
diff --git a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java
index 76483155e..802229fb9 100644
--- a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java
@@ -35,7 +35,7 @@ public class DeveloperCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdoal-developer_mode");
+        return new LabelGraphic.IconGraphic("mdi2c-code-tags");
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
index 9e5a0d1f3..d2caf53c7 100644
--- a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
@@ -35,7 +35,7 @@ public class IconsCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdi2b-brush-variant");
+        return new LabelGraphic.IconGraphic("mdi2v-view-grid-plus-outline");
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/prefs/LoggingCategory.java b/app/src/main/java/io/xpipe/app/prefs/LoggingCategory.java
index 67d662a59..b8e76ef36 100644
--- a/app/src/main/java/io/xpipe/app/prefs/LoggingCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/LoggingCategory.java
@@ -19,7 +19,7 @@ public class LoggingCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdi2i-invoice-text-multiple-outline");
+        return new LabelGraphic.IconGraphic("mdi2t-text-box-search-outline");
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/prefs/SecurityCategory.java b/app/src/main/java/io/xpipe/app/prefs/SecurityCategory.java
index 631f7a675..0a8750614 100644
--- a/app/src/main/java/io/xpipe/app/prefs/SecurityCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/SecurityCategory.java
@@ -13,7 +13,7 @@ public class SecurityCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdi2i-infinity");
+        return new LabelGraphic.IconGraphic("mdi2s-security-network");
     }
 
     public Comp<?> create() {
diff --git a/app/src/main/java/io/xpipe/app/prefs/SshCategory.java b/app/src/main/java/io/xpipe/app/prefs/SshCategory.java
index 7aaa12347..8664e87be 100644
--- a/app/src/main/java/io/xpipe/app/prefs/SshCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/SshCategory.java
@@ -14,7 +14,7 @@ public class SshCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdi2s-ssh");
+        return new LabelGraphic.IconGraphic("mdi2c-console-network-outline");
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java b/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java
index 205e75b32..9469e64aa 100644
--- a/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java
@@ -34,7 +34,7 @@ public class TroubleshootCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdi2i-infinity");
+        return new LabelGraphic.IconGraphic("mdoal-bug_report");
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java
index 8f08eb9c6..24d3af6f5 100644
--- a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java
@@ -26,7 +26,7 @@ public class VaultCategory extends AppPrefsCategory {
 
     @Override
     protected LabelGraphic getIcon() {
-        return new LabelGraphic.IconGraphic("mdsal-lock");
+        return new LabelGraphic.IconGraphic("mdi2d-database-lock-outline");
     }
 
     @SneakyThrows