diff --git a/V2rayNG/app/src/main/res/layout/activity_about.xml b/V2rayNG/app/src/main/res/layout/activity_about.xml
index 7479371b..b132483a 100644
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -46,7 +46,7 @@
                         android:id="@+id/tv_backup_summary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_spacing_dp16"
+                        android:layout_marginTop="@dimen/padding_spacing_dp16"
                         android:maxLines="4"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml
index d96c1518..c14f4b93 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -89,7 +89,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|end"
-                    android:layout_marginBottom="@dimen/margin_spacing_dp16">
+                    android:layout_marginBottom="@dimen/padding_spacing_dp16">
 
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/fab"
@@ -98,7 +98,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentBottom="true"
                         android:layout_gravity="bottom|end"
-                        android:layout_margin="@dimen/margin_spacing_dp16"
+                        android:layout_margin="@dimen/padding_spacing_dp16"
                         android:clickable="true"
                         android:focusable="true"
                         android:nextFocusLeft="@+id/layout_test"
diff --git a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
index 3654aa0e..494ec259 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
@@ -15,12 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/margin_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -38,7 +38,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -53,7 +53,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -66,7 +66,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -86,7 +86,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -106,7 +106,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -124,7 +124,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -143,7 +143,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -162,7 +162,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -182,8 +182,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
index 6fc56338..f375923e 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
@@ -19,7 +19,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/margin_spacing_dp16"
+                android:layout_margin="@dimen/padding_spacing_dp8"
                 android:orientation="vertical">
 
                 <TextView
@@ -30,18 +30,16 @@
                 <Spinner
                     android:id="@+id/sp_domain_strategy"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/padding_spacing_dp8"
                     android:entries="@array/routing_domain_strategy" />
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
-                android:layout_marginBottom="@dimen/margin_spacing_dp16"
-                android:orientation="vertical"
-                android:paddingStart="@dimen/padding_spacing_dp16">
+                android:layout_margin="@dimen/padding_spacing_dp8"
+                android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
index 94c7d9a5..c7ae1682 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
@@ -13,7 +13,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/margin_spacing_dp8"
+            android:layout_margin="@dimen/padding_spacing_dp8"
             android:orientation="vertical">
 
             <TextView
@@ -27,7 +27,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/margin_spacing_dp8"
+            android:layout_margin="@dimen/padding_spacing_dp8"
             android:orientation="vertical">
 
             <TextView
@@ -40,7 +40,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/margin_spacing_dp8"
+            android:layout_margin="@dimen/padding_spacing_dp8"
             android:orientation="vertical">
 
             <TextView
@@ -64,7 +64,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/margin_spacing_dp8"
+                android:layout_margin="@dimen/padding_spacing_dp8"
                 android:text="@string/server_lab_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
@@ -72,7 +72,7 @@
                 android:id="@+id/editor"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:gravity="top|start" />
         </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
index 8bbec4ce..7fb5fe28 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -35,7 +35,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -54,7 +54,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -73,7 +73,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -92,7 +92,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -111,7 +111,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -132,8 +132,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
index 3bf09862..6d297d96 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -36,7 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -58,8 +58,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
index 28d51ff9..db360231 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -36,7 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -55,8 +55,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
index e41b7f47..462ed6fa 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -39,8 +39,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
index 0d5238bf..903f05a5 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -35,7 +35,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -53,7 +53,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -77,8 +77,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
index 933af329..585f7348 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -35,7 +35,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -57,8 +57,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
index d210653c..cbe32ada 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
@@ -9,14 +9,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -35,7 +35,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -54,7 +54,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -74,7 +74,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -99,7 +99,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -117,7 +117,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -136,8 +136,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
index d30f6e11..29a5b5e4 100644
--- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/margin_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -32,7 +32,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -51,7 +51,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -76,7 +76,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -95,7 +95,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="horizontal">
 
                 <TextView
@@ -117,7 +117,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="horizontal">
 
                 <TextView
@@ -140,7 +140,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -160,7 +160,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -181,8 +181,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml b/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
index b2ac45c5..98542b5e 100644
--- a/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/margin_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -31,7 +31,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -50,7 +50,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -77,8 +77,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
index 4b9b97ac..e6d5dbc2 100644
--- a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
+++ b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
@@ -7,12 +7,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/margin_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <Spinner
@@ -25,7 +25,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginTop="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
index 1ca2e9de..bd6e447f 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="3"
-            android:paddingTop="@dimen/margin_spacing_dp8"
+            android:paddingTop="@dimen/padding_spacing_dp8"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
     </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
