diff --git a/twidere/src/main/java/org/mariotaku/twidere/task/CreateFriendshipTask.java b/twidere/src/main/java/org/mariotaku/twidere/task/CreateFriendshipTask.java
index 6c94e2830..0cf3c8326 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/task/CreateFriendshipTask.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/task/CreateFriendshipTask.java
@@ -38,6 +38,7 @@ public class CreateFriendshipTask extends AbsFriendshipOperationTask {
 
     @Override
     protected void succeededWorker(@NonNull Twitter twitter, @NonNull ParcelableCredentials credentials, @NonNull Arguments args, @NonNull ParcelableUser user) {
+        user.is_following = true;
         Utils.setLastSeen(context, user.key, System.currentTimeMillis());
     }
 
diff --git a/twidere/src/main/java/org/mariotaku/twidere/task/DestroyFriendshipTask.java b/twidere/src/main/java/org/mariotaku/twidere/task/DestroyFriendshipTask.java
index f4ccb7b37..9920b67dc 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/task/DestroyFriendshipTask.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/task/DestroyFriendshipTask.java
@@ -40,6 +40,7 @@ public class DestroyFriendshipTask extends AbsFriendshipOperationTask {
 
     @Override
     protected void succeededWorker(@NonNull Twitter twitter, @NonNull ParcelableCredentials credentials, @NonNull Arguments args, @NonNull ParcelableUser user) {
+        user.is_following = false;
         Utils.setLastSeen(context, user.key, -1);
         final Expression where = Expression.and(Expression.equalsArgs(TwidereDataStore.Statuses.ACCOUNT_KEY),
                 Expression.or(Expression.equalsArgs(TwidereDataStore.Statuses.USER_KEY),
diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/holder/UserViewHolder.java b/twidere/src/main/java/org/mariotaku/twidere/view/holder/UserViewHolder.java
index 395520b8e..87c8dd46b 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/view/holder/UserViewHolder.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/view/holder/UserViewHolder.java
@@ -25,6 +25,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -58,7 +59,7 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
     private final TextView descriptionView, locationView, urlView,
             statusesCountView, followersCountView, friendsCountView;
 
-    private final View acceptRequestButton, denyRequestButton, followButton;
+    private final ImageButton acceptRequestButton, denyRequestButton, followButton;
     private final View actionsProgressContainer;
     private final View actionsContainer;
     private final View processingRequestProgress;
@@ -83,9 +84,9 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
         friendsCountView = (TextView) itemView.findViewById(R.id.friends_count);
         actionsProgressContainer = itemView.findViewById(R.id.actions_progress_container);
         actionsContainer = itemView.findViewById(R.id.actions_container);
-        acceptRequestButton = itemView.findViewById(R.id.accept_request);
-        denyRequestButton = itemView.findViewById(R.id.deny_request);
-        followButton = itemView.findViewById(R.id.follow);
+        acceptRequestButton = (ImageButton) itemView.findViewById(R.id.accept_request);
+        denyRequestButton = (ImageButton) itemView.findViewById(R.id.deny_request);
+        followButton = (ImageButton) itemView.findViewById(R.id.follow);
         processingRequestProgress = itemView.findViewById(R.id.processing_request);
     }
 
@@ -141,6 +142,8 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
                     .key.getHost()));
         }
 
+        followButton.setImageResource(user.is_following ? R.drawable.ic_action_confirm :
+                R.drawable.ic_action_add);
         followButton.setActivated(user.is_following);
 
         final boolean isMySelf = user.account_key.equals(user.key);