diff --git a/app/src/main/res/drawable/ic_toggle_all.xml b/app/src/main/res/drawable/ic_toggle_all.xml
index 29ce98e9c9..f6ad6e2ba9 100644
--- a/app/src/main/res/drawable/ic_toggle_all.xml
+++ b/app/src/main/res/drawable/ic_toggle_all.xml
@@ -1,9 +1,41 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
-  android:viewportWidth="1024"
-  android:viewportHeight="1024">
-  <path
-    android:fillColor="#000000"
-    android:pathData="M277.3,554.7h469.3a192,192 0,1 1,0 384h-469.3a192,192 0,1 1,0 -384zM746.7,85.3a192,192 0,1 1,0 384h-469.3a192,192 0,0 1,0 -384h469.3zM746.7,810.7a64,64 0,1 1,0 -128,64 64,0 0,1 0,128zM277.3,640a106.7,106.7 0,1 0,0 213.3h469.3a106.7,106.7 0,1 0,0 -213.3h-469.3zM746.7,170.7h-469.3a106.7,106.7 0,0 0,0 213.3h469.3a106.7,106.7 0,1 0,0 -213.3zM277.3,341.3a64,64 0,1 1,0 -128,64 64,0 0,1 0,128z" />
+  android:viewportWidth="24"
+  android:viewportHeight="24">
+
+  <group
+    android:pivotX="12"
+    android:pivotY="12"
+    android:scaleX="0.92"
+    android:scaleY="0.92">
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M8,3 L4,7l4,4"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M4,7h16"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="m16,21 l4,-4 -4,-4"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M20,17H4"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+  </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_toggle_off.xml b/app/src/main/res/drawable/ic_toggle_off.xml
index 6bbc6d155c..89931b20a4 100644
--- a/app/src/main/res/drawable/ic_toggle_off.xml
+++ b/app/src/main/res/drawable/ic_toggle_off.xml
@@ -1,11 +1,41 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
-  android:height="21.021898dp"
-  android:viewportWidth="1170"
-  android:viewportHeight="1024">
-
-  <path
-    android:fillColor="#000000"
-    android:pathData="M658.3,512q0,-59.4 -23.1,-113.4T572.6,305.1 479.1,242.6 365.7,219.4t-113.4,23.1T158.9,305.1 96.3,398.6 73.1,512t23.1,113.4T158.9,718.9t93.4,62.6T365.7,804.6t113.4,-23.1T572.6,718.9t62.6,-93.4T658.3,512zM1097.1,512q0,-59.4 -23.1,-113.4T1011.4,305.1t-93.4,-62.6T804.6,219.4h-220.6q68,51.4 107.7,128t39.7,164.6 -39.7,164.6 -107.7,128h220.6q59.4,0 113.4,-23.1T1011.4,718.9t62.6,-93.4T1097.1,512zM1170.3,512q0,74.3 -29.1,142t-78,116.6 -116.6,78 -142,29.1L365.7,877.7q-74.3,0 -142,-29.1t-116.6,-78 -78,-116.6T0,512t29.1,-142 78,-116.6 116.6,-78T365.7,146.3h438.9q74.3,0 142,29.1t116.6,78 78,116.6 29.1,142z" />
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
 
+  <group
+    android:pivotX="12"
+    android:pivotY="12"
+    android:scaleX="0.92"
+    android:scaleY="0.92">
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M18.36,6.64A9,9 0,0 1,20.77 15"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M6.16,6.16a9,9 0,1 0,12.68 12.68"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M12,2v4"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="m2,2 l20,20"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+  </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_toggle_on.xml b/app/src/main/res/drawable/ic_toggle_on.xml
index 1162f274a5..354b34eca7 100644
--- a/app/src/main/res/drawable/ic_toggle_on.xml
+++ b/app/src/main/res/drawable/ic_toggle_on.xml
@@ -1,11 +1,27 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
-  android:height="21.021898dp"
-  android:viewportWidth="1170"
-  android:viewportHeight="1024">
-
-  <path
-    android:fillColor="#000000"
-    android:pathData="M0,512q0,-74.3 29.1,-142t78,-116.6 116.6,-78T365.7,146.3h438.9q74.3,0 142,29.1t116.6,78 78,116.6 29.1,142 -29.1,142 -78,116.6 -116.6,78 -142,29.1L365.7,877.7q-74.3,0 -142,-29.1t-116.6,-78 -78,-116.6T0,512zM804.6,804.6q59.4,0 113.4,-23.1T1011.4,718.9t62.6,-93.4T1097.1,512t-23.1,-113.4T1011.4,305.1t-93.4,-62.6T804.6,219.4t-113.4,23.1T597.7,305.1 535.1,398.6 512,512t23.1,113.4T597.7,718.9t93.4,62.6T804.6,804.6z" />
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
 