index e02cdc43..03245c76 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
@@ -19,7 +19,7 @@
             android:layout_height="match_parent"
             android:gravity="center|left"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/margin_spacing_dp16">
+            android:paddingBottom="@dimen/padding_spacing_dp16">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml b/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
index f71e28b9..d36ac1da 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
@@ -11,10 +11,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_spacing_dp8"
-        android:paddingTop="@dimen/margin_spacing_dp8"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/margin_spacing_dp8">
+        android:padding="@dimen/padding_spacing_dp8"
+        android:orientation="vertical">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/log_tag"
@@ -25,7 +23,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/log_content"
             android:layout_width="match_parent"
-            android:paddingTop="@dimen/margin_spacing_dp8"
+            android:paddingTop="@dimen/padding_spacing_dp8"
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
index bc7c454d..cb808776 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/view_height_dp72"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
@@ -23,6 +22,7 @@
         <LinearLayout
             android:id="@+id/layout_indicator"
             android:layout_width="6dp"
+            android:layout_marginStart="4dp"
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:orientation="vertical" />
@@ -52,7 +52,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:lines="1"
-                    android:paddingTop="@dimen/margin_spacing_dp8"
+                    android:paddingTop="@dimen/padding_spacing_dp8"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
             </LinearLayout>
@@ -69,7 +69,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingTop="2dp"
+                android:paddingTop="4dp"
                 android:paddingEnd="@dimen/padding_spacing_dp16">
 
                 <TextView
@@ -111,7 +111,7 @@
                     android:gravity="center"
                     android:nextFocusLeft="@+id/info_container"
                     android:orientation="vertical"
-                    android:padding="@dimen/margin_spacing_dp8">
+                    android:padding="@dimen/padding_spacing_dp8">
 
                     <ImageView
                         android:layout_width="wrap_content"
@@ -129,7 +129,7 @@
                     android:focusable="true"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/margin_spacing_dp8">
+                    android:padding="@dimen/padding_spacing_dp8">
 
                     <ImageView
                         android:layout_width="@dimen/image_size_dp24"
@@ -147,7 +147,7 @@
                     android:focusable="true"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/margin_spacing_dp8">
+                    android:padding="@dimen/padding_spacing_dp8">
 
                     <ImageView
                         android:layout_width="@dimen/image_size_dp24"
@@ -162,7 +162,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:orientation="vertical"
-                android:paddingBottom="2dp"
+                android:paddingBottom="4dp"
                 android:paddingEnd="@dimen/padding_spacing_dp16">
 
                 <TextView
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
index 4f823e60..86a4fe46 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
@@ -11,15 +11,14 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/view_height_dp90"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
         android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/margin_spacing_dp8"
-        android:paddingBottom="@dimen/margin_spacing_dp8">
+        android:paddingTop="@dimen/padding_spacing_dp8"
+        android:paddingBottom="@dimen/padding_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
@@ -53,7 +52,7 @@
                 android:id="@+id/domainIp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp8"
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
                 android:lines="1"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -61,7 +60,7 @@
                 android:id="@+id/outboundTag"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp8"
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
                 android:lines="1"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -85,7 +84,7 @@
                 android:gravity="center"
                 android:nextFocusLeft="@+id/info_container"
                 android:orientation="vertical"
-                android:padding="@dimen/margin_spacing_dp8">
+                android:padding="@dimen/padding_spacing_dp8">
 
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
@@ -96,7 +95,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp8"
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
                 android:orientation="horizontal">
 
                 <androidx.appcompat.widget.SwitchCompat
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
index 1afa5634..5e4e68c4 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
@@ -11,15 +11,14 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/view_height_dp90"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
         android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/margin_spacing_dp8"
-        android:paddingBottom="@dimen/margin_spacing_dp8">
+        android:paddingTop="@dimen/padding_spacing_dp8"
+        android:paddingBottom="@dimen/padding_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
@@ -38,7 +37,7 @@
                 android:id="@+id/tv_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp8"
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
                 android:lines="2"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -67,7 +66,7 @@
                     android:focusable="true"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/margin_spacing_dp8">
+                    android:padding="@dimen/padding_spacing_dp8">
 
                     <ImageView
                         android:layout_width="@dimen/image_size_dp24"
@@ -86,7 +85,7 @@
                     android:gravity="center"
                     android:nextFocusLeft="@+id/info_container"
                     android:orientation="vertical"
