diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
index a65d2ccb08..f7b413d380 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
@@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.glide.GiftBadgeModel
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.ScreenDensity
 import org.thoughtcrime.securesms.util.ThemeUtil
+import org.thoughtcrime.securesms.util.visible
 
 class BadgeImageView @JvmOverloads constructor(
   context: Context,
@@ -99,6 +100,10 @@ class BadgeImageView @JvmOverloads constructor(
     }
   }
 
+  fun isShowingBadge(): Boolean {
+    return drawable != null
+  }
+
   private fun clearDrawable() {
     if (drawable != null) {
       setImageDrawable(null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
index 65a35ddea5..b9fe65149c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
@@ -257,6 +257,7 @@ final class GroupMemberListAdapter extends RecyclerView.Adapter<GroupMemberListA
       if (this.badge != null) {
         this.badge.setBadgeFromRecipient(recipient);
         this.badge.setClickable(false);
+        this.badge.setVisibility(this.badge.isShowingBadge() ? View.VISIBLE : View.GONE);
       }
 
       if (this.about != null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java
index 3661bb7cbe..861d468392 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java
@@ -31,9 +31,6 @@ public final class GroupInviteSentDialog {
 
     AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context)
                                                  .setTitle(context.getResources().getQuantityString(R.plurals.GroupManagement_invitation_sent, size, size))
-                                                 // TODO: GV2 Need a URL for learn more
-                                                 //  .setNegativeButton(R.string.GroupManagement_learn_more, (dialog, which) -> {
-                                                 //  })
                                                  .setPositiveButton(android.R.string.ok, null);
     if (size == 1) {
       builder.setMessage(context.getString(R.string.GroupManagement_invite_single_user, recipients.get(0).getDisplayNameOrUsername(context)));