diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
index 2b422985..ba45042c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
@@ -12,7 +12,6 @@ object AppConfig {
 
     /** Legacy configuration keys. */
     const val ANG_CONFIG = "ang_config"
-    const val PREF_INAPP_BUY_IS_PREMIUM = "pref_inapp_buy_is_premium"
 
     /** Preferences mapped to MMKV storage. */
     const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt
new file mode 100644
index 00000000..0f6d37c0
--- /dev/null
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt
@@ -0,0 +1,68 @@
+package com.v2ray.ang.helper
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class CustomDividerItemDecoration(
+    private val divider: Drawable,
+    private val orientation: Int
+) : RecyclerView.ItemDecoration() {
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        if (orientation == RecyclerView.VERTICAL) {
+            drawVerticalDividers(canvas, parent)
+        } else {
+            drawHorizontalDividers(canvas, parent)
+        }
+    }
+
+    private fun drawVerticalDividers(canvas: Canvas, parent: RecyclerView) {
+        val left = parent.paddingLeft
+        val right = parent.width - parent.paddingRight
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount - 1) {
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+
+            val top = child.bottom + params.bottomMargin
+            val bottom = top + divider.intrinsicHeight
+
+            divider.setBounds(left, top, right, bottom)
+            divider.draw(canvas)
+        }
+    }
+
+    private fun drawHorizontalDividers(canvas: Canvas, parent: RecyclerView) {
+        val top = parent.paddingTop
+        val bottom = parent.height - parent.paddingBottom
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount - 1) {
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+
+            val left = child.right + params.rightMargin
+            val right = left + divider.intrinsicWidth
+
+            divider.setBounds(left, top, right, bottom)
+            divider.draw(canvas)
+        }
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        if (orientation == RecyclerView.VERTICAL) {
+            outRect.set(0, 0, 0, divider.intrinsicHeight)
+        } else {
+            outRect.set(0, 0, divider.intrinsicWidth, 0)
+        }
+    }
+}
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt
index 46287ceb..0cd7f647 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt
@@ -6,11 +6,16 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.helper.CustomDividerItemDecoration
 import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils
 
+
 abstract class BaseActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -37,4 +42,24 @@ abstract class BaseActivity : AppCompatActivity() {
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, SettingsManager.getLocale()))
     }
