diff --git a/app/build.gradle b/app/build.gradle
index 6baaf5cee..aae744c7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -285,7 +285,7 @@ dependencies {
 
     implementation 'com.novoda:merlin:1.2.1'
 
-    implementation 'com.github.nextcloud:PopupBubble:1.0.6'
+    implementation 'com.github.nextcloud:PopupBubble:2.0.0'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     implementation "com.afollestad.material-dialogs:core:${materialDialogsVersion}"
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 48a7fc96e..353d651bd 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -35,9 +35,11 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.AssetFileDescriptor
+import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.database.Cursor
 import android.graphics.Bitmap
+import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.media.MediaPlayer
 import android.media.MediaRecorder
@@ -645,6 +647,9 @@ class ChatController(args: Bundle) :
             }
         }
 
+        binding.popupBubbleView.setTextColor(Color.WHITE)
+        binding.popupBubbleView.setIconTint(ColorStateList.valueOf(Color.WHITE))
+
         binding.messageInputView.setPadding(0, 0, 0, 0)
 
         binding.messagesListView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
index 4fa4d33b1..a15883a29 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -31,7 +31,9 @@ import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -101,7 +103,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys;
 import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
 import com.nextcloud.talk.utils.rx.SearchViewObservable;
-import com.webianks.library.PopupBubble;
+import com.nextcloud.ui.popupbubble.PopupBubble;
 import com.yarolegovich.lovelydialog.LovelySaveStateHandler;
 import com.yarolegovich.lovelydialog.LovelyStandardDialog;
 
@@ -806,6 +808,9 @@ public class ConversationsListController extends BaseController implements Flexi
                 recyclerView.smoothScrollToPosition(nextUnreadConversationScrollPosition);
             }
         });
+
+        newMentionPopupBubble.setTextColor(Color.WHITE);
+        newMentionPopupBubble.setIconTint(ColorStateList.valueOf(Color.WHITE));
     }
 
     private void checkToShowUnreadBubble() {
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index afa24a63c..5453d27df 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -90,19 +90,22 @@
             app:outcomingTimeTextSize="12sp"
             app:textAutoLink="all" />
 
-        <com.webianks.library.PopupBubble
+        <com.nextcloud.ui.popupbubble.PopupBubble
             android:id="@+id/popupBubbleView"
+            android:theme="@style/Button.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:layout_margin="16dp"
-            android:paddingStart="0dp"
-            android:paddingEnd="8dp"
-            app:pb_backgroundColor="@color/colorPrimary"
-            app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
-            app:pb_text="@string/nc_new_messages"
-            app:pb_textColor="@color/textColorOnPrimaryBackground" />
+            android:layout_marginStart="@dimen/dialog_padding"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="@dimen/dialog_padding"
+            android:layout_marginBottom="16dp"
+            android:minHeight="@dimen/min_size_clickable_area"
+            android:text="@string/nc_new_messages"
+            app:background="@color/colorPrimary"
+            app:cornerRadius="@dimen/button_corner_radius"
+            app:icon="@drawable/ic_baseline_arrow_downward_24px" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/controller_conversations_rv.xml b/app/src/main/res/layout/controller_conversations_rv.xml
index d571421cd..c595b9ed8 100644
--- a/app/src/main/res/layout/controller_conversations_rv.xml
+++ b/app/src/main/res/layout/controller_conversations_rv.xml
@@ -121,17 +121,20 @@
         app:srcCompat="@drawable/ic_add_white_24px"
         app:tint="@color/white" />
 
-    <com.webianks.library.PopupBubble
+    <com.nextcloud.ui.popupbubble.PopupBubble
         android:id="@+id/newMentionPopupBubble"
+        android:theme="@style/Button.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
-        android:layout_margin="16dp"
-        android:paddingStart="0dp"
-        android:paddingEnd="8dp"
-        app:pb_backgroundColor="@color/colorPrimary"
-        app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
-        app:pb_text="@string/nc_new_mention"
-        app:pb_textColor="@color/textColorOnPrimaryBackground" />
+        android:layout_marginStart="88dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="88dp"
+        android:layout_marginBottom="16dp"
+        android:minHeight="@dimen/min_size_clickable_area"
+        android:text="@string/nc_new_mention"
+        app:background="@color/colorPrimary"
+        app:cornerRadius="@dimen/button_corner_radius"
+        app:icon="@drawable/ic_baseline_arrow_downward_24px" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>