diff --git a/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
index 11d2d3c62d..4bf8000720 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
@@ -4,6 +4,7 @@ package org.thoughtcrime.securesms;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.ContextThemeWrapper;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -16,8 +17,6 @@ public class ClearProfileAvatarActivity extends Activity {
 
   private static final String ARG_TITLE = "arg_title";
 
-  private final DynamicTheme theme = new DynamicNoActionBarTheme();
-
   public static Intent createForUserProfilePhoto() {
     return new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
   }
@@ -28,22 +27,13 @@ public class ClearProfileAvatarActivity extends Activity {
     return intent;
   }
 
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    theme.onCreate(this);
-  }
-
   @Override
   public void onResume() {
     super.onResume();
 
-    theme.onResume(this);
-
     int titleId = getIntent().getIntExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
 
-    new AlertDialog.Builder(this)
+    new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme))
                    .setMessage(titleId)
                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
                    .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {