diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 64276304..fdced725 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.github.shadowsocks">
+          package="com.github.shadowsocks"
+          android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
diff --git a/mobile/src/main/res/drawable/ic_service_connected.xml b/mobile/src/main/res/drawable/ic_service_connected.xml
index eb02f076..f5ce5d49 100644
--- a/mobile/src/main/res/drawable/ic_service_connected.xml
+++ b/mobile/src/main/res/drawable/ic_service_connected.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     xmlns:tools="http://schemas.android.com/tools"
-    android:drawable="@drawable/ic_service_active"
+    android:drawable="@drawable/ic_service_busy"
     tools:ignore="NewApi">
     <target android:name="path">
         <aapt:attr name="android:animation">
diff --git a/mobile/src/main/res/drawable/ic_service_stopping.xml b/mobile/src/main/res/drawable/ic_service_stopping.xml
index b79afc0a..7144ef8b 100644
--- a/mobile/src/main/res/drawable/ic_service_stopping.xml
+++ b/mobile/src/main/res/drawable/ic_service_stopping.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     xmlns:tools="http://schemas.android.com/tools"
-    android:drawable="@drawable/ic_service_active"
+    android:drawable="@drawable/ic_service_busy"
     tools:ignore="NewApi">
     <target android:name="path">
         <aapt:attr name="android:animation">
diff --git a/mobile/src/main/res/layout/layout_main.xml b/mobile/src/main/res/layout/layout_main.xml
index 26f26644..5bc8ebd8 100644
--- a/mobile/src/main/res/layout/layout_main.xml
+++ b/mobile/src/main/res/layout/layout_main.xml
@@ -75,7 +75,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignTop="@+id/stat"
         android:layout_marginEnd="16dp"
-        android:layout_marginTop="-28dp"
+        android:layout_marginTop="@dimen/fab_margin_top"
         android:elevation="6dp">
         <com.github.shadowsocks.widget.ServiceButton
             android:id="@+id/fab"
diff --git a/mobile/src/main/res/values-v21/dimen.xml b/mobile/src/main/res/values-v21/dimen.xml
new file mode 100644
index 00000000..605379c3
--- /dev/null
+++ b/mobile/src/main/res/values-v21/dimen.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="fab_margin_top">-28dp</dimen>
+</resources>
diff --git a/mobile/src/main/res/values/dimen.xml b/mobile/src/main/res/values/dimen.xml
index 9347dd73..d94a4539 100644
--- a/mobile/src/main/res/values/dimen.xml
+++ b/mobile/src/main/res/values/dimen.xml
@@ -3,4 +3,5 @@
     <dimen name="profile_item_max_width">480dp</dimen>
     <dimen name="qr_code_size">250dp</dimen>
     <dimen name="profile_padding">8dp</dimen>
+    <dimen name="fab_margin_top">-44dp</dimen>
 </resources>