diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9c1f8908b..bcac1abec 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -79,5 +79,6 @@ jobs:
             desktop/release/nebulosa*.deb
             desktop/release/nebulosa*.rpm
             desktop/release/nebulosa*.exe
+            desktop/release/nebulosa*.msi
             desktop/release/nebulosa*.dmg
           retention-days: 3
diff --git a/desktop/electron-builder.json b/desktop/electron-builder.json
index 1be3300da..f15156295 100644
--- a/desktop/electron-builder.json
+++ b/desktop/electron-builder.json
@@ -1,5 +1,7 @@
 {
 	"asar": true,
+	"appId": "dev.tiagohm.nebulosa",
+	"productName": "Nebulosa",
 	"directories": {
 		"output": "release/"
 	},
@@ -7,6 +9,9 @@
 		"**/*",
 		"!**/*.ts",
 		"!*.map",
+		"!**/*.bmp",
+		"!**/*.ico",
+		"!**/*.icns",
 		"!package.json",
 		"!package-lock.json",
 		{
@@ -16,18 +21,22 @@
 	],
 	"extraResources": ["api.jar"],
 	"win": {
-		"icon": "dist/browser/assets/icons",
-		"target": ["portable"]
+		"icon": "dist/browser/assets/icons/nebulosa.ico",
+		"target": ["portable", "msi"]
 	},
 	"portable": {
 		"splashImage": "dist/browser/assets/images/splash.bmp"
 	},
+	"msi": {
+		"oneClick": false,
+		"runAfterFinish": false
+	},
 	"mac": {
-		"icon": "dist/browser/assets/icons",
+		"icon": "dist/browser/assets/icons/nebulosa.icns",
 		"target": ["dmg"]
 	},
 	"linux": {
-		"icon": "dist/browser/assets/icons",
+		"icon": "dist/browser/assets/icons/nebulosa.png",
 		"category": "Science",
 		"target": ["AppImage", "deb", "rpm"]
 	},
diff --git a/desktop/package.json b/desktop/package.json
index f72521d5d..3e2122e8c 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -28,6 +28,8 @@
 		"electron:build:deb": "npm run electron:build -- --linux deb",
 		"electron:build:rpm": "npm run electron:build -- --linux rpm",
 		"electron:build:app": "npm run electron:build -- --linux AppImage",
+		"electron:build:portable": "npm run electron:build -- --win portable",
+		"electron:build:msi": "npm run electron:build -- --win msi",
 		"lint": "npx eslint .",
 		"prettier:ts": "npx prettier '**/*.ts' --write",
 		"prettier:html": "npx prettier '**/*.html' --write",
diff --git a/desktop/src/assets/icons/favicon.icns b/desktop/src/assets/icons/favicon.icns
deleted file mode 100644
index e85c0c288..000000000
Binary files a/desktop/src/assets/icons/favicon.icns and /dev/null differ
diff --git a/desktop/src/assets/icons/nebulosa-256.png b/desktop/src/assets/icons/nebulosa-256.png
deleted file mode 100644
index f4c5e6415..000000000
Binary files a/desktop/src/assets/icons/nebulosa-256.png and /dev/null differ
diff --git a/desktop/src/assets/icons/nebulosa.icns b/desktop/src/assets/icons/nebulosa.icns
new file mode 100644
index 000000000..c71379f0f
Binary files /dev/null and b/desktop/src/assets/icons/nebulosa.icns differ
diff --git a/desktop/src/assets/icons/nebulosa.ico b/desktop/src/assets/icons/nebulosa.ico
new file mode 100644
index 000000000..9d99fe42b
Binary files /dev/null and b/desktop/src/assets/icons/nebulosa.ico differ
diff --git a/desktop/src/assets/icons/nebulosa.png b/desktop/src/assets/icons/nebulosa.png
index 2d70654f2..f4c5e6415 100644
Binary files a/desktop/src/assets/icons/nebulosa.png and b/desktop/src/assets/icons/nebulosa.png differ