diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
index 8800712..a041851 100644
--- a/app/src/main/java/com/github/kr328/clash/MainActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -27,10 +27,6 @@ class MainActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        setSupportActionBar(activity_main_toolbar.apply {
-            setLogo(R.mipmap.ic_launcher_foreground)
-        })
-
         activity_main_clash_proxies.setOnClickListener {
             startActivity(Intent(this, ProxyActivity::class.java))
         }
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 438ea22..e5bcaf8 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -11,7 +11,7 @@
             android:id="@+id/activity_feedback_toolbar"
             android:elevation="4dp"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/activity_import_file.xml b/app/src/main/res/layout/activity_import_file.xml
index 413511e..30b1a06 100644
--- a/app/src/main/res/layout/activity_import_file.xml
+++ b/app/src/main/res/layout/activity_import_file.xml
@@ -12,7 +12,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/activity_import_file_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="60dp">
+            android:layout_height="wrap_content">
 
             <FrameLayout
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_import_url.xml b/app/src/main/res/layout/activity_import_url.xml
index d74f0c2..3e35a0b 100644
--- a/app/src/main/res/layout/activity_import_url.xml
+++ b/app/src/main/res/layout/activity_import_url.xml
@@ -12,7 +12,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/activity_import_url_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="60dp">
+            android:layout_height="wrap_content">
 
             <FrameLayout
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_logs.xml b/app/src/main/res/layout/activity_logs.xml
index 9aecb2e..5248f5e 100644
--- a/app/src/main/res/layout/activity_logs.xml
+++ b/app/src/main/res/layout/activity_logs.xml
@@ -10,7 +10,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/activity_logs_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="60dp">
+            android:layout_height="wrap_content">
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 19af735..559651c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,12 +9,28 @@
     android:animateLayoutChanges="true"
     tools:context=".MainActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/activity_main_toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="90dp"
-        app:contentInsetStartWithNavigation="0dp"
-        app:contentInsetStart="0dp" />
+        android:gravity="center_vertical">
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="36dp"
+            android:contentDescription="@string/application_name"
+            android:src="@drawable/ic_logo" />
+        <TextView
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textSize="20sp"
+            android:textColor="@android:color/black"
+            android:text="@string/launch_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"/>
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
 
     <include layout="@layout/activity_main_clash_status" />
 
@@ -44,7 +60,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/clash_logs" />
     </LinearLayout>
@@ -71,7 +87,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/clash_settings" />
     </LinearLayout>
@@ -98,7 +114,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/clash_feedback" />
     </LinearLayout>
@@ -125,7 +141,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/clash_about" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_clash_status.xml b/app/src/main/res/layout/activity_main_clash_status.xml
index 7b3584d..d7d08ea 100644
--- a/app/src/main/res/layout/activity_main_clash_status.xml
+++ b/app/src/main/res/layout/activity_main_clash_status.xml
@@ -33,7 +33,7 @@
             android:layout_toEndOf="@id/activity_main_clash_status_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="@android:color/white"
             android:text="@string/clash_status_stopped" />
diff --git a/app/src/main/res/layout/activity_main_profiles.xml b/app/src/main/res/layout/activity_main_profiles.xml
index a38693c..faa5dc1 100644
--- a/app/src/main/res/layout/activity_main_profiles.xml
+++ b/app/src/main/res/layout/activity_main_profiles.xml
@@ -34,7 +34,7 @@
             android:layout_toEndOf="@id/activity_main_profiles_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/clash_profiles" />
 
diff --git a/app/src/main/res/layout/activity_main_proxy_manage.xml b/app/src/main/res/layout/activity_main_proxy_manage.xml
index d692230..f4cf800 100644
--- a/app/src/main/res/layout/activity_main_proxy_manage.xml
+++ b/app/src/main/res/layout/activity_main_proxy_manage.xml
@@ -34,7 +34,7 @@
             android:layout_toEndOf="@id/activity_main_clash_proxies_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="25dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/clash_proxy_manage" />
 
diff --git a/app/src/main/res/layout/activity_new_profile.xml b/app/src/main/res/layout/activity_new_profile.xml
index 75c7e22..1d22807 100644
--- a/app/src/main/res/layout/activity_new_profile.xml
+++ b/app/src/main/res/layout/activity_new_profile.xml
@@ -11,7 +11,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/activity_new_profile_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <ListView
diff --git a/app/src/main/res/layout/activity_profiles.xml b/app/src/main/res/layout/activity_profiles.xml
index 77c47d4..5882204 100644
--- a/app/src/main/res/layout/activity_profiles.xml
+++ b/app/src/main/res/layout/activity_profiles.xml
@@ -14,7 +14,7 @@
             android:id="@+id/activity_profiles_toolbar"
             android:elevation="4dp"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/activity_proxies.xml b/app/src/main/res/layout/activity_proxies.xml
