diff --git a/app/build.gradle b/app/build.gradle
index 9b496e16f..ea1a33d49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 5
-        versionName "1.0.0-alpha.5"
+        versionCode 6
+        versionName "1.0.0-alpha.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java b/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
index c0ddbbd5c..c3e7be81c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
@@ -243,7 +243,12 @@ public class AccountFragment extends Fragment implements AccountActionListener,
                 setFetchTimelineState(FooterViewHolder.State.END_OF_TIMELINE);
             }
         } else {
-            adapter.update(accounts);
+            if (accounts.size() > 0) {
+                setFetchTimelineState(FooterViewHolder.State.LOADING);
+                adapter.update(accounts);
+            } else {
+                setFetchTimelineState(FooterViewHolder.State.END_OF_TIMELINE);
+            }
         }
     }
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 769877952..8c1a1c01c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -59,7 +59,7 @@
     <color name="status_reblog_button_marked_light">#009F6F</color>
     <color name="status_reblog_button_disabled_light">#BFBFBF</color>
     <color name="status_favourite_button_light">#4F4F4F</color>
-    <color name="status_favourite_button_marked_light">#BFAF00</color>
+    <color name="status_favourite_button_marked_light">#ffec21</color>
     <color name="sensitive_media_warning_background_light">#B0B0B0</color>
     <color name="media_preview_unloaded_background_light">#CFCFCF</color>
     <color name="status_text_secondary_light">#34444C</color>