+  <group
+    android:pivotX="12"
+    android:pivotY="12"
+    android:scaleX="0.92"
+    android:scaleY="0.92">
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M12,2v10"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+    <path
+      android:fillColor="#00000000"
+      android:pathData="M18.4,6.6a9,9 0,1 1,-12.77 0.04"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2" />
+  </group>
 </vector>
diff --git a/design/src/main/res/drawable/ic_baseline_key.xml b/design/src/main/res/drawable/ic_baseline_key.xml
index d2cd6f1138..c3ea24bd84 100644
--- a/design/src/main/res/drawable/ic_baseline_key.xml
+++ b/design/src/main/res/drawable/ic_baseline_key.xml
@@ -1,3 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    <path android:fillColor="@android:color/white" android:pathData="M21,10h-8.35C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H13l2,2l2,-2l2,2l4,-4.04L21,10zM7,15c-1.65,0 -3,-1.35 -3,-3c0,-1.65 1.35,-3 3,-3s3,1.35 3,3C10,13.65 8.65,15 7,15z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21,10h-8.35C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H13l2,2l2,-2l2,2l4,-4.04L21,10zM7,15c-1.65,0 -3,-1.35 -3,-3c0,-1.65 1.35,-3 3,-3s3,1.35 3,3C10,13.65 8.65,15 7,15z" />
 </vector>
diff --git a/design/src/main/res/values-ja-rJP/strings.xml b/design/src/main/res/values-ja-rJP/strings.xml
index 280c20abc0..92fed35d72 100644
--- a/design/src/main/res/values-ja-rJP/strings.xml
+++ b/design/src/main/res/values-ja-rJP/strings.xml
@@ -47,9 +47,9 @@
     <string name="accept_http_content">http(s) のみを許可</string>
     <string name="at_least_15_minutes">15分以上か空白にしてください</string>
     <string name="should_not_be_blank">空白にはできません</string>
-    <string name="age_secret_key">Age秘密鍵</string>
-    <string name="age_secret_key_hint">AGE-SECRET-KEY-…（任意）</string>
-    <string name="age_secret_key_error">フォーマットが無効です。鍵は AGE-SECRET-KEY- で始まる必要があります</string>
+    <string name="age_secret_key">Age 秘密鍵</string>
+    <string name="age_secret_key_hint">AGE-SECRET-KEY-… (任意)</string>
+    <string name="age_secret_key_error">形式が無効です。キーは AGE-SECRET-KEY- で始まる必要があります</string>
     <string name="detail">詳細</string>
     <string name="update">更新</string>
     <string name="edit">編集</string>
@@ -256,4 +256,4 @@
     <string name="override_destination">Override Destination</string>
     <string name="import_from_qr_no_permission">カメラのアクセスが制限されています。設定から有効にしてください。</string>
     <string name="import_from_qr_exception">システムで予期しない例外が発生しました。</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/design/src/main/res/values-ko-rKR/strings.xml b/design/src/main/res/values-ko-rKR/strings.xml
index 5e858be606..a42b6481f4 100644
--- a/design/src/main/res/values-ko-rKR/strings.xml
+++ b/design/src/main/res/values-ko-rKR/strings.xml
@@ -48,8 +48,8 @@
     <string name="at_least_15_minutes">최소 15분 이상 또는 공백</string>
     <string name="should_not_be_blank">이 필드는 공백이 허용되지 않습니다.</string>
     <string name="age_secret_key">Age 비밀 키</string>
-    <string name="age_secret_key_hint">AGE-SECRET-KEY-…（선택사항）</string>
-    <string name="age_secret_key_error">잘못된 형식입니다. 키는 AGE-SECRET-KEY- 로 시작해야 합니다</string>
+    <string name="age_secret_key_hint">AGE-SECRET-KEY-… (선택 사항)</string>
+    <string name="age_secret_key_error">형식이 올바르지 않습니다. 키는 AGE-SECRET-KEY-로 시작해야 합니다</string>
     <string name="detail">자세히</string>
     <string name="update">업데이트</string>
     <string name="edit">편집</string>
