diff --git a/src/main/res/layout/layout_apps.xml b/src/main/res/layout/layout_apps.xml
index 5d41fd7e..25a98750 100644
--- a/src/main/res/layout/layout_apps.xml
+++ b/src/main/res/layout/layout_apps.xml
@@ -9,8 +9,8 @@
   <include layout="@layout/toolbar_light_dark"/>
   <LinearLayout android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="40dp"
-                android:paddingStart="40dp"
+                android:paddingLeft="48dp"
+                android:paddingStart="48dp"
                 android:elevation="1dp"
                 android:background="@android:color/white"
                 android:orientation="vertical"
@@ -23,7 +23,7 @@
               android:layout_width="0dp"
               android:layout_weight="1"
               android:layout_height="wrap_content"
-              android:padding="3dp"
+              android:padding="4dp"
               android:gravity="center_vertical"
               android:textSize="18sp"
               android:text="@string/on"/>
@@ -41,7 +41,7 @@
               android:layout_width="0dp"
               android:layout_weight="1"
               android:layout_height="wrap_content"
-              android:padding="3dp"
+              android:padding="4dp"
               android:gravity="center_vertical"
               android:textSize="18sp"
               android:text="@string/bypass_apps"/>
diff --git a/src/main/res/layout/layout_apps_item.xml b/src/main/res/layout/layout_apps_item.xml
index 5a97f2cc..69f14991 100644
--- a/src/main/res/layout/layout_apps_item.xml
+++ b/src/main/res/layout/layout_apps_item.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:stretchColumns="1">
-
-  <TableRow>
+    android:background="?android:attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/itemicon"
-        android:layout_width="48dp"
+        android:layout_width="60dp"
         android:layout_height="48dp"
         android:scaleType="fitCenter"
-        android:padding="3dp"/>
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"/>
 
     <TextView
         android:id="@+id/itemtext"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="fill_parent"
-        android:text="uid:packages"
         android:gravity="center_vertical"
-        android:maxLength="25"
-        android:textSize="18sp"
-        android:padding="3dp"/>
+        android:ellipsize="end"
+        android:textSize="18sp"/>
 
     <Switch
         android:id="@+id/itemcheck"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"/>
 
-  </TableRow>
-</TableLayout>
+</LinearLayout>
diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala
index af617847..3d5da43d 100644
--- a/src/main/scala/com/github/shadowsocks/AppManager.scala
+++ b/src/main/scala/com/github/shadowsocks/AppManager.scala
@@ -156,8 +156,7 @@ class AppManager extends AppCompatActivity with OnCheckedChangeListener with OnC
           val switch = convertView.findViewById(R.id.itemcheck).asInstanceOf[Switch]
           val text = convertView.findViewById(R.id.itemtext).asInstanceOf[TextView]
           entry = new ListEntry(switch, text, icon)
-          entry.text.setOnClickListener(AppManager.this)
-          entry.text.setOnClickListener(AppManager.this)
+          convertView.setOnClickListener(AppManager.this)
           convertView.setTag(entry)
           entry.switch.setOnCheckedChangeListener(AppManager.this)
         } else {
@@ -187,7 +186,7 @@ class AppManager extends AppCompatActivity with OnCheckedChangeListener with OnC
   }
 
   def onClick(v: View) {
-    val switch = v.getTag.asInstanceOf[Switch]
+    val switch = v.getTag.asInstanceOf[ListEntry].switch
     val app: ProxiedApp = switch.getTag.asInstanceOf[ProxiedApp]
     if (app != null) {
       app.proxied = !app.proxied