diff --git a/src/org/omnirom/omnilib/preference/ColorSelectDialog.java b/src/org/omnirom/omnilib/preference/ColorSelectDialog.java
index 02773db..b2aa75f 100644
--- a/src/org/omnirom/omnilib/preference/ColorSelectDialog.java
+++ b/src/org/omnirom/omnilib/preference/ColorSelectDialog.java
@@ -18,7 +18,6 @@
 package org.omnirom.omnilib.preference;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.graphics.Color;
@@ -43,6 +42,8 @@
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import org.omnirom.omnilib.R;
 import org.omnirom.omnilib.ui.ColorPanelView;
 import org.omnirom.omnilib.ui.ColorPickerView;
diff --git a/src/org/omnirom/omnilib/preference/ColorSelectPreference.java b/src/org/omnirom/omnilib/preference/ColorSelectPreference.java
index beefab6..28ff78c 100644
--- a/src/org/omnirom/omnilib/preference/ColorSelectPreference.java
+++ b/src/org/omnirom/omnilib/preference/ColorSelectPreference.java
@@ -16,8 +16,6 @@
 
 package org.omnirom.omnilib.preference;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -30,6 +28,8 @@
 import android.util.TypedValue;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import org.omnirom.omnilib.R;
 
 public class ColorSelectPreference extends Preference implements DialogInterface.OnDismissListener {
@@ -40,7 +40,7 @@
     private ImageView mLightColorView;
     private Resources mResources;
     private int mColorValue;
-    private Dialog mDialog;
+    private AlertDialog mDialog;
 
     private boolean mShowLedPreview;
     private boolean mShowMultiColor;
@@ -131,7 +131,7 @@
         mDialog.show();
     }
 
-    public Dialog getDialog() {
+    public AlertDialog getDialog() {
         final ColorSelectDialog d = new ColorSelectDialog(getContext(),
                 0xFF000000 | mColorValue, mShowMultiColor, mShowLedPreview, mWithAlpha);
 
