diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 962a9358ed..2eeffcd864 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -148,6 +148,7 @@ import java.util.Objects
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
+@SuppressLint("StringFormatInvalid")
 @AutoInjector(NextcloudTalkApplication::class)
 class ConversationsListActivity :
     BaseActivity(),
@@ -1037,8 +1038,8 @@ class ConversationsListActivity :
             newFragment.show(supportFragmentManager, FilterConversationFragment.TAG)
         }
 
-        binding.newMentionPopupBubble.hide()
-        binding.newMentionPopupBubble.setPopupBubbleListener {
+        binding.newMentionPopupBubble.visibility = View.GONE
+        binding.newMentionPopupBubble.setOnClickListener {
             val layoutManager = binding.recyclerView.layoutManager as SmoothScrollLinearLayoutManager?
             layoutManager?.scrollToPositionWithOffset(
                 nextUnreadConversationScrollPosition,
@@ -1060,7 +1061,7 @@ class ConversationsListActivity :
         searchBehaviorSubject.subscribe { value ->
             if (value) {
                 nextUnreadConversationScrollPosition = 0
-                binding.newMentionPopupBubble.hide()
+                binding.newMentionPopupBubble.visibility = View.GONE
             } else {
                 try {
                     val lastVisibleItem = layoutManager!!.findLastCompletelyVisibleItemPosition()
@@ -1070,13 +1071,13 @@ class ConversationsListActivity :
                         if (hasUnreadItems(conversation) && position > lastVisibleItem) {
                             nextUnreadConversationScrollPosition = position
                             if (!binding.newMentionPopupBubble.isShown) {
-                                binding.newMentionPopupBubble.show()
+                                binding.newMentionPopupBubble.visibility = View.VISIBLE
                             }
                             return@subscribe
                         }
                     }
                     nextUnreadConversationScrollPosition = 0
-                    binding.newMentionPopupBubble.hide()
+                    binding.newMentionPopupBubble.visibility = View.GONE
                 } catch (e: NullPointerException) {
                     Log.d(
                         TAG,
diff --git a/app/src/main/res/layout/activity_conversations.xml b/app/src/main/res/layout/activity_conversations.xml
index 7cf3800b6a..4e7f1f0779 100644
--- a/app/src/main/res/layout/activity_conversations.xml
+++ b/app/src/main/res/layout/activity_conversations.xml
@@ -251,7 +251,7 @@
         app:tint="@color/white"
         app:backgroundTint="@color/colorPrimary"/>
 
-    <com.nextcloud.ui.popupbubble.PopupBubble
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/newMentionPopupBubble"
         android:theme="@style/Button.Primary"
         android:layout_width="wrap_content"
@@ -265,6 +265,7 @@
         android:text="@string/nc_new_mention"
         app:background="@color/colorPrimary"
         app:cornerRadius="@dimen/button_corner_radius"
-        app:icon="@drawable/ic_baseline_arrow_downward_24px" />
+        app:icon="@drawable/ic_baseline_arrow_downward_24px"
+        style="@style/Widget.AppTheme.Button.ElevatedButton"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 8ceecf7610..1615501d9c 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 73 errors and 158 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 68 errors and 158 warnings</span>