@@ -256,4 +256,4 @@
     <string name="override_destination">Override Destination</string>
     <string name="import_from_qr_no_permission">카메라 접근이 제한되었습니다. 설정에서 허용해 주세요.</string>
     <string name="import_from_qr_exception">처리되지 않은 시스템 예외가 발생했습니다.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/design/src/main/res/values-ru/strings.xml b/design/src/main/res/values-ru/strings.xml
index f81525e3b7..e96db42ce8 100644
--- a/design/src/main/res/values-ru/strings.xml
+++ b/design/src/main/res/values-ru/strings.xml
@@ -59,7 +59,7 @@
     <string name="should_not_be_blank">Не должно быть пустым</string>
     <string name="age_secret_key">Секретный ключ Age</string>
     <string name="age_secret_key_hint">AGE-SECRET-KEY-… (необязательно)</string>
-    <string name="age_secret_key_error">Неверный формат. Ключ должен начинаться с AGE-SECRET-KEY-</string>
+    <string name="age_secret_key_error">Недопустимый формат. Ключ должен начинаться с AGE-SECRET-KEY-</string>
     <string name="detail">Детали</string>
     <string name="update">Обновить</string>
     <string name="edit">Изменить</string>
diff --git a/design/src/main/res/values-zh-rHK/strings.xml b/design/src/main/res/values-zh-rHK/strings.xml
index 9a83b6e048..21f1a2cfd1 100644
--- a/design/src/main/res/values-zh-rHK/strings.xml
+++ b/design/src/main/res/values-zh-rHK/strings.xml
@@ -80,7 +80,7 @@
     <string name="install_time">安裝時間</string>
     <string name="age_secret_key">Age 私鑰</string>
     <string name="age_secret_key_hint">AGE-SECRET-KEY-…（可選）</string>
-    <string name="age_secret_key_error">格式無效。密鑰應以 AGE-SECRET-KEY- 開頭</string>
+    <string name="age_secret_key_error">無效格式。密鑰應以 AGE-SECRET-KEY- 開頭</string>
     <string name="feedback">反饋</string>
     <string name="github_issues">Github Issues</string>
     <string name="tips_properties"><![CDATA[僅接受 <strong>Clash 配置文件</strong>(包含<strong>代理</strong>/<strong>規則</strong>)]]></string>
@@ -253,4 +253,4 @@
     <string name="override_destination">Override Destination</string>
     <string name="import_from_qr_no_permission">相機權限受限，請前往設定開啟。</string>
     <string name="import_from_qr_exception">發生系統未知異常，操作失敗。</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/design/src/main/res/values-zh-rTW/strings.xml b/design/src/main/res/values-zh-rTW/strings.xml
index feca4582c9..aae2c144b2 100644
--- a/design/src/main/res/values-zh-rTW/strings.xml
+++ b/design/src/main/res/values-zh-rTW/strings.xml
@@ -80,7 +80,7 @@
     <string name="install_time">安裝時間</string>
     <string name="age_secret_key">Age 私鑰</string>
     <string name="age_secret_key_hint">AGE-SECRET-KEY-…（選填）</string>
-    <string name="age_secret_key_error">格式無效。金鑰應以 AGE-SECRET-KEY- 開頭</string>
+    <string name="age_secret_key_error">無效格式。金鑰應以 AGE-SECRET-KEY- 開頭</string>
     <string name="feedback">回饋</string>
     <string name="github_issues">Github Issues</string>
     <string name="tips_properties"><![CDATA[僅接受 <strong>Clash 設定檔</strong> (包含<strong>Proxy</strong> /<strong>規則</strong>)]]></string>
diff --git a/design/src/main/res/values-zh/strings.xml b/design/src/main/res/values-zh/strings.xml
index 09de0724bd..253ab81b98 100644
--- a/design/src/main/res/values-zh/strings.xml
+++ b/design/src/main/res/values-zh/strings.xml
@@ -80,7 +80,7 @@
     <string name="search">查找</string>
     <string name="age_secret_key">Age 私钥</string>
     <string name="age_secret_key_hint">AGE-SECRET-KEY-…（可选）</string>
-    <string name="age_secret_key_error">格式无效。密钥应以 AGE-SECRET-KEY- 开头</string>
+    <string name="age_secret_key_error">无效格式。密钥应以 AGE-SECRET-KEY- 开头</string>
     <string name="system_apps">系统应用</string>
     <string name="update_time">更新时间</string>
     <string name="package_name">应用包名称</string>