diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 355c456b20..a784f1a0d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -465,17 +465,11 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ClearProfileAvatarActivity"
-            android:theme="@style/Theme.AppCompat.Dialog.Alert"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:icon="@drawable/clear_profile_avatar"
-            android:label="@string/AndroidManifest_remove_photo">
-
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </activity>
+    <activity android:name=".ClearAvatarPromptActivity"
+              android:theme="@style/Theme.AppCompat.Dialog.Alert"
+              android:icon="@drawable/clear_profile_avatar"
+              android:label="@string/AndroidManifest_remove_photo"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
               android:theme="@style/Theme.AppCompat.Dialog.Alert" />
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ClearAvatarPromptActivity.java
similarity index 69%
rename from app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
rename to app/src/main/java/org/thoughtcrime/securesms/ClearAvatarPromptActivity.java
index 18debf0328..c668435cac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ClearAvatarPromptActivity.java
@@ -7,18 +7,21 @@ import android.view.ContextThemeWrapper;
 
 import androidx.appcompat.app.AlertDialog;
 
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-public class ClearProfileAvatarActivity extends Activity {
+public final class ClearAvatarPromptActivity extends Activity {
 
   private static final String ARG_TITLE = "arg_title";
 
   public static Intent createForUserProfilePhoto() {
-    return new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+    Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class);
+    intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
+    return intent;
   }
 
   public static Intent createForGroupProfilePhoto() {
-    Intent intent = new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+    Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class);
     intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_group_photo);
     return intent;
   }
@@ -27,10 +30,10 @@ public class ClearProfileAvatarActivity extends Activity {
   public void onResume() {
     super.onResume();
 
-    int titleId = getIntent().getIntExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
+    int message = getIntent().getIntExtra(ARG_TITLE, 0);
 
     new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme))
-                   .setMessage(titleId)
+                   .setMessage(message)
                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
                    .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
                      Intent result = new Intent();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java
index 87c154434c..24f40bb36b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java
@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.annimon.stream.Stream;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
-import org.thoughtcrime.securesms.ClearProfileAvatarActivity;
+import org.thoughtcrime.securesms.ClearAvatarPromptActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ThemeUtil;
@@ -146,8 +146,8 @@ public class AvatarSelectionBottomSheetDialogFragment extends BottomSheetDialogF
       case GALLERY:
         return AvatarSelectionActivity.getIntentForGallery(context);
       case DELETE:
-        return isGroup ? ClearProfileAvatarActivity.createForGroupProfilePhoto()
-                       : ClearProfileAvatarActivity.createForUserProfilePhoto();
+        return isGroup ? ClearAvatarPromptActivity.createForGroupProfilePhoto()
+                       : ClearAvatarPromptActivity.createForUserProfilePhoto();
       default:
         throw new IllegalStateException("Unknown option: " + selectionOption);
     }