diff --git a/mobile/src/main/java/com/github/shadowsocks/preference/BottomSheetPreferenceDialogFragment.kt b/mobile/src/main/java/com/github/shadowsocks/preference/BottomSheetPreferenceDialogFragment.kt
index ec78a533..ffd0d446 100644
--- a/mobile/src/main/java/com/github/shadowsocks/preference/BottomSheetPreferenceDialogFragment.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/preference/BottomSheetPreferenceDialogFragment.kt
@@ -29,6 +29,7 @@ import android.os.Bundle
 import android.provider.Settings
 import android.support.design.widget.BottomSheetDialog
 import android.support.v7.preference.PreferenceDialogFragmentCompat
+import android.support.v7.widget.DefaultItemAnimator
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
@@ -107,10 +108,12 @@ class BottomSheetPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
         recycler.setPadding(0, padding, 0, padding)
         recycler.setHasFixedSize(true)
         recycler.layoutManager = LinearLayoutManager(activity)
+        recycler.itemAnimator = DefaultItemAnimator()
         recycler.adapter = IconListAdapter(dialog)
         recycler.layoutParams = ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         dialog.setContentView(recycler)
+        dialog.findViewById<View>(R.id.touch_outside)!!.isFocusable = false
         return dialog
     }
 
diff --git a/mobile/src/main/res/drawable-v21/background_selectable.xml b/mobile/src/main/res/drawable-v21/background_selectable.xml
index caca653d..b8810034 100644
--- a/mobile/src/main/res/drawable-v21/background_selectable.xml
+++ b/mobile/src/main/res/drawable-v21/background_selectable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
                   android:exitFadeDuration="@android:integer/config_mediumAnimTime">
@@ -8,4 +8,5 @@
             </item>
         </selector>
     </item>
-</ripple>
+    <item android:drawable="?android:attr/selectableItemBackground"/>
+</layer-list>
diff --git a/mobile/src/main/res/drawable/background_selectable.xml b/mobile/src/main/res/drawable/background_selectable.xml
index e4b7a428..c969f4ac 100644
--- a/mobile/src/main/res/drawable/background_selectable.xml
+++ b/mobile/src/main/res/drawable/background_selectable.xml
@@ -5,4 +5,7 @@
     <item android:state_selected="true">
         <color android:color="@color/material_primary_100"/>
     </item>
+    <item android:state_pressed="true">
+        <color android:color="#12000000"/>
+    </item>
 </selector>
diff --git a/mobile/src/main/res/xml/pref_profile.xml b/mobile/src/main/res/xml/pref_profile.xml
index 8c8bbff9..3a0b4b47 100644
--- a/mobile/src/main/res/xml/pref_profile.xml
+++ b/mobile/src/main/res/xml/pref_profile.xml
@@ -13,6 +13,7 @@
         <AutoSummaryEditTextPreference
                 android:key="proxy"
                 app:pref_summaryHasText="%s"
+                android:singleLine="true"
                 android:title="@string/proxy"/>
         <AutoSummaryEditTextPreference
                 android:key="remotePortNum"
@@ -25,6 +26,7 @@
                 app:pref_summaryPasswordSubstituteLength="0"
                 android:key="sitekey"
                 app:pref_summaryHasText="%s"
+                android:singleLine="true"
                 android:title="@string/sitekey"/>
         <SimpleMenuPreference
                 android:key="encMethod"
diff --git a/plugin/src/main/res/layout/toolbar_light_dark.xml b/plugin/src/main/res/layout/toolbar_light_dark.xml
index ae61afe4..d4dad21c 100644
--- a/plugin/src/main/res/layout/toolbar_light_dark.xml
+++ b/plugin/src/main/res/layout/toolbar_light_dark.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:background="?attr/colorPrimary"
     android:elevation="4dp"
+    android:touchscreenBlocksFocus="false"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
     android:id="@+id/toolbar" />