diff --git a/drawable_resources/user-status-invisible.svg b/drawable_resources/user-status-invisible.svg
new file mode 100644
index 0000000000..91acbbb34a
--- /dev/null
+++ b/drawable_resources/user-status-invisible.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path
+        d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 4a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6z"
+        fill="#ffffff" />
+</svg>
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_away.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_away.png
new file mode 100644
index 0000000000..bf932c2baa
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_away.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_dnd.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_dnd.png
new file mode 100644
index 0000000000..6e756a708e
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_dnd.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_fun.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_fun.png
new file mode 100644
index 0000000000..5d38956e67
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_fun.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_offline.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_offline.png
new file mode 100644
index 0000000000..cd7986f9f3
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_offline.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_online.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_online.png
new file mode 100644
index 0000000000..25923be2a1
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_online.png differ
diff --git a/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt b/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt
index f91721862c..ae76202593 100644
--- a/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt
+++ b/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt
@@ -46,7 +46,7 @@ class SetStatusDialogFragmentIT : AbstractIT() {
             PredefinedStatus("commuting", "🚌", "Commuting", ClearAt("period", "1800")),
             PredefinedStatus("remote-work", "🏡", "Working remotely", ClearAt("end-of", "day")),
             PredefinedStatus("sick-leave", "🤒", "Out sick", ClearAt("end-of", "day")),
-            PredefinedStatus("vacationing", "🌴", "Vacationing", null)
+            PredefinedStatus("vacationing", "🌴", "Vacationing", ClearAt("", "")) // switch to null
         )
 
         shortSleep()
diff --git a/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java b/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java
index 2035c48dfb..42e6d6b05e 100644
--- a/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java
+++ b/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java
@@ -161,32 +161,32 @@ public class DialogFragmentIT extends AbstractIT {
                                                                                   OwnCloudVersion.nextcloud_20)));
         FileDisplayActivity activity = showDialog(sut);
 
-        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.dnd,
+        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.DND,
                                                               "Busy fixing 🐛…",
                                                               "",
                                                               -1)));
         shortSleep();
         screenshot(sut, "dnd");
 
-        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.online,
+        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.ONLINE,
                                                               "",
                                                               "",
                                                               -1)));
         shortSleep();
         screenshot(sut, "online");
 
-        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.online,
+        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.ONLINE,
                                                               "Let's have some fun",
                                                               "🎉",
                                                               -1)));
         shortSleep();
         screenshot(sut, "fun");
 
-        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.offline, "", "", -1)));
+        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.OFFLINE, "", "", -1)));
         shortSleep();
         screenshot(sut, "offline");
 
-        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.away, "Vacation", "🌴", -1)));
+        activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.AWAY, "Vacation", "🌴", -1)));
         shortSleep();
         screenshot(sut, "away");
     }
diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt b/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt
index 025882d06c..66adb0559e 100644
--- a/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt
+++ b/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt
@@ -80,98 +80,98 @@ class AvatarIT : AbstractIT() {
 
         runOnUiThread {
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(paulette, StatusType.online, "😘", targetContext),
+                BitmapUtils.createAvatarWithStatus(paulette, StatusType.ONLINE, "😘", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(christine, StatusType.online, "☁️", targetContext),
+                BitmapUtils.createAvatarWithStatus(christine, StatusType.ONLINE, "☁️", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(christine, StatusType.online, "🌴️", targetContext),
+                BitmapUtils.createAvatarWithStatus(christine, StatusType.ONLINE, "🌴️", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(christine, StatusType.online, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(christine, StatusType.ONLINE, "", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(paulette, StatusType.dnd, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(paulette, StatusType.DND, "", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(christine, StatusType.away, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(christine, StatusType.AWAY, "", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(paulette, StatusType.offline, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(paulette, StatusType.OFFLINE, "", targetContext),
                 width * 2,
                 1,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.online, "😘", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.ONLINE, "😘", targetContext),
                 width,
                 2,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.online, "☁️", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.ONLINE, "☁️", targetContext),
                 width,
                 2,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.online, "🌴️", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.ONLINE, "🌴️", targetContext),
                 width,
                 2,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.online, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.ONLINE, "", targetContext),
                 width,
                 2,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.dnd, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.DND, "", targetContext),
                 width,
                 2,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.away, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.AWAY, "", targetContext),
                 width,
                 2,
                 targetContext
             )
 
             fragment.addBitmap(
-                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.offline, "", targetContext),
+                BitmapUtils.createAvatarWithStatus(textBitmap, StatusType.OFFLINE, "", targetContext),
                 width,
                 2,
                 targetContext
diff --git a/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt b/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt
index 4f7b517d33..92e81d2e27 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt
+++ b/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt
@@ -28,6 +28,7 @@ import com.owncloud.android.lib.resources.users.PredefinedStatus
 
 class PredefinedStatusViewHolder(private val binding: PredefinedStatusBinding) : RecyclerView.ViewHolder(binding.root) {
     fun bind(status: PredefinedStatus) {
+        binding.icon.text = status.icon
         binding.name.text = status.message
         binding.clearAt.text = status.clearAt?.time // TODO better
     }
diff --git a/src/main/res/layout/predefined_status.xml b/src/main/res/layout/predefined_status.xml
index 78d6d42e47..ee6e331786 100644
--- a/src/main/res/layout/predefined_status.xml
+++ b/src/main/res/layout/predefined_status.xml
@@ -26,7 +26,7 @@
     android:layout_height="48dp">
 
     <TextView
-        android:id="@+id/imageView"
+        android:id="@+id/icon"
         android:layout_width="48dp"
         android:layout_height="match_parent"
         android:textSize="25sp"