diff --git a/README.md b/README.md
index 2d663800a..0528eadc2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-
+
Continuation of Clash Verge
diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
index be2533a7f..b8ad9fb7d 100644
Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ
diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png
index 324589136..412993ed9 100644
Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
index 1a93685f9..cee2506a5 100644
Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
index 4240ea569..54f75e5a4 100644
Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
index 822b49ba5..f31ebfa15 100644
Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
index bb7e49482..cdc4839a9 100644
Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
index 9b0ec9fa8..4d4c1fa32 100644
Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
index 496a662f3..6fd7c3450 100644
Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
index c02df10fa..a4a2765c4 100644
Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
index 8ff531dba..b7aae8bd2 100644
Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
index 7829892e4..14b244bbe 100644
Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
index 6b6499003..a3aea096e 100644
Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
index 15344c6c4..6e4c0369b 100644
Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ
diff --git a/src-tauri/icons/icon-new.icns b/src-tauri/icons/icon-new.icns
deleted file mode 100644
index b66e74eb8..000000000
Binary files a/src-tauri/icons/icon-new.icns and /dev/null differ
diff --git a/src-tauri/icons/icon-shrink.png b/src-tauri/icons/icon-shrink.png
deleted file mode 100644
index 5ebfa3834..000000000
Binary files a/src-tauri/icons/icon-shrink.png and /dev/null differ
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
index 88df4a03c..51b7d0821 100644
Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
index e406a78f2..955101740 100644
Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
index cf91cf6ca..45978f596 100644
Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differ
diff --git a/src-tauri/icons/mac-tray-icon-sys.png b/src-tauri/icons/mac-tray-icon-sys.png
deleted file mode 100644
index 5d7d05d6a..000000000
Binary files a/src-tauri/icons/mac-tray-icon-sys.png and /dev/null differ
diff --git a/src-tauri/icons/mac-tray-icon-tun.png b/src-tauri/icons/mac-tray-icon-tun.png
deleted file mode 100644
index 99ff9095b..000000000
Binary files a/src-tauri/icons/mac-tray-icon-tun.png and /dev/null differ
diff --git a/src-tauri/icons/mac-tray-icon.png b/src-tauri/icons/mac-tray-icon.png
index 27177e581..727b0fec6 100644
Binary files a/src-tauri/icons/mac-tray-icon.png and b/src-tauri/icons/mac-tray-icon.png differ
diff --git a/src-tauri/icons/tray-icon-sys.ico b/src-tauri/icons/tray-icon-sys.ico
new file mode 100644
index 000000000..653a3adc1
Binary files /dev/null and b/src-tauri/icons/tray-icon-sys.ico differ
diff --git a/src-tauri/icons/tray-icon-sys.png b/src-tauri/icons/tray-icon-sys.png
deleted file mode 100644
index 5227561a0..000000000
Binary files a/src-tauri/icons/tray-icon-sys.png and /dev/null differ
diff --git a/src-tauri/icons/tray-icon-tun.ico b/src-tauri/icons/tray-icon-tun.ico
new file mode 100644
index 000000000..6ecbed17f
Binary files /dev/null and b/src-tauri/icons/tray-icon-tun.ico differ
diff --git a/src-tauri/icons/tray-icon-tun.png b/src-tauri/icons/tray-icon-tun.png
deleted file mode 100644
index e2e3725da..000000000
Binary files a/src-tauri/icons/tray-icon-tun.png and /dev/null differ
diff --git a/src-tauri/icons/tray-icon.ico b/src-tauri/icons/tray-icon.ico
index 611c95824..955101740 100644
Binary files a/src-tauri/icons/tray-icon.ico and b/src-tauri/icons/tray-icon.ico differ
diff --git a/src-tauri/icons/tray-icon.png b/src-tauri/icons/tray-icon.png
deleted file mode 100644
index 29616c85b..000000000
Binary files a/src-tauri/icons/tray-icon.png and /dev/null differ
diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs
index 154600dfd..b11633a1d 100644
--- a/src-tauri/src/core/tray.rs
+++ b/src-tauri/src/core/tray.rs
@@ -177,10 +177,9 @@ impl Tray {
let tun_tray_icon = verge.tun_tray_icon.as_ref().unwrap_or(&false);
let mut indication_icon = if *system_proxy {
- #[cfg(not(target_os = "macos"))]
- let mut icon = include_bytes!("../../icons/tray-icon-sys.png").to_vec();
#[cfg(target_os = "macos")]
- let mut icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec();
+ let _ = tray.set_icon_as_template(false);
+ let mut icon = include_bytes!("../../icons/tray-icon-sys.ico").to_vec();
if *sysproxy_tray_icon {
let icon_dir_path = dirs::app_home_dir()?.join("icons");
let png_path = icon_dir_path.join("sysproxy.png");
@@ -193,10 +192,12 @@ impl Tray {
}
icon
} else {
- #[cfg(not(target_os = "macos"))]
- let mut icon = include_bytes!("../../icons/tray-icon.png").to_vec();
+ #[cfg(target_os = "macos")]
+ let _ = tray.set_icon_as_template(true);
#[cfg(target_os = "macos")]
let mut icon = include_bytes!("../../icons/mac-tray-icon.png").to_vec();
+ #[cfg(not(target_os = "macos"))]
+ let mut icon = include_bytes!("../../icons/tray-icon.ico").to_vec();
if *common_tray_icon {
let icon_dir_path = dirs::app_home_dir()?.join("icons");
let png_path = icon_dir_path.join("common.png");
@@ -211,10 +212,9 @@ impl Tray {
};
if *tun_mode {
- #[cfg(not(target_os = "macos"))]
- let mut icon = include_bytes!("../../icons/tray-icon-tun.png").to_vec();
#[cfg(target_os = "macos")]
- let mut icon = include_bytes!("../../icons/mac-tray-icon-tun.png").to_vec();
+ let _ = tray.set_icon_as_template(false);
+ let mut icon = include_bytes!("../../icons/tray-icon-tun.ico").to_vec();
if *tun_tray_icon {
let icon_dir_path = dirs::app_home_dir()?.join("icons");
let png_path = icon_dir_path.join("tun.png");
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index f4cb4516f..321d6c9e0 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -18,7 +18,7 @@
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
- "icons/icon-new.icns",
+ "icons/icon.icns",
"icons/icon.ico"
],
"resources": ["resources"],
diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json
index 40933e7d1..ec1e7b582 100644
--- a/src-tauri/tauri.linux.conf.json
+++ b/src-tauri/tauri.linux.conf.json
@@ -2,7 +2,7 @@
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"tauri": {
"systemTray": {
- "iconPath": "icons/tray-icon.png"
+ "iconPath": "icons/tray-icon.ico"
},
"bundle": {
"identifier": "io.github.clash-verge-rev.clash-verge-rev",
diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
index bde282817..b986efafe 100644
--- a/src-tauri/tauri.windows.conf.json
+++ b/src-tauri/tauri.windows.conf.json
@@ -2,7 +2,7 @@
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"tauri": {
"systemTray": {
- "iconPath": "icons/tray-icon.png"
+ "iconPath": "icons/tray-icon.ico"
},
"bundle": {
"identifier": "io.github.clash-verge-rev.clash-verge-rev",
diff --git a/src-tauri/webview2.arm64.json b/src-tauri/webview2.arm64.json
index 1130be883..8079b63ab 100644
--- a/src-tauri/webview2.arm64.json
+++ b/src-tauri/webview2.arm64.json
@@ -2,7 +2,7 @@
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"tauri": {
"systemTray": {
- "iconPath": "icons/tray-icon.png"
+ "iconPath": "icons/tray-icon.ico"
},
"bundle": {
"identifier": "io.github.clash-verge-rev.clash-verge-rev",
diff --git a/src-tauri/webview2.x64.json b/src-tauri/webview2.x64.json
index 26a069a8c..27f772d4d 100644
--- a/src-tauri/webview2.x64.json
+++ b/src-tauri/webview2.x64.json
@@ -2,7 +2,7 @@
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"tauri": {
"systemTray": {
- "iconPath": "icons/tray-icon.png"
+ "iconPath": "icons/tray-icon.ico"
},
"bundle": {
"identifier": "io.github.clash-verge-rev.clash-verge-rev",
diff --git a/src-tauri/webview2.x86.json b/src-tauri/webview2.x86.json
index ab2b490f2..ea1eb337d 100644
--- a/src-tauri/webview2.x86.json
+++ b/src-tauri/webview2.x86.json
@@ -2,7 +2,7 @@
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"tauri": {
"systemTray": {
- "iconPath": "icons/tray-icon.png"
+ "iconPath": "icons/tray-icon.ico"
},
"bundle": {
"identifier": "io.github.clash-verge-rev.clash-verge-rev",