diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/StartActivity.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/StartActivity.java
index 3a9e6e8e28..b6d5ab951a 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/StartActivity.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/StartActivity.java
@@ -16,7 +16,6 @@
  */
 package com.github.adamantcheese.chan;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
@@ -30,6 +29,7 @@
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.util.Pair;
 import androidx.lifecycle.Lifecycle;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/manager/UpdateManager.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/manager/UpdateManager.java
index e0a39c1e34..2ae049ce46 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/manager/UpdateManager.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/manager/UpdateManager.java
@@ -17,7 +17,6 @@
 package com.github.adamantcheese.chan.core.manager;
 
 import android.Manifest;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +28,7 @@
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.FileProvider;
 
 import com.github.adamantcheese.chan.R;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ThreadPresenter.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ThreadPresenter.java
index 4a3248ba96..76e58f9e1c 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ThreadPresenter.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ThreadPresenter.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.core.presenter;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/AlbumDownloadController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/AlbumDownloadController.java
index 470381ddcf..be5e14077f 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/AlbumDownloadController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/AlbumDownloadController.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.controller;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.view.View;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/BoardSetupController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/BoardSetupController.java
index 8639e5cb43..f86264b77d 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/BoardSetupController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/BoardSetupController.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.ui.controller;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.view.Gravity;
 import android.view.MotionEvent;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/DrawerController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/DrawerController.java
index f250adb2df..1d1fcd1d69 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/DrawerController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/DrawerController.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.controller;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.view.Gravity;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/FiltersController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/FiltersController.java
index b68125e983..0e72eedcb9 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/FiltersController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/FiltersController.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.ui.controller;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.MotionEvent;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/HistoryController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/HistoryController.java
index 5956df85f8..db4b8325c0 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/HistoryController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/HistoryController.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.controller;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SaveLocationController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SaveLocationController.java
index e341eaeb3c..e08f614d55 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SaveLocationController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SaveLocationController.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Environment;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SitesSetupController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SitesSetupController.java
index 1843c98fdf..6e8faef30e 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SitesSetupController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/SitesSetupController.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.ui.controller;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/ViewThreadController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/ViewThreadController.java
index 1d999b13d6..c287d6ad1e 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/ViewThreadController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/ViewThreadController.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ExperimentalSettingsController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ExperimentalSettingsController.java
index 9ca9629029..d2544edbe8 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ExperimentalSettingsController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ExperimentalSettingsController.java
@@ -1,6 +1,6 @@
 package com.github.adamantcheese.chan.ui.controller.settings;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ImportExportSettingsController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ImportExportSettingsController.java
index 9be1c840b7..1643561ba6 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ImportExportSettingsController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ImportExportSettingsController.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.controller.settings;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.net.Uri;
 import android.widget.Toast;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/MainSettingsController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/MainSettingsController.java
index 9ec0792e75..141dab9d36 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/MainSettingsController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/MainSettingsController.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.controller.settings;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.view.ViewGroup;
 
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ThemeSettingsController.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ThemeSettingsController.java
index c5c9ab3271..d429a575be 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ThemeSettingsController.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/ThemeSettingsController.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.ui.controller.settings;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SaveLocationSetupDelegate.kt b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SaveLocationSetupDelegate.kt
index 378f9a512d..a24ac95e91 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SaveLocationSetupDelegate.kt
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SaveLocationSetupDelegate.kt
@@ -1,6 +1,6 @@
 package com.github.adamantcheese.chan.ui.controller.settings.base_directory
 
-import android.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.content.Context
 import com.github.adamantcheese.chan.R
 import com.github.adamantcheese.chan.core.presenter.MediaSettingsControllerPresenter
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SharedLocationSetupDelegate.kt b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SharedLocationSetupDelegate.kt
index 1cc62beb83..6123714296 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SharedLocationSetupDelegate.kt
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/SharedLocationSetupDelegate.kt
@@ -1,6 +1,6 @@
 package com.github.adamantcheese.chan.ui.controller.settings.base_directory
 
