diff --git a/apps/server/src/assets/icon-dev.ico b/apps/server/src/assets/icon-dev.ico
new file mode 100644
index 000000000..4a734c72b
Binary files /dev/null and b/apps/server/src/assets/icon-dev.ico differ
diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts
index 019ec58e8..917d2012c 100644
--- a/apps/server/src/services/window.ts
+++ b/apps/server/src/services/window.ts
@@ -4,6 +4,7 @@ import { t } from "i18next";
 import path from "path";
 import url from "url";
 
+import app_info from "./app_info.js";
 import cls from "./cls.js";
 import keyboardActionsService from "./keyboard_actions.js";
 import log from "./log.js";
@@ -290,6 +291,9 @@ function getIcon() {
     if (process.env.NODE_ENV === "development") {
         return path.join(__dirname, "../../../desktop/electron-forge/app-icon/png/256x256-dev.png");
     }
+    if (app_info.appVersion.includes("test")) {
+        return path.join(RESOURCE_DIR, "../public/assets/icon-dev.png");
+    }
     return path.join(RESOURCE_DIR, "../public/assets/icon.png");
 
 }
diff --git a/scripts/icons/create-icons.sh b/scripts/icons/create-icons.sh
index 1853fc82b..6092bb60b 100644
--- a/scripts/icons/create-icons.sh
+++ b/scripts/icons/create-icons.sh
@@ -70,4 +70,9 @@ magick -background none "$source_icon_dir/icon-installer-purple.svg" -define ico
 
 # Build Squirrel splash image
 magick "./png/256x256.png" -background "#ffffff" -gravity center -extent 640x480 "$desktop_forge_dir/setup-icon/setup-banner.gif"
-magick "./png/256x256-dev.png" -background "#ffffff" -gravity center -extent 640x480 "$desktop_forge_dir/setup-icon/setup-banner-dev.gif"
\ No newline at end of file
+magick "./png/256x256-dev.png" -background "#ffffff" -gravity center -extent 640x480 "$desktop_forge_dir/setup-icon/setup-banner-dev.gif"
+
+# Copy server assets
+server_dir="$script_dir/../../apps/server"
+cp "$desktop_forge_dir/app-icon/icon.ico" "$server_dir/src/assets/icon.ico"
+cp "$desktop_forge_dir/app-icon/icon-dev.ico" "$server_dir/src/assets/icon-dev.ico"
\ No newline at end of file