diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
index 2a749cdb8..5f15a4647 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
@@ -46,6 +46,7 @@ import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.style.UnderlineSpan;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -805,6 +806,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
private void manageButtonVisibility(){
if( relationship == null)
return;
+ Log.v(Helper.TAG,"relationship.isRequested()= " + relationship.isRequested());
account_follow.setEnabled(true);
if( account.getId() != null && account.getId().equals(userId)){
account_follow.hide();
@@ -816,8 +818,9 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
account_follow.show();
}else if( relationship.isRequested()){
account_follow_request.setVisibility(View.VISIBLE);
- account_follow.hide();
- doAction = action.NOTHING;
+ account_follow.setImageResource(R.drawable.ic_hourglass_full);
+ account_follow.show();
+ doAction = action.UNFOLLOW;
}else if( relationship.isFollowing()){
account_follow.setImageResource(R.drawable.ic_user_times);
doAction = action.UNFOLLOW;
diff --git a/app/src/main/res/drawable-hdpi/ic_hourglass_full.png b/app/src/main/res/drawable-hdpi/ic_hourglass_full.png
new file mode 100644
index 000000000..76f3c9cd6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_hourglass_full.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_hourglass_full.png b/app/src/main/res/drawable-ldpi/ic_hourglass_full.png
new file mode 100644
index 000000000..0ed2cf757
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_hourglass_full.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hourglass_full.png b/app/src/main/res/drawable-mdpi/ic_hourglass_full.png
new file mode 100644
index 000000000..eab34e177
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_hourglass_full.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hourglass_full.png b/app/src/main/res/drawable-xhdpi/ic_hourglass_full.png
new file mode 100644
index 000000000..3436e4d94
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_hourglass_full.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hourglass_full.png b/app/src/main/res/drawable-xxhdpi/ic_hourglass_full.png
new file mode 100644
index 000000000..5989a20cf
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_hourglass_full.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hourglass_full.png b/app/src/main/res/drawable-xxxhdpi/ic_hourglass_full.png
new file mode 100644
index 000000000..557dcb9a5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_hourglass_full.png differ
diff --git a/app/src/main/res/drawable/green_border.xml b/app/src/main/res/drawable/green_border.xml
new file mode 100644
index 000000000..dcf5c8e81
--- /dev/null
+++ b/app/src/main/res/drawable/green_border.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 5a2f10cf7..3e46d7ce1 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -173,30 +173,30 @@
+ android:orientation="vertical">