-import android.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.content.Context
 import android.widget.Toast
 import com.github.adamantcheese.chan.R
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/ThreadsLocationSetupDelegate.kt b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/ThreadsLocationSetupDelegate.kt
index 65d4df1c88..6f61c4845e 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/ThreadsLocationSetupDelegate.kt
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/controller/settings/base_directory/ThreadsLocationSetupDelegate.kt
@@ -1,6 +1,6 @@
 package com.github.adamantcheese.chan.ui.controller.settings.base_directory
 
-import android.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.content.Context
 import com.github.adamantcheese.chan.R
 import com.github.adamantcheese.chan.core.database.DatabaseManager
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/helper/RuntimePermissionsHelper.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/helper/RuntimePermissionsHelper.java
index 636122a748..f7e130afce 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/helper/RuntimePermissionsHelper.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/helper/RuntimePermissionsHelper.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.ui.helper;
 
 import android.app.Activity;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/FilterLayout.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/FilterLayout.java
index 8af8cec970..f6fa5fbca3 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/FilterLayout.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/FilterLayout.java
@@ -17,7 +17,7 @@
 package com.github.adamantcheese.chan.ui.layout;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ThreadLayout.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ThreadLayout.java
index 914f171baa..3078cb6e39 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ThreadLayout.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ThreadLayout.java
@@ -19,7 +19,7 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Build;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/IntegerSettingView.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/IntegerSettingView.java
index 3b96006362..bd9754cf19 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/IntegerSettingView.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/IntegerSettingView.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.settings;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.InputType;
 import android.view.View;
 import android.view.WindowManager;
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/StringSettingView.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/StringSettingView.java
index cb27c8e5fb..1f33dbd77e 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/StringSettingView.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/settings/StringSettingView.java
@@ -16,7 +16,7 @@
  */
 package com.github.adamantcheese.chan.ui.settings;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
diff --git a/Kuroba/app/src/main/res/drawable/dialog_material_background.xml b/Kuroba/app/src/main/res/drawable/dialog_material_background.xml
new file mode 100644
index 0000000000..b4bb703216
--- /dev/null
+++ b/Kuroba/app/src/main/res/drawable/dialog_material_background.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="16dp"
+    android:insetTop="16dp"
+    android:insetRight="16dp"
+    android:insetBottom="16dp">
+    <shape android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="?backcolor" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/Kuroba/app/src/main/res/values/styles.xml b/Kuroba/app/src/main/res/values/styles.xml
index 28c4d7ec3e..1d74dc6090 100644
--- a/Kuroba/app/src/main/res/values/styles.xml
+++ b/Kuroba/app/src/main/res/values/styles.xml
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
         <item name="colorSurface">@color/white</item>
         <item name="textAppearanceBody2">@style/TextAppearance.MaterialComponents.Body2</item>
-        <item name="android:alertDialogTheme">@style/AlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="android:listPopupWindowStyle">@style/ListPopupWindowStyle</item>
 
         <item name="colorControlNormal">@color/textColorSecondary</item>
@@ -58,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
         <item name="colorSurface">@color/white</item>
         <item name="textAppearanceBody2">@style/TextAppearance.MaterialComponents.Body2</item>
-        <item name="android:alertDialogTheme">@style/AlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="android:listPopupWindowStyle">@style/ListPopupWindowStyle</item>
 
         <item name="colorControlNormal">@color/textColorSecondary</item>
@@ -668,8 +668,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="AlertDialogStyle" parent="@style/ThemeOverlay.AppCompat.Dialog.Alert">
-        <item name="android:windowBackground">?backcolor</item>
+    <style name="AlertDialogTheme" parent="@style/ThemeOverlay.AppCompat.Dialog.Alert">
+        <item name="android:windowBackground">@drawable/dialog_material_background</item>
     </style>
 
     <style name="ListPopupWindowStyle" parent="Widget.AppCompat.ListPopupWindow">