diff --git a/.gitignore b/.gitignore
index 3e7c973f8..9209dd769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,19 +23,6 @@ coverage
 *.log
 core/lib/**
 
-# Nitro binary files
-extensions/*-extension/bin/*/nitro
-extensions/*-extension/bin/*/*.metal
-extensions/*-extension/bin/*/*.exe
-extensions/*-extension/bin/*/*.dll
-extensions/*-extension/bin/*/*.exp
-extensions/*-extension/bin/*/*.lib
-extensions/*-extension/bin/saved-*
-extensions/*-extension/bin/*.tar.gz
-extensions/*-extension/bin/vulkaninfoSDK.exe
-extensions/*-extension/bin/vulkaninfo
-
-
 # Turborepo
 .turbo
 electron/test-data
@@ -54,3 +41,6 @@ electron/.version.bak
 src-tauri/binaries/engines/cortex.llamacpp
 src-tauri/resources/themes
 src-tauri/Cargo.lock
+src-tauri/icons
+!src-tauri/icons/icon.png
+src-tauri/gen/apple
\ No newline at end of file
diff --git a/package.json b/package.json
index ff5496985..ea58ead59 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "install:cortex:linux:darwin": "cd src-tauri/binaries && ./download.sh",
     "install:cortex:win32": "cd src-tauri/binaries && download.bat",
     "install:cortex": "run-script-os",
-    "dev:tauri": "yarn copy:assets:tauri && tauri dev",
+    "dev:tauri": "yarn build:icon && yarn copy:assets:tauri && tauri dev",
+    "build:icon": "tauri icon ./src-tauri/icons/icon.png",
     "build:server": "cd server && yarn build",
     "build:core": "cd core && yarn build && yarn pack",
     "build:web": "yarn workspace @janhq/web build && cpx \"web/out/**\" \"electron/renderer/\"",
diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
deleted file mode 100644
index a459c7886..000000000
Binary files a/src-tauri/icons/128x128.png and /dev/null differ
diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png
deleted file mode 100644
index e8aa6de8a..000000000
Binary files a/src-tauri/icons/128x128@2x.png and /dev/null differ
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
deleted file mode 100644
index bf6c8b5e1..000000000
Binary files a/src-tauri/icons/32x32.png and /dev/null differ
diff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.png
deleted file mode 100644
index d01700991..000000000
Binary files a/src-tauri/icons/64x64.png and /dev/null differ
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
deleted file mode 100644
index 0b46e25e3..000000000
Binary files a/src-tauri/icons/Square107x107Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
deleted file mode 100644
index f7445fbb6..000000000
Binary files a/src-tauri/icons/Square142x142Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
deleted file mode 100644
index 6dee766d5..000000000
Binary files a/src-tauri/icons/Square150x150Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
deleted file mode 100644
index fc7401854..000000000
Binary files a/src-tauri/icons/Square284x284Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
deleted file mode 100644
index 2b6916458..000000000
Binary files a/src-tauri/icons/Square30x30Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
deleted file mode 100644
index 56b4b2817..000000000
Binary files a/src-tauri/icons/Square310x310Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
deleted file mode 100644
index d74974fdb..000000000
Binary files a/src-tauri/icons/Square44x44Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
deleted file mode 100644
index f918b3589..000000000
Binary files a/src-tauri/icons/Square71x71Logo.png and /dev/null differ
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
deleted file mode 100644
index 3d0231bf3..000000000
Binary files a/src-tauri/icons/Square89x89Logo.png and /dev/null differ
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
deleted file mode 100644
index 5c7323719..000000000
Binary files a/src-tauri/icons/StoreLogo.png and /dev/null differ
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
deleted file mode 100644
index 1795d2235..000000000
Binary files a/src-tauri/icons/icon.icns and /dev/null differ
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
deleted file mode 100644
index d43710369..000000000
Binary files a/src-tauri/icons/icon.ico and /dev/null differ