diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java
index 597b0f377..7856bc2f8 100644
--- a/app/src/main/java/io/xpipe/app/core/App.java
+++ b/app/src/main/java/io/xpipe/app/core/App.java
@@ -37,7 +37,7 @@ public class App extends Application {
         // This is necessary in case XPipe was started through a script as it will have no icon otherwise
         if (OsType.getLocal().equals(OsType.MACOS) && AppProperties.get().isDeveloperMode() && AppLogs.get().isWriteToSysout()) {
             try {
-                var iconUrl = Main.class.getResourceAsStream("resources/img/logo/logo_128x128.png");
+                var iconUrl = Main.class.getResourceAsStream("resources/img/logo/logo_macos_128x128.png");
                 if (iconUrl != null) {
                     var awtIcon = ImageIO.read(iconUrl);
                     Taskbar.getTaskbar().setIconImage(awtIcon);
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 981136ad3..3110b903c 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
@@ -69,9 +69,9 @@ public class BaseMode extends OperationMode {
         DataStorage.reset();
         AppPrefs.reset();
         AppExtensionManager.reset();
+        AppDataLock.unlock();
         // Shut down socket server last to keep a non-daemon thread running
         AppSocketServer.reset();
-        AppDataLock.unlock();
         TrackEvent.info("mode", "Background mode shutdown finished");
     }
 }
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png
new file mode 100644
index 000000000..e54974a40
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png differ