diff --git a/build.sbt b/build.sbt
index fe107f7f..a1aece97 100644
--- a/build.sbt
+++ b/build.sbt
@@ -30,7 +30,7 @@ libraryDependencies ++= Seq(
   "dnsjava" % "dnsjava" % "2.1.7",
   "com.github.kevinsawicki" % "http-request" % "6.0",
   "commons-net" % "commons-net" % "3.4",
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201510071325",
+  "eu.chainfire" % "libsuperuser" % "1.0.0.201602011018",
   "com.google.zxing" % "android-integration" % "3.2.1",
   "net.glxn.qrgen" % "android" % "2.0",
   "com.google.android.gms" % "play-services-base" % "8.4.0",
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 230e595f..3cd0661b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.15")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.16")
 
 resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
diff --git a/src/main/res/drawable-anydpi-v21/ic_start_busy.xml b/src/main/res/drawable-anydpi-v21/ic_start_busy.xml
new file mode 100755
index 00000000..80d33108
--- /dev/null
+++ b/src/main/res/drawable-anydpi-v21/ic_start_busy.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M17.68,9l-1.59,7L12.7,14.89l5-5.93M10,10.08l-3.57,3L5,12.55l5-2.47M21.25,2.28L0,12.8l6.83,2.57,9.76-8.21L9.26,15.89l8.29,2.67,3.7-16.27h0Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M 9.45 17.56 L 9.46 22 L 12.09 18.41 L 9.45 17.56 L 9.45 17.56 Z" />
+</vector>
\ No newline at end of file
diff --git a/src/main/res/drawable-anydpi-v21/ic_start_connected.xml b/src/main/res/drawable-anydpi-v21/ic_start_connected.xml
new file mode 100755
index 00000000..9df136c9
--- /dev/null
+++ b/src/main/res/drawable-anydpi-v21/ic_start_connected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M 21.25 2.28 L 17.55 18.55 L 9.26 15.89 L 16.58 7.16 L 6.83 15.37 L 0 12.8 L 21.25 2.28 Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M 9.45 17.56 L 12.09 18.41 L 9.46 22 L 9.45 17.56 Z" />
+</vector>
\ No newline at end of file
diff --git a/src/main/res/drawable-anydpi-v21/ic_start_idle.xml b/src/main/res/drawable-anydpi-v21/ic_start_idle.xml
new file mode 100755
index 00000000..01e14cb4
--- /dev/null
+++ b/src/main/res/drawable-anydpi-v21/ic_start_idle.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M 9.45 17.56 L 9.46 22 L 12.09 18.41 L 9.45 17.56 L 9.45 17.56 Z" />
+    <path
+        android:strokeColor="#fff"
+        android:strokeWidth="2"
+        android:strokeMiterLimit="10"
+        android:pathData="M0.71,2.12L21.88,23.29Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M 13 10.17 L 16.58 7.16 L 13.57 10.75 L 14.99 12.16 L 17.68 8.96 L 16.59 13.76 L 18.26 15.43 L 21.25 2.28 L 10.45 7.62 L 13 10.17 Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M 15.93 15.93 L 12.71 14.89 L 13.7 13.7 L 12.28 12.28 L 9.26 15.89 L 17.55 18.55 L 17.74 17.74 L 15.93 15.93 Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M8.56,8.56L0,12.8l6.83,2.57,4.64-3.9ZM6.44,13.08L5,12.55l5-2.47Z" />
+</vector>
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/ic_cloud.png b/src/main/res/drawable-hdpi/ic_cloud.png
deleted file mode 100644
index 77ba43c2..00000000
Binary files a/src/main/res/drawable-hdpi/ic_cloud.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_cloud_off.png b/src/main/res/drawable-hdpi/ic_cloud_off.png
deleted file mode 100644
index e30de1c2..00000000
Binary files a/src/main/res/drawable-hdpi/ic_cloud_off.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_cloud_queue.png b/src/main/res/drawable-hdpi/ic_cloud_queue.png
deleted file mode 100644
index aae45eba..00000000
Binary files a/src/main/res/drawable-hdpi/ic_cloud_queue.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_start_busy.png b/src/main/res/drawable-hdpi/ic_start_busy.png
new file mode 100755
index 00000000..7b865c00
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_start_busy.png differ
diff --git a/src/main/res/drawable-hdpi/ic_start_connected.png b/src/main/res/drawable-hdpi/ic_start_connected.png
new file mode 100755
index 00000000..ef2a562a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_start_connected.png differ
diff --git a/src/main/res/drawable-hdpi/ic_start_idle.png b/src/main/res/drawable-hdpi/ic_start_idle.png
new file mode 100755
index 00000000..40cafdbe
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_start_idle.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cloud.png b/src/main/res/drawable-mdpi/ic_cloud.png
deleted file mode 100644
index a503ce8f..00000000
Binary files a/src/main/res/drawable-mdpi/ic_cloud.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_cloud_off.png b/src/main/res/drawable-mdpi/ic_cloud_off.png
deleted file mode 100644
index 92faccb1..00000000
Binary files a/src/main/res/drawable-mdpi/ic_cloud_off.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_cloud_queue.png b/src/main/res/drawable-mdpi/ic_cloud_queue.png
deleted file mode 100644
index 94e4392a..00000000
Binary files a/src/main/res/drawable-mdpi/ic_cloud_queue.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_start_busy.png b/src/main/res/drawable-mdpi/ic_start_busy.png
new file mode 100755
index 00000000..c620c536
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_start_busy.png differ
diff --git a/src/main/res/drawable-mdpi/ic_start_connected.png b/src/main/res/drawable-mdpi/ic_start_connected.png
new file mode 100755
index 00000000..f608d19c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_start_connected.png differ
diff --git a/src/main/res/drawable-mdpi/ic_start_idle.png b/src/main/res/drawable-mdpi/ic_start_idle.png
new file mode 100755
index 00000000..eeebda9a
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_start_idle.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cloud.png b/src/main/res/drawable-xhdpi/ic_cloud.png
deleted file mode 100644
index e44caf8d..00000000
Binary files a/src/main/res/drawable-xhdpi/ic_cloud.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_cloud_off.png b/src/main/res/drawable-xhdpi/ic_cloud_off.png
deleted file mode 100644
index 7e818e3d..00000000
Binary files a/src/main/res/drawable-xhdpi/ic_cloud_off.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue.png b/src/main/res/drawable-xhdpi/ic_cloud_queue.png
deleted file mode 100644
index 6ef11bb1..00000000
Binary files a/src/main/res/drawable-xhdpi/ic_cloud_queue.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_start_busy.png b/src/main/res/drawable-xhdpi/ic_start_busy.png
new file mode 100755
index 00000000..2183c2b2
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_start_busy.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_start_connected.png b/src/main/res/drawable-xhdpi/ic_start_connected.png
new file mode 100755
index 00000000..49aa370b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_start_connected.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_start_idle.png b/src/main/res/drawable-xhdpi/ic_start_idle.png
new file mode 100755
index 00000000..24e37f84
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_start_idle.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cloud.png b/src/main/res/drawable-xxhdpi/ic_cloud.png
deleted file mode 100644
index 390fcd5a..00000000
Binary files a/src/main/res/drawable-xxhdpi/ic_cloud.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_off.png b/src/main/res/drawable-xxhdpi/ic_cloud_off.png
deleted file mode 100644
index 071088b6..00000000
Binary files a/src/main/res/drawable-xxhdpi/ic_cloud_off.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_queue.png b/src/main/res/drawable-xxhdpi/ic_cloud_queue.png
deleted file mode 100644
index 8ba4aecb..00000000
Binary files a/src/main/res/drawable-xxhdpi/ic_cloud_queue.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_start_busy.png b/src/main/res/drawable-xxhdpi/ic_start_busy.png
new file mode 100755
index 00000000..d6c523aa
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_start_busy.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_start_connected.png b/src/main/res/drawable-xxhdpi/ic_start_connected.png
new file mode 100755
index 00000000..9ebdb65b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_start_connected.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_start_idle.png b/src/main/res/drawable-xxhdpi/ic_start_idle.png
new file mode 100755
index 00000000..be36519a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_start_idle.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud.png b/src/main/res/drawable-xxxhdpi/ic_cloud.png
deleted file mode 100644
index d9534a99..00000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_cloud.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud_off.png b/src/main/res/drawable-xxxhdpi/ic_cloud_off.png
deleted file mode 100644
index 2d78efc8..00000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_cloud_off.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud_queue.png b/src/main/res/drawable-xxxhdpi/ic_cloud_queue.png
deleted file mode 100644
index 6f0210dc..00000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_cloud_queue.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_start_busy.png b/src/main/res/drawable-xxxhdpi/ic_start_busy.png
new file mode 100755
index 00000000..3d08a0ef
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_start_busy.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_start_connected.png b/src/main/res/drawable-xxxhdpi/ic_start_connected.png
new file mode 100755
index 00000000..496e430a
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_start_connected.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_start_idle.png b/src/main/res/drawable-xxxhdpi/ic_start_idle.png
new file mode 100755
index 00000000..a4017bc6
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_start_idle.png differ
diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml
index 09de0e81..14858f5c 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -19,7 +19,7 @@
         <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content"
                                                             android:layout_height="wrap_content"
                                                             app:backgroundTint="@color/material_blue_grey_700"
