diff --git a/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlugin.java b/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlugin.java
index e1087c539a96b994351f8c234126a10970145890..16d4d05a3e394f9a39bf300eb8dd722c5eca9576 100644
--- a/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlugin.java
@@ -21,7 +21,6 @@
 package org.kde.kdeconnect.Plugins.MprisReceiverPlugin;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -45,6 +44,7 @@ import java.util.List;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class MprisReceiverPlugin extends Plugin implements MediaSessionManager.OnActiveSessionsChangedListener {
diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
index 9681c44cd1701ff20445386dbd2b96fddd22ce36..4119d599414eb902de179a09e204f6873c0cb8a7 100644
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
@@ -20,7 +20,6 @@
 
 package org.kde.kdeconnect.Plugins.NotificationsPlugin;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -46,6 +45,7 @@ import org.kde.kdeconnect_tp.R;
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
 //TODO: Turn this into a PluginSettingsFragment
diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
index 42612e78c4179022849b49e4a71fcb15a1942b4b..69ab6e1037f43e398e42211c92c75a22ab2e9246 100644
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
@@ -22,7 +22,6 @@ package org.kde.kdeconnect.Plugins.NotificationsPlugin;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.RemoteInput;
@@ -58,6 +57,7 @@ import java.util.Map;
 import java.util.Set;
 
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.NotificationCompat;
 
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
diff --git a/src/org/kde/kdeconnect/Plugins/Plugin.java b/src/org/kde/kdeconnect/Plugins/Plugin.java
index 23a2ca6515d96bb858bbd9be7ff375e7e97b7a2a..b226426ed7b36fa2f9860eb4fc08d743deaa5c79 100644
--- a/src/org/kde/kdeconnect/Plugins/Plugin.java
+++ b/src/org/kde/kdeconnect/Plugins/Plugin.java
@@ -21,7 +21,6 @@
 package org.kde.kdeconnect.Plugins;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
@@ -34,6 +33,7 @@ import org.kde.kdeconnect.UserInterface.PluginSettingsFragment;
 import org.kde.kdeconnect_tp.R;
 
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
diff --git a/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
index b2cfdbe1f598ed8f55b64d2bbdef401f696a860f..3d52b84e1a24a76e838f6313119216e0b0ad0a5b 100644
--- a/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
@@ -20,7 +20,6 @@
 
 package org.kde.kdeconnect.UserInterface;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Build;
@@ -41,6 +40,7 @@ import org.kde.kdeconnect_tp.R;
 import java.util.ArrayList;
 import java.util.Collections;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class CustomDevicesActivity extends AppCompatActivity {
diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
index 3ddc96dd28abe08139d374277d34aca425c0d4c7..e6262a3f11b0d7d4fb25976d6d427e4e24f218c3 100644
--- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
@@ -21,7 +21,6 @@
 package org.kde.kdeconnect.UserInterface;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -55,6 +54,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/src/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
index 71d831d6ac119d1a89e7fa2e4b968788045f08ec..40fee48fe7146317f94abdc32a34a9cf1e5982b5 100644
--- a/src/org/kde/kdeconnect/UserInterface/MainActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
@@ -1,7 +1,6 @@
 package org.kde.kdeconnect.UserInterface;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -30,6 +29,7 @@ import java.util.Set;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
@@ -381,13 +381,13 @@ public class MainActivity extends AppCompatActivity {
         nameChangeSubscribers.remove(cb);
     }
 
-    public void openRenameDeviceDialog() {
+    public void openRenameDeviceDialog(Context context) {
         final EditText deviceNameEdit = new EditText(this);
         String deviceName = DeviceHelper.getDeviceName(this);
         deviceNameEdit.setText(deviceName);
         float dpi = this.getResources().getDisplayMetrics().density;
         deviceNameEdit.setPadding( ((int) (18 * dpi)), ((int) (16 * dpi)), ((int) (18 * dpi)), ((int) (12 * dpi)) );
-        new AlertDialog.Builder(this)
+        new AlertDialog.Builder(context)
                 .setView(deviceNameEdit)
                 .setPositiveButton(R.string.device_rename_confirm, (dialog, which) -> {
                     String newDeviceName = deviceNameEdit.getText().toString();
diff --git a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
index 6babcef74edd25f5082c4515c6dfad851356db9b..3995ee207af8409124d75bd95ac7ca3aab30cb68 100644
--- a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
@@ -40,11 +40,12 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
 
         // Rename device
         mainActivity.addNameChangeCallback(this);
+        //TODO: Use an EditTextPreference
         renameDevice = new Preference(context);
         renameDevice.setPersistent(false);
         renameDevice.setSelectable(true);
         renameDevice.setOnPreferenceClickListener(preference -> {
-            mainActivity.openRenameDeviceDialog();
+            mainActivity.openRenameDeviceDialog(context);
             return true;
         });
         String deviceName = DeviceHelper.getDeviceName(context);