diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml
index e73a5eae..037f041f 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -15,7 +15,7 @@
                                                    android:layout_alignParentEnd="true"
                                                    android:layout_marginRight="16dp"
                                                    android:layout_marginEnd="16dp"
-                                                   android:layout_marginBottom="-28dp">
+                                                   android:layout_marginBottom="@dimen/fab_margin_bottom">
         <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content"
                                                             android:layout_height="wrap_content"
                                                             app:backgroundTint="@color/material_green_600"
diff --git a/src/main/res/values-v21/dimen.xml b/src/main/res/values-v21/dimen.xml
new file mode 100644
index 00000000..4c95daeb
--- /dev/null
+++ b/src/main/res/values-v21/dimen.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="fab_margin_bottom">-28dp</dimen>
+</resources>
diff --git a/src/main/res/values/dimen.xml b/src/main/res/values/dimen.xml
new file mode 100644
index 00000000..f8e782e7
--- /dev/null
+++ b/src/main/res/values/dimen.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- TODO: Remove when this issue is fixed: https://github.com/JorgeCastilloPrz/FABProgressCircle/issues/19 -->
+    <dimen name="fab_margin_bottom">-44dp</dimen>
+</resources>
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 3763031b..07e7f322 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -1031,12 +1031,12 @@ class Shadowsocks
           fabProgressCircle.show()
           setPreferenceEnabled(enabled = false)
         case State.CONNECTED =>
-          if (state == State.CONNECTING) fabProgressCircle.beginFinalAnimation()
+          if (state == State.CONNECTING) fabProgressCircle.beginFinalAnimation() else fabProgressCircle.hide()
           fab.setEnabled(true)
           changeSwitch(checked = true)
           setPreferenceEnabled(enabled = false)
         case State.STOPPED =>
-          if (state == State.STOPPING || state == State.CONNECTING) fabProgressCircle.hide()
+          fabProgressCircle.hide()
           fab.setEnabled(true)
           changeSwitch(checked = false)
           if (m != null) Snackbar.make(getWindow.getDecorView.findViewById(android.R.id.content),