-                    android:padding="@dimen/margin_spacing_dp8">
+                    android:padding="@dimen/padding_spacing_dp8">
 
                     <ImageView
                         android:layout_width="@dimen/image_size_dp24"
@@ -99,7 +98,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_spacing_dp8"
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
                 android:orientation="horizontal">
 
                 <androidx.appcompat.widget.SwitchCompat
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
index 4f7c2ca0..24d908b4 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
@@ -8,11 +8,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
-        android:padding="@dimen/margin_spacing_dp8">
+        android:padding="@dimen/padding_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
@@ -60,7 +59,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:focusable="true"
-            android:padding="@dimen/margin_spacing_dp8">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <ImageView
                 android:layout_width="@dimen/image_size_dp24"
@@ -75,7 +74,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:focusable="true"
-            android:padding="@dimen/margin_spacing_dp8">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <ImageView
                 android:layout_width="@dimen/image_size_dp24"
diff --git a/V2rayNG/app/src/main/res/layout/layout_address_port.xml b/V2rayNG/app/src/main/res/layout/layout_address_port.xml
index b34c8b5f..14b53edb 100644
--- a/V2rayNG/app/src/main/res/layout/layout_address_port.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_address_port.xml
@@ -19,7 +19,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -38,7 +38,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -57,7 +57,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
diff --git a/V2rayNG/app/src/main/res/layout/layout_tls.xml b/V2rayNG/app/src/main/res/layout/layout_tls.xml
index affb1b40..469c4b57 100644
--- a/V2rayNG/app/src/main/res/layout/layout_tls.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_spacing_dp16"
+    android:layout_marginTop="@dimen/padding_spacing_dp16"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/lay_stream_security"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
 
         android:orientation="vertical">
 
@@ -31,7 +31,7 @@
         android:id="@+id/lay_sni"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -53,7 +53,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16">
+        android:layout_marginBottom="@dimen/padding_spacing_dp16">
 
         <TextView
             android:layout_width="wrap_content"
@@ -74,7 +74,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16">
+        android:layout_marginBottom="@dimen/padding_spacing_dp16">
 
         <TextView
             android:layout_width="wrap_content"
@@ -112,7 +112,7 @@
         android:id="@+id/lay_public_key"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -133,7 +133,7 @@
         android:id="@+id/lay_short_id"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -154,7 +154,7 @@
         android:id="@+id/lay_spider_x"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
diff --git a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
index 6814af4e..329fcec2 100644
--- a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_spacing_dp16"
+    android:layout_marginTop="@dimen/padding_spacing_dp16"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/lay_stream_security"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
 
         android:orientation="vertical">
 
@@ -31,7 +31,7 @@
         android:id="@+id/lay_sni"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_spacing_dp16"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -70,7 +70,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/padding_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
diff --git a/V2rayNG/app/src/main/res/layout/layout_transport.xml b/V2rayNG/app/src/main/res/layout/layout_transport.xml
index 12136d59..309d9d15 100644
--- a/V2rayNG/app/src/main/res/layout/layout_transport.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_transport.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -20,7 +20,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -38,7 +38,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -56,7 +56,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -76,7 +76,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -96,7 +96,7 @@
         android:id="@+id/layout_extra"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_spacing_dp16"
+        android:layout_marginTop="@dimen/padding_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
diff --git a/V2rayNG/app/src/main/res/layout/nav_header.xml b/V2rayNG/app/src/main/res/layout/nav_header.xml
index 3886858b..44a175d2 100644
--- a/V2rayNG/app/src/main/res/layout/nav_header.xml
+++ b/V2rayNG/app/src/main/res/layout/nav_header.xml
@@ -5,7 +5,7 @@
     android:background="@drawable/nav_header_bg"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="@dimen/margin_spacing_dp16">
+    android:padding="@dimen/padding_spacing_dp16">
 
     <TextView
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         android:layout_gravity="center"
         android:fontFamily="@font/montserrat_thin"
         android:gravity="center"
-        android:paddingTop="@dimen/margin_spacing_dp8"
+        android:paddingTop="@dimen/padding_spacing_dp8"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
diff --git a/V2rayNG/app/src/main/res/values/dimens.xml b/V2rayNG/app/src/main/res/values/dimens.xml
index 4a4a33b4..08a979bc 100644
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="margin_spacing_dp8">8dp</dimen>
-    <dimen name="margin_spacing_dp16">16dp</dimen>
+    <dimen name="padding_spacing_dp8">8dp</dimen>
     <dimen name="padding_spacing_dp16">16dp</dimen>
 
     <dimen name="image_size_dp24">24dp</dimen>