+
+    /**
+     * Adds a custom divider to a RecyclerView.
+     *
+     * @param recyclerView  The target RecyclerView to which the divider will be added.
+     * @param context       The context used to access resources.
+     * @param drawableResId The resource ID of the drawable to be used as the divider.
+     * @param orientation   The orientation of the divider (DividerItemDecoration.VERTICAL or DividerItemDecoration.HORIZONTAL).
+     */
+    fun addCustomDividerToRecyclerView(recyclerView: RecyclerView, context: Context?, drawableResId: Int, orientation: Int = DividerItemDecoration.VERTICAL) {
+        // Get the drawable from resources
+        val drawable = ContextCompat.getDrawable(context!!, drawableResId)
+        requireNotNull(drawable) { "Drawable resource not found" }
+
+        // Create a DividerItemDecoration with the specified orientation
+        val dividerItemDecoration = CustomDividerItemDecoration(drawable, orientation)
+
+        // Add the divider to the RecyclerView
+        recyclerView.addItemDecoration(dividerItemDecoration)
+    }
 }
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
index b275c348..3ee5b399 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
@@ -5,7 +5,6 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
@@ -34,8 +33,8 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
-        binding.recyclerView.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
 
         binding.refreshLayout.setOnRefreshListener(this)
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
index 6d441abf..25618841 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@@ -163,6 +163,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
 
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
index 54cdecf8..f1b2cb82 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -178,7 +178,6 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             }
         }
         if (holder is FooterViewHolder) {
-            //if (activity?.defaultDPreference?.getPrefBoolean(AppConfig.PREF_INAPP_BUY_IS_PREMIUM, false)) {
             if (true) {
                 holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
             } else {
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
index e59cd537..0be214b8 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
@@ -38,8 +38,7 @@ class PerAppProxyActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
-        binding.recyclerView.addItemDecoration(dividerItemDecoration)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
 
         val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
index 5681f75d..e4fcb0c5 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
@@ -57,6 +57,7 @@ class RoutingSettingActivity : BaseActivity() {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
 
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
index e0ef627c..3fe8d85a 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
@@ -35,6 +35,7 @@ class SubSettingActivity : BaseActivity() {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
 
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
index ae197a60..8afcb8fa 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
@@ -86,6 +86,7 @@ class UserAssetActivity : BaseActivity() {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = UserAssetAdapter()
     }
 
diff --git a/V2rayNG/app/src/main/res/drawable/custom_divider.xml b/V2rayNG/app/src/main/res/drawable/custom_divider.xml
new file mode 100644
index 00000000..94f03147
--- /dev/null
+++ b/V2rayNG/app/src/main/res/drawable/custom_divider.xml
@@ -0,0 +1,13 @@
+<!-- res/drawable/custom_divider.xml -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="0dp"
+        android:left="16dp"
+        android:right="16dp"
+        android:top="0dp">
+        <shape>
+            <size android:height="1dp" />
+            <solid android:color="@color/divider_color_light" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
index 2665430a..5c23332d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
@@ -41,6 +41,7 @@
                         android:maxLines="2"
                         android:text="@string/title_pref_per_app_proxy"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textColor="@color/colorAccent"
                         app:theme="@style/BrandedSwitch" />
 
                 </LinearLayout>
@@ -60,6 +61,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/switch_bypass_apps_mode"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textColor="@color/colorAccent"
                         app:theme="@style/BrandedSwitch" />
 
                 </LinearLayout>
@@ -77,9 +79,9 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
-        android:scrollbars="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scrollbars="vertical"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:context=".ui.PerAppProxyActivity" />
 
diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml
index 9e0ae6e0..71e1c527 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -47,7 +47,7 @@
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tab_group"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/bypass_list_header_height"
                         app:tabIndicatorFullWidth="false"
                         app:tabMode="scrollable"
                         app:tabTextAppearance="@style/TabLayoutTextStyle" />
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 825c1c50..3032d6ce 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
@@ -17,41 +17,32 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/cardview_margin"
-                android:orientation="horizontal"
-                card_view:cardCornerRadius="5dp">
+                android:layout_margin="@dimen/layout_margin_top_height"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_top_height"
-                    android:paddingStart="@dimen/padding_start"
-                    android:paddingEnd="@dimen/padding_end"
-                    android:orientation="vertical">
+                    android:text="@string/routing_settings_domain_strategy" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/routing_settings_domain_strategy" />
+                <Spinner
+                    android:id="@+id/sp_domain_strategy"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/edit_height"
+                    android:entries="@array/routing_domain_strategy" />
+            </LinearLayout>
 
-                    <Spinner
-                        android:id="@+id/sp_domain_strategy"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/edit_height"
-                        android:entries="@array/routing_domain_strategy" />
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="@dimen/padding_start"
                 android:layout_marginTop="@dimen/layout_margin_top_height"
                 android:layout_marginBottom="@dimen/layout_margin_top_height"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingStart="@dimen/padding_start">
 
                 <TextView
                     android:layout_width="wrap_content"
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 f074f9ff..fee1de30 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
@@ -2,46 +2,46 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:gravity="center_vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:paddingStart="@dimen/padding_start"
-        android:paddingEnd="@dimen/padding_end" />
+        android:layout_width="@dimen/server_height"
+        android:layout_height="@dimen/server_height"
+        android:padding="@dimen/padding" />
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="60dp"
+        android:layout_height="@dimen/server_height"
         android:layout_weight="1.0"
         android:gravity="center"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/padding_start"
-        android:paddingEnd="@dimen/padding_end">
+        android:orientation="vertical">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/name"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:maxLines="1" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/package_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:maxLines="3"
+            android:paddingTop="@dimen/layout_margin_spacing"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
     </LinearLayout>
 
-
     <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/check_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="false"
         android:focusable="false"
-        android:paddingStart="@dimen/padding_start" />
+        android:padding="@dimen/padding"/>
 
 </LinearLayout>
\ No newline at end of file
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 927a79ed..fb1b6827 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
@@ -9,9 +9,11 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/layout_margin_spacing">
+        android:layout_margin="@dimen/layout_margin_spacing"
+        android:paddingTop="@dimen/layout_margin_spacing"
+        android:paddingBottom="@dimen/layout_margin_spacing">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/log_content"
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 ac27a40e..e3d26b66 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -7,185 +7,180 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_view"
+    <LinearLayout
+        android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/cardview_margin"
-        app:cardCornerRadius="5dp">
+        android:layout_height="@dimen/server_height"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/layout_margin_spacing"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:nextFocusRight="@+id/layout_share"
+        android:orientation="horizontal">
 
         <LinearLayout
-            android:id="@+id/info_container"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/server_height"
+            android:id="@+id/layout_indicator"
+            android:layout_width="6dp"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center"
-            android:nextFocusRight="@+id/layout_share"
-            android:orientation="horizontal">
+            android:orientation="vertical" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/padding_start">
 
             <LinearLayout
-                android:id="@+id/layout_indicator"
-                android:layout_width="6dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:orientation="vertical" />
-
-            <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start">
+                android:orientation="vertical">
 
-                <LinearLayout
+                <TextView
+                    android:id="@+id/tv_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:maxLines="2"
+                    android:minLines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-                    <TextView
-                        android:id="@+id/tv_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:minLines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="0dp"
-                        android:layout_weight="1" />
+                <TextView
+                    android:id="@+id/tv_statistics"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textSize="12sp" />
 
-                    <TextView
-                        android:id="@+id/tv_statistics"
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="4dp"
+                android:paddingEnd="@dimen/padding_end">
+
+                <TextView
+                    android:id="@+id/tv_subscription"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="@color/color_secondary"
+                    android:textSize="10sp"
+                    tools:text="Sub" />
+
+                <TextView
+                    android:id="@+id/tv_test_result"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="@color/colorPing"
+                    android:textSize="10sp"
+                    tools:text="214ms" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/layout_share"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/server_height"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:nextFocusLeft="@+id/info_container"
+                    android:orientation="vertical"
+                    android:padding="@dimen/layout_margin_spacing">
+
+                    <ImageView
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:lines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textSize="12sp" />
+                        android:layout_height="@dimen/png_height"
+                        app:srcCompat="@drawable/ic_share_24dp" />
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/layout_edit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/server_height"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:padding="@dimen/layout_margin_spacing">
+
+                    <ImageView
+                        android:layout_width="@dimen/png_height"
+                        android:layout_height="@dimen/png_height"
+                        app:srcCompat="@drawable/ic_edit_24dp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/layout_remove"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/server_height"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:padding="@dimen/layout_margin_spacing">
+
+                    <ImageView
+                        android:layout_width="@dimen/png_height"
+                        android:layout_height="@dimen/png_height"
+                        app:srcCompat="@drawable/ic_delete_24dp" />
+
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical">
+                android:layout_gravity="right"
+                android:orientation="vertical"
+                android:paddingBottom="4dp"
+                android:paddingEnd="@dimen/padding_end">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingEnd="@dimen/padding_end">
-
-                    <TextView
-                        android:id="@+id/tv_subscription"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:lines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textColor="@color/color_secondary"
-                        android:textSize="10sp"
-                        tools:text="Sub" />
-
-                    <TextView
-                        android:id="@+id/tv_test_result"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:lines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textColor="@color/colorPing"
-                        android:textSize="10sp"
-                        tools:text="214ms" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:id="@+id/layout_share"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:nextFocusLeft="@+id/info_container"
-                        android:orientation="vertical"
-                        android:padding="@dimen/layout_margin_spacing">
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="@dimen/png_height"
-                            app:srcCompat="@drawable/ic_share_24dp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/layout_edit"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:padding="@dimen/layout_margin_spacing">
-
-                        <ImageView
-                            android:layout_width="@dimen/png_height"
-                            android:layout_height="@dimen/png_height"
-                            app:srcCompat="@drawable/ic_edit_24dp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/layout_remove"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:padding="@dimen/layout_margin_spacing">
-
-                        <ImageView
-                            android:layout_width="@dimen/png_height"
-                            android:layout_height="@dimen/png_height"
-                            app:srcCompat="@drawable/ic_delete_24dp" />
-
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
+                <TextView
+                    android:id="@+id/tv_type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:orientation="vertical"
-                    android:paddingEnd="@dimen/padding_end">
-
-                    <TextView
-                        android:id="@+id/tv_type"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:lines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textColor="@color/colorConfigType"
-                        android:textSize="10sp" />
-                </LinearLayout>
-
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="@color/colorConfigType"
+                    android:textSize="10sp" />
             </LinearLayout>
-        </LinearLayout>
 
-    </androidx.cardview.widget.CardView>
+        </LinearLayout>
+    </LinearLayout>
+
 </LinearLayout>
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 daf1020f..71976d0f 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
@@ -6,113 +6,108 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
 
-    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/item_cardview"
+    <LinearLayout
+        android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/cardview_margin"
+        android:layout_height="@dimen/sub_height"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/layout_margin_spacing"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        card_view:cardCornerRadius="5dp">
+        android:paddingTop="@dimen/layout_margin_spacing"
+        android:paddingBottom="@dimen/layout_margin_spacing">
 
         <LinearLayout
-            android:id="@+id/info_container"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/sub_height"
-            android:layout_gravity="center"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center"
-            android:nextFocusRight="@+id/layout_edit"
-            android:orientation="horizontal">
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/padding_start">
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/remarks"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <ImageView
+                    android:id="@+id/img_locked"
+                    android:layout_width="@dimen/padding"
+                    android:layout_height="@dimen/padding"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="@dimen/padding_start"
+                    app:srcCompat="@drawable/ic_lock_24dp" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/domainIp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:lines="1"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+            <TextView
+                android:id="@+id/outboundTag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:lines="1"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/sub_height"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/padding_start"
+            android:paddingEnd="@dimen/padding_end">
+
+            <LinearLayout
+                android:id="@+id/layout_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:nextFocusLeft="@+id/info_container"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/remarks"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
-                    <ImageView
-                        android:id="@+id/img_locked"
-                        android:layout_width="@dimen/padding"
-                        android:layout_height="@dimen/padding"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="@dimen/padding_start"
-                        app:srcCompat="@drawable/ic_lock_24dp" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/domainIp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_spacing"
-                    android:lines="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-                <TextView
-                    android:id="@+id/outboundTag"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_spacing"
-                    android:lines="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                android:padding="@dimen/layout_margin_spacing">
 
+                <ImageView
+                    android:layout_width="@dimen/png_height"
+                    android:layout_height="@dimen/png_height"
+                    app:srcCompat="@drawable/ic_edit_24dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/sub_height"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start"
-                android:paddingEnd="@dimen/padding_end">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:orientation="horizontal">
 
-                <LinearLayout
-                    android:id="@+id/layout_edit"
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/chk_enable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:nextFocusLeft="@+id/info_container"
-                    android:orientation="vertical"
-                    android:padding="@dimen/layout_margin_spacing">
-
-                    <ImageView
-                        android:layout_width="@dimen/png_height"
-                        android:layout_height="@dimen/png_height"
-                        app:srcCompat="@drawable/ic_edit_24dp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_top_height"
-                    android:orientation="horizontal">
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/chk_enable"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:theme="@style/BrandedSwitch" />
-                </LinearLayout>
+                    app:theme="@style/BrandedSwitch" />
             </LinearLayout>
-
         </LinearLayout>
 
-    </androidx.cardview.widget.CardView>
+    </LinearLayout>
+
+
 </LinearLayout>
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 663c53ab..a2e335be 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
@@ -6,115 +6,109 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
 
-    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/item_cardview"
+    <LinearLayout
+        android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/cardview_margin"
+        android:layout_height="@dimen/sub_height"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/layout_margin_spacing"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        card_view:cardCornerRadius="5dp">
+        android:paddingTop="@dimen/layout_margin_spacing"
+        android:paddingBottom="@dimen/layout_margin_spacing">
 
         <LinearLayout
-            android:id="@+id/info_container"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/padding_start">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+            <TextView
+                android:id="@+id/tv_url"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:lines="2"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/sub_height"
-            android:layout_gravity="center"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
             android:gravity="center"
-            android:nextFocusRight="@+id/layout_edit"
-            android:orientation="horizontal">
+            android:orientation="vertical"
+            android:paddingStart="@dimen/padding_start"
+            android:paddingEnd="@dimen/padding_end">
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start">
+                android:gravity="center"
+                android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/tv_name"
+                <LinearLayout
+                    android:id="@+id/layout_share"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:padding="@dimen/layout_margin_spacing">
 
-                <TextView
-                    android:id="@+id/tv_url"
+                    <ImageView
+                        android:layout_width="@dimen/png_height"
+                        android:layout_height="@dimen/png_height"
+                        app:srcCompat="@drawable/ic_share_24dp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/layout_edit"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_spacing"
-                    android:lines="2"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:nextFocusLeft="@+id/info_container"
+                    android:orientation="vertical"
+                    android:padding="@dimen/layout_margin_spacing">
 
+                    <ImageView
+                        android:layout_width="@dimen/png_height"
+                        android:layout_height="@dimen/png_height"
+                        app:srcCompat="@drawable/ic_edit_24dp" />
+
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/sub_height"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start"
-                android:paddingEnd="@dimen/padding_end">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:orientation="horizontal">
 
-                <LinearLayout
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/chk_enable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:id="@+id/layout_share"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:padding="@dimen/layout_margin_spacing">
-
-                        <ImageView
-                            android:layout_width="@dimen/png_height"
-                            android:layout_height="@dimen/png_height"
-                            app:srcCompat="@drawable/ic_share_24dp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/layout_edit"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:nextFocusLeft="@+id/info_container"
-                        android:orientation="vertical"
-                        android:padding="@dimen/layout_margin_spacing">
-
-                        <ImageView
-                            android:layout_width="@dimen/png_height"
-                            android:layout_height="@dimen/png_height"
-                            app:srcCompat="@drawable/ic_edit_24dp" />
-
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_top_height"
-                    android:orientation="horizontal">
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/chk_enable"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:theme="@style/BrandedSwitch" />
-                </LinearLayout>
+                    app:theme="@style/BrandedSwitch" />
             </LinearLayout>
         </LinearLayout>
+    </LinearLayout>
 
-    </androidx.cardview.widget.CardView>
 </LinearLayout>
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 cf1bf597..1fe9deb2 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
@@ -5,90 +5,84 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.cardview.widget.CardView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/cardview_margin"
-        app:cardCornerRadius="5dp">
+        android:layout_margin="@dimen/layout_margin_spacing"
+        android:background="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="@dimen/nav_header_vertical_spacing">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:padding="@dimen/nav_header_vertical_spacing">
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/padding_start">
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start">
+                android:orientation="vertical">
 
-                <LinearLayout
+                <TextView
+                    android:id="@+id/asset_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:maxLines="2"
+                    android:minLines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    tools:text="Placeholder.dat" />
 
-                    <TextView
-                        android:id="@+id/asset_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:minLines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        tools:text="Placeholder.dat" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
 
+                <TextView
+                    android:id="@+id/asset_properties"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textSize="12sp"
+                    tools:text="1MB . 2020.01.01" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="0dp"
-                        android:layout_weight="1" />
-
-                    <TextView
-                        android:id="@+id/asset_properties"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:lines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textSize="12sp"
-                        tools:text="1MB . 2020.01.01" />
-
-
-                </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/layout_edit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="@dimen/nav_header_vertical_spacing">
-
-                <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
-                    app:srcCompat="@drawable/ic_edit_24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/layout_remove"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="@dimen/nav_header_vertical_spacing">
-
-                <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
-                    app:srcCompat="@drawable/ic_delete_24dp" />
-            </LinearLayout>
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+
+        <LinearLayout
+            android:id="@+id/layout_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="@dimen/nav_header_vertical_spacing">
+
+            <ImageView
+                android:layout_width="@dimen/png_height"
+                android:layout_height="@dimen/png_height"
+                app:srcCompat="@drawable/ic_edit_24dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/layout_remove"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="@dimen/nav_header_vertical_spacing">
+
+            <ImageView
+                android:layout_width="@dimen/png_height"
+                android:layout_height="@dimen/png_height"
+                app:srcCompat="@drawable/ic_delete_24dp" />
+        </LinearLayout>
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml
index 35b55f82..ff1c835f 100644
--- a/V2rayNG/app/src/main/res/values-night/colors.xml
+++ b/V2rayNG/app/src/main/res/values-night/colors.xml
@@ -3,6 +3,7 @@
     <color name="color_fab_active">#f97910</color>
     <color name="color_fab_inactive">#646464</color>
     <color name="color_secondary">#BDBDBD</color>
+    <color name="divider_color_light">#424242</color>
 
     <color name="colorPrimary">#212121</color>
     <color name="colorAccent">#FFFFFF</color>
diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml
index 4d6f262c..8e328f84 100644
--- a/V2rayNG/app/src/main/res/values/colors.xml
+++ b/V2rayNG/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="color_fab_active">#f97910</color>
     <color name="color_fab_inactive">#9C9C9C</color>
     <color name="color_secondary">#727272</color>
+    <color name="divider_color_light">#E0E0E0</color>
 
     <color name="colorPrimary">#F5F5F5</color>
     <color name="colorAccent">#000000</color>
diff --git a/V2rayNG/app/src/main/res/values/dimens.xml b/V2rayNG/app/src/main/res/values/dimens.xml
index 84a8a180..313fa475 100644
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="bypass_list_header_height">50dp</dimen>
+    <dimen name="bypass_list_header_height">64dp</dimen>
     <dimen name="layout_margin_top_height">16dp</dimen>
     <dimen name="layout_margin_right_height">16dp</dimen>
     <dimen name="layout_margin_spacing">8dp</dimen>