diff --git a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
index 4debf782f..261bb9c3e 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
@@ -61,12 +61,12 @@ public class BaseMode extends OperationMode {
         AppWindowTitle.init();
         AppPathCorruptCheck.check();
         AppHomebrewCoreutilsCheck.check();
+        WindowsRegistry.init();
         AppAvCheck.check();
         AppJavaOptionsCheck.check();
         AppSid.init();
         AppBeaconServer.init();
         AppLayoutModel.init();
-        WindowsRegistry.init();
 
         if (OperationMode.getStartupMode() == XPipeDaemonMode.GUI) {
             AppPtbDialog.showIfNeeded();
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 f2e4daf00..b9fd9ca86 100644
--- a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
@@ -8,10 +8,12 @@ import io.xpipe.app.core.window.AppDialog;
 import io.xpipe.app.icon.SystemIconManager;
 import io.xpipe.app.icon.SystemIconSource;
 import io.xpipe.app.issue.ErrorEventFactory;
+import io.xpipe.app.process.OsFileSystem;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.util.*;
 import io.xpipe.core.FilePath;
 
+import io.xpipe.core.OsType;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -101,7 +103,8 @@ public class IconsCategory extends AppPrefsCategory {
                             if (path != null) {
                                 var name = FilenameUtils.getBaseName(path);
                                 if (!name.isBlank()) {
-                                    id = name;
+                                    // Windows has the most strict file name rules
+                                    id = OsFileSystem.of(OsType.WINDOWS).makeFileSystemCompatible(name);
                                 }
                             }
                         } catch (Exception ignored) {}
diff --git a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
index 0444eb525..10e20e28a 100644
--- a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
+++ b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
@@ -58,7 +58,6 @@ public class BitwardenPasswordManager implements PasswordManager {
             var sc = getOrStartShell();
             var command = sc.command(CommandBuilder.of().add("bw", "get", "item", "xpipe-test", "--nointeraction"));
             var r = command.readStdoutAndStderr();
-            // Check for data file as bw seemingly breaks if it doesn't exist yet
             if (r[1].contains("You are not logged in")) {
                 var script = ShellScript.lines(
                         moveAppDir()
diff --git a/dist/changelog/18.4_incremental.md b/dist/changelog/18.4_incremental.md
index 29b85e1b5..a6833126e 100644
--- a/dist/changelog/18.4_incremental.md
+++ b/dist/changelog/18.4_incremental.md
@@ -1,12 +1,12 @@
-- Fix desktop shortcuts for workspaces and more not working on Linux and macOS
-- Fix tunnel session restart not applying any changes made to connection config
+- Fix desktop shortcuts for workspaces and actions not working on Linux and macOS
 - Fix computed directory file size being off by a factor of 1024 on Linux
 - Fix license check for entries limited in amount, e.g. Proxmox, potentially disabling all entries and not only one
 - Fix custom git icon sources not persisting after restart
 - Fix docker integration not elevating with sudo if context config required root permissions
 - Fix window possibly entering invalid state on Windows and not showing anymore
+- Fix tunnel session restart not applying any changes made to connection config
 - Show warning when invalid SSH gateway chain is configured
 - Reshow any existing configuration dialog if possible for connection when editing it
-- Improve error handling on Windows when registry library handling load fails
+- Improve error handling on Windows when registry library load fails
 - Automatically open connection configuration dialog when cloning a connection
 - Derive custom git icon source directory name from repository URL
diff --git a/version b/version
index 0399ccf0d..890e45270 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-18.4-4
+18.4