diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03b8ea1b8f6..9243088c729 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -123,7 +123,8 @@
             android:windowSoftInputMode="adjustResize"
             android:allowEmbedded="true"
             android:resizeableActivity="true"
-            android:documentLaunchMode="always">
+            android:documentLaunchMode="always"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -226,6 +227,9 @@
         <activity
             android:name=".chat.ChatActivity"
             android:theme="@style/AppTheme"
+            android:allowEmbedded="true"
+            android:resizeableActivity="true"
+            android:documentLaunchMode="always"
             />
 
         <activity
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
index 5314f58d061..b402944a6e8 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
@@ -445,7 +445,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
         val notificationBuilder = NotificationCompat.Builder(context!!, "4")
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setCategory(category)
-            .setLargeIcon(getLargeIcon())
+            // .setLargeIcon(getLargeIcon())
             .setSmallIcon(R.drawable.ic_logo)
             .setContentTitle(contentTitle)
             .setContentText(contentText)
@@ -568,20 +568,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
             .setImportant(true)
             .setBot(true)
         notificationBuilder.setOnlyAlertOnce(true)
-
-        if ("user" == userType || "guest" == userType) {
-            val baseUrl = signatureVerification.user!!.baseUrl
-            val avatarUrl = if ("user" == userType) {
-                ApiUtils.getUrlForAvatar(
-                    baseUrl,
-                    notificationUser.id,
-                    false
-                )
-            } else {
-                ApiUtils.getUrlForGuestAvatar(baseUrl, notificationUser.name, false)
-            }
-            person.setIcon(loadAvatarSync(avatarUrl, context!!))
-        }
+        person.setIcon(getAvatarIcon())
         val personBuilt = person.build()
         notificationBuilder.setStyle(getStyle(personBuilt, style))
         notificationBuilder.addPerson(personBuilt)
@@ -633,31 +620,59 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
 
     @RequiresApi(Build.VERSION_CODES.R)
     private fun setBubble(notificationBuilder: NotificationCompat.Builder) {
-        val intent = getIntentToOpenConversation()
-
-        val shortcutId = System.currentTimeMillis().toString()
+        val intent = getIntentToOpenConversation()!!
 
-        val shortCutInfo = ShortcutInfoCompat.Builder(context!!, shortcutId)
-            .setCategories(setOf(Notification.CATEGORY_MESSAGE))
-            .setIntent(Intent(Intent.ACTION_DEFAULT))
-            .setLongLived(true)
-            .setShortLabel("testing Bubble")
-            .build()
+        val shortcutId = pushMessage.notificationUser!!.id!!
+        val shortcuts = ShortcutManagerCompat.getDynamicShortcuts(context!!)
+        val index = shortcuts.firstOrNull {
+            it.id == shortcutId
+        }
 
-        ShortcutManagerCompat.pushDynamicShortcut(context!!, shortCutInfo)
+        if (index == null) {
+            val shortCutInfo = ShortcutInfoCompat.Builder(context!!, shortcutId)
+                .setCategories(setOf(Notification.CATEGORY_MESSAGE))
+                .setIntent(Intent(Intent.ACTION_DEFAULT))
+                .setLongLived(true)
+                .setShortLabel(pushMessage.notificationUser!!.name!!)
+                .build()
+            ShortcutManagerCompat.pushDynamicShortcut(context!!, shortCutInfo)
+        }
 
         val bubbleData =
-            BubbleMetadata.Builder(intent!!, IconCompat.createWithBitmap(getLargeIcon()))
+            BubbleMetadata.Builder(intent, getAvatarIcon())
                 .setDesiredHeight(DESIRED_SIZE)
-                .build() // eventually change the icon to the avatar of the conversation
-        // also this will eventually need to be set up to only show for important conversations
+                .setIntent(intent)
+
+        bubbleData.setIcon(getAvatarIcon())
+        // TODO also this will eventually need to be set up to only show for important conversations
 
         notificationBuilder
-            .setBubbleMetadata(bubbleData)
+            .setBubbleMetadata(bubbleData.build())
             .setShortcutId(shortcutId)
             .setLocusId(LocusIdCompat(shortcutId))
     }
 
+    private fun getAvatarIcon(): IconCompat {
+        val notificationUser = pushMessage.notificationUser
+        val userType = notificationUser!!.type
+        var result: IconCompat? = null
+        if ("user" == userType || "guest" == userType) {
+            val baseUrl = signatureVerification.user!!.baseUrl
+            val avatarUrl = if ("user" == userType) {
+                ApiUtils.getUrlForAvatar(
+                    baseUrl,
+                    notificationUser.type,
+                    false
+                )
+            } else {
+                ApiUtils.getUrlForGuestAvatar(baseUrl, notificationUser.name, false)
+            }
+            result = loadAvatarSync(avatarUrl, context!!)
+        }
+
+        return result ?: IconCompat.createWithResource(context!!, R.drawable.account_circle_96dp)
+    }
+
     private fun addReplyAction(notificationBuilder: NotificationCompat.Builder, systemNotificationId: Int) {
         val replyLabel = context!!.resources.getString(R.string.nc_reply)
         val remoteInput = RemoteInput.Builder(NotificationUtils.KEY_DIRECT_REPLY)