-                                                            android:src="@drawable/ic_cloud_off"
+                                                            android:src="@drawable/ic_start_idle"
                                                             app:pressedTranslationZ="6dp" app:borderWidth="0dp" />
     </com.github.jorgecastilloprz.FABProgressCircle>
 </RelativeLayout>
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 25995430..a9fa9092 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -119,7 +119,7 @@ class Shadowsocks
         s match {
           case State.CONNECTING =>
             fab.setBackgroundTintList(greyTint)
-            fab.setImageResource(R.drawable.ic_cloud_queue)
+            fab.setImageResource(R.drawable.ic_start_busy)
             fab.setEnabled(false)
             fabProgressCircle.show()
             preferences.setEnabled(false)
@@ -149,7 +149,7 @@ class Shadowsocks
             preferences.setEnabled(true)
           case State.STOPPING =>
             fab.setBackgroundTintList(greyTint)
-            fab.setImageResource(R.drawable.ic_cloud_queue)
+            fab.setImageResource(R.drawable.ic_start_busy)
             fab.setEnabled(false)
             if (state == State.CONNECTED) fabProgressCircle.show()  // ignore for stopped
             preferences.setEnabled(false)
@@ -226,7 +226,7 @@ class Shadowsocks
 
   private def changeSwitch(checked: Boolean) {
     serviceStarted = checked
-    fab.setImageResource(if (checked) R.drawable.ic_cloud else R.drawable.ic_cloud_off)
+    fab.setImageResource(if (checked) R.drawable.ic_start_connected else R.drawable.ic_start_idle)
     if (fab.isEnabled) {
       fab.setEnabled(false)
       handler.postDelayed(() => fab.setEnabled(true), 1000)
@@ -428,25 +428,25 @@ class Shadowsocks
         case State.CONNECTING =>
           fab.setBackgroundTintList(greyTint)
           serviceStarted = false
-          fab.setImageResource(R.drawable.ic_cloud_queue)
+          fab.setImageResource(R.drawable.ic_start_busy)
           preferences.setEnabled(false)
           fabProgressCircle.show()
         case State.CONNECTED =>
           fab.setBackgroundTintList(greenTint)
           serviceStarted = true
-          fab.setImageResource(R.drawable.ic_cloud)
+          fab.setImageResource(R.drawable.ic_start_connected)
           preferences.setEnabled(false)
           fabProgressCircle.postDelayed(hideCircle, 100)
         case State.STOPPING =>
           fab.setBackgroundTintList(greyTint)
           serviceStarted = false
-          fab.setImageResource(R.drawable.ic_cloud_queue)
+          fab.setImageResource(R.drawable.ic_start_busy)
           preferences.setEnabled(false)
           fabProgressCircle.show()
         case _ =>
           fab.setBackgroundTintList(greyTint)
           serviceStarted = false
-          fab.setImageResource(R.drawable.ic_cloud_off)
+          fab.setImageResource(R.drawable.ic_start_idle)
           preferences.setEnabled(true)
           fabProgressCircle.postDelayed(hideCircle, 100)
       }