diff --git a/desktop/forge.config.ts b/desktop/forge.config.ts
index 2d07afa..89fd484 100644
--- a/desktop/forge.config.ts
+++ b/desktop/forge.config.ts
@@ -51,7 +51,7 @@ const config: ForgeConfig = {
       : "SilverBullet",
     icon: "../web/images/logo",
     appBundleId: "md.silverbullet",
-    extraResource: [denoExecutableResource, "resources/silverbullet.js"],
+    extraResource: [denoExecutableResource, "resources/silverbullet.js", "resources/logo.png"],
     beforeCopyExtraResources: [(
       _buildPath: string,
       _electronVersion: string,
@@ -67,6 +67,7 @@ const config: ForgeConfig = {
         await downloadDeno(platform, arch);
         // Copy silverbullet.js
         fs.copyFileSync("../dist/silverbullet.js", "resources/silverbullet.js");
+        fs.copyFileSync("../web/images/logo.png", "resources/logo.png");
       }).then((r) => callback()).catch(callback);
     }],
     osxSign: {
@@ -81,10 +82,17 @@ const config: ForgeConfig = {
   },
   rebuildConfig: {},
   makers: [
-    new MakerSquirrel({}),
+    new MakerSquirrel({
+      iconUrl: "https://silverbullet.md/icon.ico",
+      setupIcon: "../web/images/icon.ico"
+    }),
     new MakerZIP({}, ["darwin", "linux"]),
     new MakerRpm({}),
-    new MakerDeb({}),
+    new MakerDeb({
+      options: {
+        icon: "../web/images/logo.png"
+      }
+    }),
   ],
 
   plugins: [
diff --git a/desktop/src/instance.ts b/desktop/src/instance.ts
index 9e46fb4..3991ff2 100644
--- a/desktop/src/instance.ts
+++ b/desktop/src/instance.ts
@@ -151,6 +151,7 @@ export function newWindow(instance: Instance, windowState: WindowState) {
     width: windowState.width,
     x: windowState.x,
     y: windowState.y,
+    icon: process.resourcesPath + "/logo.png",
     webPreferences: {
       preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
     },
diff --git a/scripts/build_demo.sh b/scripts/build_demo.sh
index ed218ff..2ee95a0 100755
--- a/scripts/build_demo.sh
+++ b/scripts/build_demo.sh
@@ -38,3 +38,4 @@ echo "Bundling..."
 deno task bundle
 cp dist/silverbullet.js website_build/
 cp dist_bundle/web/global.plug.json website_build/
+cp web/images/icon.ico website_build/
\ No newline at end of file