diff --git a/cc-haha/desktop/public/app-icon.png b/cc-haha/desktop/public/app-icon.png
index 91fe0b8..26b60c1 100644
Binary files a/cc-haha/desktop/public/app-icon.png and b/cc-haha/desktop/public/app-icon.png differ
diff --git a/cc-haha/desktop/scripts/build-macos-arm64.sh b/cc-haha/desktop/scripts/build-macos-arm64.sh
index 407d771..4a1f615 100755
--- a/cc-haha/desktop/scripts/build-macos-arm64.sh
+++ b/cc-haha/desktop/scripts/build-macos-arm64.sh
@@ -9,12 +9,14 @@ REPO_ROOT="$(cd "${DESKTOP_DIR}/.." && pwd)"
 TARGET_TRIPLE="aarch64-apple-darwin"
 TAURI_TARGET_DIR="${DESKTOP_DIR}/src-tauri/target"
 CANONICAL_OUTPUT_DIR="${DESKTOP_DIR}/build-artifacts/macos-arm64"
-APP_BUNDLE_NAME="Claude Code Haha.app"
-APP_BUNDLE_ID="com.claude-code-haha.desktop"
+APP_BUNDLE_NAME="HeiCode.app"
+APP_BUNDLE_ID="com.heicode.desktop"
+DMG_VOLUME_NAME="Heicode"
+DEFAULT_DMG_BASENAME="Heicode_0.1.0_aarch64.dmg"
 
 usage() {
   cat <<'EOF'
-Build Claude Code Haha desktop for macOS Apple Silicon and output a DMG.
+Build Heicode desktop for macOS Apple Silicon and output a DMG.
 
 Usage:
   ./desktop/scripts/build-macos-arm64.sh [extra tauri build args...]
@@ -79,10 +81,10 @@ rm -rf "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/bundle"
 rm -rf "${DESKTOP_DIR}/src-tauri/target/release/bundle"
 rm -rf "${DESKTOP_DIR}/dist"
 rm -f "${DESKTOP_DIR}/tsconfig.tsbuildinfo"
-rm -rf "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/build/claude-code-desktop-"*
-rm -rf "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/.fingerprint/claude-code-desktop-"*
-rm -f "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/deps/claude_code_desktop-"*
-rm -f "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/deps/libclaude_code_desktop-"*
+rm -rf "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/build/heicode-desktop-"*
+rm -rf "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/.fingerprint/heicode-desktop-"*
+rm -f "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/deps/heicode_desktop-"*
+rm -f "${DESKTOP_DIR}/src-tauri/target/${TARGET_TRIPLE}/release/deps/libheicode_desktop-"*
 
 echo "[build-macos-arm64] Rebuilding frontend (tsc + vite)..."
 (cd "${DESKTOP_DIR}" && bun run build)
@@ -159,15 +161,15 @@ build_canonical_dmg() {
   local staging_dir
   local rw_dmg
 
-  staging_dir="$(mktemp -d "${TMPDIR:-/tmp}/cc-haha-dmg.XXXXXX")"
-  rw_dmg="$(mktemp "${TMPDIR:-/tmp}/cc-haha-rw.XXXXXX").dmg"
+  staging_dir="$(mktemp -d "${TMPDIR:-/tmp}/heicode-dmg.XXXXXX")"
+  rw_dmg="$(mktemp "${TMPDIR:-/tmp}/heicode-rw.XXXXXX").dmg"
 
   cp -R "${app_bundle}" "${staging_dir}/"
   ln -s /Applications "${staging_dir}/Applications"
 
   # Create a read-write DMG first so we can customize the Finder layout
   hdiutil create \
-    -volname "Claude Code Haha" \
+    -volname "${DMG_VOLUME_NAME}" \
     -srcfolder "${staging_dir}" \
     -ov \
     -format UDRW \
@@ -188,7 +190,7 @@ build_canonical_dmg() {
   # 所以这里允许 osascript 非零退出,只 warn,不让 set -e 炸掉整个脚本。
   if ! osascript <<APPLESCRIPT
 tell application "Finder"
-  tell disk "Claude Code Haha"
+  tell disk "${DMG_VOLUME_NAME}"
     open
     set current view of container window to icon view
     set toolbar visible of container window to false
@@ -274,7 +276,7 @@ if [[ -n "${LATEST_APP}" ]]; then
   rm -f "${CANONICAL_OUTPUT_DIR}/"*.dmg
   build_canonical_dmg \
     "${CANONICAL_OUTPUT_DIR}/${APP_BUNDLE_NAME}" \
-    "${CANONICAL_OUTPUT_DIR}/$(basename "${LATEST_DMG:-Claude Code Haha_0.1.0_aarch64.dmg}")"
+    "${CANONICAL_OUTPUT_DIR}/$(basename "${LATEST_DMG:-${DEFAULT_DMG_BASENAME}}")"
 fi
 
 cat > "${CANONICAL_OUTPUT_DIR}/BUILD_INFO.txt" <<EOF
diff --git a/cc-haha/desktop/src-tauri/icons/128x128.png b/cc-haha/desktop/src-tauri/icons/128x128.png
index cef0223..30ba0b3 100644
Binary files a/cc-haha/desktop/src-tauri/icons/128x128.png and b/cc-haha/desktop/src-tauri/icons/128x128.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/128x128@2x.png b/cc-haha/desktop/src-tauri/icons/128x128@2x.png
index 98cb34f..56310da 100644
Binary files a/cc-haha/desktop/src-tauri/icons/128x128@2x.png and b/cc-haha/desktop/src-tauri/icons/128x128@2x.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/32x32.png b/cc-haha/desktop/src-tauri/icons/32x32.png
index 092e8e7..c355571 100644
Binary files a/cc-haha/desktop/src-tauri/icons/32x32.png and b/cc-haha/desktop/src-tauri/icons/32x32.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/64x64.png b/cc-haha/desktop/src-tauri/icons/64x64.png
index 1af7f41..274972e 100644
Binary files a/cc-haha/desktop/src-tauri/icons/64x64.png and b/cc-haha/desktop/src-tauri/icons/64x64.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square107x107Logo.png b/cc-haha/desktop/src-tauri/icons/Square107x107Logo.png
index 2a5e8fd..8a28d9e 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square107x107Logo.png and b/cc-haha/desktop/src-tauri/icons/Square107x107Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square142x142Logo.png b/cc-haha/desktop/src-tauri/icons/Square142x142Logo.png
index 3ca1c14..2ca9c17 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square142x142Logo.png and b/cc-haha/desktop/src-tauri/icons/Square142x142Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square150x150Logo.png b/cc-haha/desktop/src-tauri/icons/Square150x150Logo.png
index 9545e5d..95c30a3 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square150x150Logo.png and b/cc-haha/desktop/src-tauri/icons/Square150x150Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square284x284Logo.png b/cc-haha/desktop/src-tauri/icons/Square284x284Logo.png
index bca5daa..83875ee 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square284x284Logo.png and b/cc-haha/desktop/src-tauri/icons/Square284x284Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square30x30Logo.png b/cc-haha/desktop/src-tauri/icons/Square30x30Logo.png
index 9bbeacc..cf9ead0 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square30x30Logo.png and b/cc-haha/desktop/src-tauri/icons/Square30x30Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square310x310Logo.png b/cc-haha/desktop/src-tauri/icons/Square310x310Logo.png
index 15b90f1..bdad1fa 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square310x310Logo.png and b/cc-haha/desktop/src-tauri/icons/Square310x310Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square44x44Logo.png b/cc-haha/desktop/src-tauri/icons/Square44x44Logo.png
index 3090866..dfd73ae 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square44x44Logo.png and b/cc-haha/desktop/src-tauri/icons/Square44x44Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square71x71Logo.png b/cc-haha/desktop/src-tauri/icons/Square71x71Logo.png
index 980a7d9..99f855b 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square71x71Logo.png and b/cc-haha/desktop/src-tauri/icons/Square71x71Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/Square89x89Logo.png b/cc-haha/desktop/src-tauri/icons/Square89x89Logo.png
index 0ca1a7e..119d532 100644
Binary files a/cc-haha/desktop/src-tauri/icons/Square89x89Logo.png and b/cc-haha/desktop/src-tauri/icons/Square89x89Logo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/StoreLogo.png b/cc-haha/desktop/src-tauri/icons/StoreLogo.png
index 9e566c3..c120975 100644
Binary files a/cc-haha/desktop/src-tauri/icons/StoreLogo.png and b/cc-haha/desktop/src-tauri/icons/StoreLogo.png differ
diff --git a/cc-haha/desktop/src-tauri/icons/icon.icns b/cc-haha/desktop/src-tauri/icons/icon.icns
index 0e4094c..39e942a 100644
Binary files a/cc-haha/desktop/src-tauri/icons/icon.icns and b/cc-haha/desktop/src-tauri/icons/icon.icns differ
diff --git a/cc-haha/desktop/src-tauri/icons/icon.ico b/cc-haha/desktop/src-tauri/icons/icon.ico
index 7312682..bd4cc85 100644
Binary files a/cc-haha/desktop/src-tauri/icons/icon.ico and b/cc-haha/desktop/src-tauri/icons/icon.ico differ
diff --git a/cc-haha/desktop/src-tauri/icons/icon.png b/cc-haha/desktop/src-tauri/icons/icon.png
index bf3255e..26b60c1 100644
Binary files a/cc-haha/desktop/src-tauri/icons/icon.png and b/cc-haha/desktop/src-tauri/icons/icon.png differ
diff --git a/heicode-logo.jpg b/heicode-logo.jpg
new file mode 100644
index 0000000..e7e8fd9
Binary files /dev/null and b/heicode-logo.jpg differ
diff --git a/scripts/rebuild-icons.py b/scripts/rebuild-icons.py
new file mode 100644
index 0000000..a3bbed4
--- /dev/null
+++ b/scripts/rebuild-icons.py
@@ -0,0 +1,83 @@
+"""Regenerate Tauri/desktop icons from heicode-logo.jpg."""
+from pathlib import Path
+from PIL import Image
+
+ROOT = Path(__file__).resolve().parent.parent
+SRC = ROOT / "heicode-logo.jpg"
+TAURI_ICONS = ROOT / "cc-haha" / "desktop" / "src-tauri" / "icons"
+PUBLIC = ROOT / "cc-haha" / "desktop" / "public"
+
+def load_trimmed_square():
+    img = Image.open(SRC).convert("RGB")
+    # Find bbox of non-white pixels (treat >=250 RGB as white).
+    gray = img.convert("L")
+    mask = gray.point(lambda v: 0 if v >= 250 else 255)
+    bbox = mask.getbbox()
+    if bbox:
+        img = img.crop(bbox)
+    # Pad to square on white.
+    w, h = img.size
+    side = max(w, h)
+    canvas = Image.new("RGB", (side, side), (255, 255, 255))
+    canvas.paste(img, ((side - w) // 2, (side - h) // 2))
+    return canvas
+
+def to_rgba_with_transparent_white(img: Image.Image, threshold: int = 248) -> Image.Image:
+    rgba = img.convert("RGBA")
+    pixels = rgba.load()
+    w, h = rgba.size
+    for y in range(h):
+        for x in range(w):
+            r, g, b, _ = pixels[x, y]
+            if r >= threshold and g >= threshold and b >= threshold:
+                pixels[x, y] = (r, g, b, 0)
+    return rgba
+
+def main():
+    base = load_trimmed_square()
+    print(f"Trimmed source: {base.size}")
+
+    # PNG outputs (RGB on white → looks correct on any background, matches glass edges).
+    sizes = {
+        TAURI_ICONS / "32x32.png": 32,
+        TAURI_ICONS / "64x64.png": 64,
+        TAURI_ICONS / "128x128.png": 128,
+        TAURI_ICONS / "128x128@2x.png": 256,
+        TAURI_ICONS / "icon.png": 1024,
+        PUBLIC / "app-icon.png": 1024,
+    }
+    for path, size in sizes.items():
+        path.parent.mkdir(parents=True, exist_ok=True)
+        base.resize((size, size), Image.LANCZOS).save(path, "PNG")
+        print(f"wrote {path} ({size})")
+
+    # Windows Square*Logo / StoreLogo
+    win_sizes = {
+        "Square30x30Logo.png": 30,
+        "Square44x44Logo.png": 44,
+        "Square71x71Logo.png": 71,
+        "Square89x89Logo.png": 89,
+        "Square107x107Logo.png": 107,
+        "Square142x142Logo.png": 142,
+        "Square150x150Logo.png": 150,
+        "Square284x284Logo.png": 284,
+        "Square310x310Logo.png": 310,
+        "StoreLogo.png": 50,
+    }
+    for name, size in win_sizes.items():
+        path = TAURI_ICONS / name
+        base.resize((size, size), Image.LANCZOS).save(path, "PNG")
+        print(f"wrote {path} ({size})")
+
+    # ICO with multi-resolution.
+    ico_path = TAURI_ICONS / "icon.ico"
+    base.save(ico_path, format="ICO", sizes=[(16,16),(24,24),(32,32),(48,48),(64,64),(128,128),(256,256)])
+    print(f"wrote {ico_path}")
+
+    # ICNS (PIL supports it). Required sizes: 16,32,64,128,256,512,1024.
+    icns_path = TAURI_ICONS / "icon.icns"
+    base.save(icns_path, format="ICNS", sizes=[(16,16),(32,32),(64,64),(128,128),(256,256),(512,512),(1024,1024)])
+    print(f"wrote {icns_path}")
+
+if __name__ == "__main__":
+    main()