index b9e00a6..789158f 100644
--- a/app/src/main/res/layout/activity_proxies.xml
+++ b/app/src/main/res/layout/activity_proxies.xml
@@ -13,7 +13,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/activity_proxies_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/app/src/main/res/layout/activity_setting_access.xml b/app/src/main/res/layout/activity_setting_access.xml
index fa34bbf..3fd6e29 100644
--- a/app/src/main/res/layout/activity_setting_access.xml
+++ b/app/src/main/res/layout/activity_setting_access.xml
@@ -14,7 +14,7 @@
             android:id="@+id/activity_setting_access_toolbar"
             android:elevation="4dp"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
 
diff --git a/app/src/main/res/layout/activity_setting_application.xml b/app/src/main/res/layout/activity_setting_application.xml
index fbaec5b..517df13 100644
--- a/app/src/main/res/layout/activity_setting_application.xml
+++ b/app/src/main/res/layout/activity_setting_application.xml
@@ -12,7 +12,7 @@
             android:id="@+id/activity_setting_application_toolbar"
             android:elevation="4dp"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/activity_setting_main.xml b/app/src/main/res/layout/activity_setting_main.xml
index 8e13aee..b37b61c 100644
--- a/app/src/main/res/layout/activity_setting_main.xml
+++ b/app/src/main/res/layout/activity_setting_main.xml
@@ -12,7 +12,7 @@
             android:id="@+id/activity_setting_main_toolbar"
             android:elevation="4dp"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/activity_setting_proxy.xml b/app/src/main/res/layout/activity_setting_proxy.xml
index e813a30..78cb180 100644
--- a/app/src/main/res/layout/activity_setting_proxy.xml
+++ b/app/src/main/res/layout/activity_setting_proxy.xml
@@ -14,7 +14,7 @@
             android:id="@+id/activity_setting_proxy_toolbar"
             android:elevation="4dp"
             android:layout_width="match_parent"
-            android:layout_height="60dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <com.github.kr328.clash.view.RadioFatItem
diff --git a/app/src/main/res/layout/preference_main_item.xml b/app/src/main/res/layout/preference_main_item.xml
index e8ac63d..6f6efef 100644
--- a/app/src/main/res/layout/preference_main_item.xml
+++ b/app/src/main/res/layout/preference_main_item.xml
@@ -11,7 +11,7 @@
     <ImageView
         android:id="@android:id/icon"
         android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
+        android:layout_marginEnd="22dp"
         android:layout_marginTop="20dp"
         android:layout_width="30dp"
         android:layout_height="30dp"
diff --git a/app/src/main/res/layout/preference_proxy_item.xml b/app/src/main/res/layout/preference_proxy_item.xml
index 545f252..0a76fdd 100644
--- a/app/src/main/res/layout/preference_proxy_item.xml
+++ b/app/src/main/res/layout/preference_proxy_item.xml
@@ -11,7 +11,7 @@
     <ImageView
         android:id="@android:id/icon"
         android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
+        android:layout_marginEnd="22dp"
         android:layout_marginTop="20dp"
         android:layout_width="30dp"
         android:layout_height="30dp"
diff --git a/app/src/main/res/layout/view_fat_item.xml b/app/src/main/res/layout/view_fat_item.xml
index e0ec1f1..2f82aa3 100644
--- a/app/src/main/res/layout/view_fat_item.xml
+++ b/app/src/main/res/layout/view_fat_item.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/view_fat_item_icon"
         android:layout_toStartOf="@id/view_fat_item_operation_clickable"
-        android:layout_marginStart="22.5dp"
+        android:layout_marginStart="24.5dp"
         android:paddingTop="15dp"
         android:paddingBottom="15dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/view_radio_fat_item.xml b/app/src/main/res/layout/view_radio_fat_item.xml
index f7b2d98..405b6b5 100644
--- a/app/src/main/res/layout/view_radio_fat_item.xml
+++ b/app/src/main/res/layout/view_radio_fat_item.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_toStartOf="@id/view_radio_fat_item_operation_clickable"
-        android:layout_marginStart="70dp"
+        android:layout_marginStart="72dp"
         android:paddingTop="15dp"
         android:paddingBottom="15dp"
         android:orientation="vertical">
diff --git a/service/src/main/res/values/arrays.xml b/service/src/main/res/values/arrays.xml
index af1e81d..61a924a 100644
--- a/service/src/main/res/values/arrays.xml
+++ b/service/src/main/res/values/arrays.xml
@@ -18,6 +18,7 @@
         <item>160.0.0.0/5</item>
         <item>168.0.0.0/6</item>
         <item>172.0.0.0/12</item>
+        <item>172.19.0.0/30</item>
         <item>172.32.0.0/11</item>
         <item>172.64.0.0/10</item>
         <item>172.128.0.0/9</item>