diff --git a/clients/android/NewsBlur/build.gradle b/clients/android/NewsBlur/build.gradle
index bb48479f6..9fc990fd4 100644
--- a/clients/android/NewsBlur/build.gradle
+++ b/clients/android/NewsBlur/build.gradle
@@ -38,6 +38,7 @@ dependencies {
     implementation 'nl.dionsegijn:konfetti:1.2.2'
     implementation 'com.github.jinatonic.confetti:confetti:1.1.2'
     implementation 'com.google.android.play:core:1.8.3'
+    implementation "com.google.android.material:material:1.2.1"
 }
 
 android {
@@ -47,13 +48,14 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 175
-        versionName "10.1b7"
+        versionName "10.1dev"
     }
     compileOptions.with {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
     android.buildFeatures.viewBinding = true
+    android.buildFeatures.dataBinding = true
 
     sourceSets {
         main {
diff --git a/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml b/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml
index 2e9d1b4ba..ecbe55a74 100644
--- a/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml
+++ b/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    style="?itemBackground" >
+    style="?layoutBackground" >
 
     <com.newsblur.view.ProgressThrobber
         android:id="@+id/loading_throb"
diff --git a/clients/android/NewsBlur/res/layout/activity_itemslist.xml b/clients/android/NewsBlur/res/layout/activity_itemslist.xml
index 251b7c3f7..0be94e1f3 100644
--- a/clients/android/NewsBlur/res/layout/activity_itemslist.xml
+++ b/clients/android/NewsBlur/res/layout/activity_itemslist.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    style="?itemBackground" >
+    style="?layoutBackground" >
     
     <EditText
         android:id="@+id/itemlist_search_query"
diff --git a/clients/android/NewsBlur/res/layout/activity_profile.xml b/clients/android/NewsBlur/res/layout/activity_profile.xml
index 7a0089efa..a20c49a6e 100644
--- a/clients/android/NewsBlur/res/layout/activity_profile.xml
+++ b/clients/android/NewsBlur/res/layout/activity_profile.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:orientation="vertical" >
 
     <FrameLayout
diff --git a/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml b/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml
index 7e59340b8..0afbb7758 100644
--- a/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:orientation="vertical" >
 
     <RelativeLayout
diff --git a/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml b/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml
index 6d0cd0399..207708f0c 100644
--- a/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml
@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    style="?itemBackground" >
+    style="?layoutBackground" >
 
     <RelativeLayout
         android:id="@+id/empty_view"
diff --git a/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml b/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml
index ea8313840..04c0b1f6a 100644
--- a/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:orientation="vertical" >
 
     <LinearLayout
diff --git a/clients/android/NewsBlur/res/layout/row_activity.xml b/clients/android/NewsBlur/res/layout/row_activity.xml
index cea50a0a2..cb31face1 100644
--- a/clients/android/NewsBlur/res/layout/row_activity.xml
+++ b/clients/android/NewsBlur/res/layout/row_activity.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:paddingBottom="10dp"
     android:paddingTop="10dp" >
 
diff --git a/clients/android/NewsBlur/res/layout/row_feedresult.xml b/clients/android/NewsBlur/res/layout/row_feedresult.xml
index 5a73a952d..e05228b2a 100644
--- a/clients/android/NewsBlur/res/layout/row_feedresult.xml
+++ b/clients/android/NewsBlur/res/layout/row_feedresult.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:focusable="false">
 
     <RelativeLayout
diff --git a/clients/android/NewsBlur/res/values/attrs.xml b/clients/android/NewsBlur/res/values/attrs.xml
index 635c10d98..3ef1843a2 100644
--- a/clients/android/NewsBlur/res/values/attrs.xml
+++ b/clients/android/NewsBlur/res/values/attrs.xml
@@ -5,7 +5,7 @@
     <attr name="feedRowNeutCountText" format="string" />
     <attr name="actionbarBackground" format="string" />
     <attr name="listBackground" format="string" />
-    <attr name="itemBackground" format="string" />
+    <attr name="layoutBackground" format="string" />
     <attr name="readingBackground" format="string" />
     <attr name="defaultText" format="string" />
     <attr name="linkText" format="string" />
diff --git a/clients/android/NewsBlur/res/values/colors.xml b/clients/android/NewsBlur/res/values/colors.xml
index ae2eb19cf..cc5cdf86c 100644
--- a/clients/android/NewsBlur/res/values/colors.xml
+++ b/clients/android/NewsBlur/res/values/colors.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <color name="primary.light">@color/nb_green_gray91</color>
+    <color name="primaryDark.light">@color/black</color>
+    <color name="secondary.light">@color/newsblur_blue</color>
+
     <color name="black">#000000</color>
     <color name="gray07">#121212</color>
     <color name="gray10">#1A1A1A</color>
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java
index bc044410c..ca2cfcd1f 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java
@@ -20,7 +20,7 @@ public class AddFeedExternal extends NbActivity implements AddFeedFragment.AddFe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = ActivityAddfeedexternalBinding.inflate(getLayoutInflater());
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         setContentView(binding.getRoot());
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java b/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java
index 9698fc645..90d95d06a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java
@@ -46,7 +46,7 @@ abstract public class FeedChooser extends NbActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         bindLayout();
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setupList();
         loadFeeds();
         loadFolders();
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Main.java b/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
index a48d479fb..bf4074de8 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
@@ -58,7 +58,7 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
         binding = ActivityMainBinding.inflate(getLayoutInflater());
 		setContentView(binding.getRoot());
 
-		getActionBar().hide();
+		getSupportActionBar().hide();
 
         // set the status bar to an generic loading message when the activity is first created so
         // that something is displayed while the service warms up
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java b/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
index 9c767a531..aae67bb3d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
@@ -1,6 +1,5 @@
 package com.newsblur.activity;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -10,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
 import com.newsblur.R;
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java b/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
index 42da9b5ba..7cf4c09fe 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
@@ -1,6 +1,8 @@
 package com.newsblur.activity;
 
 import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentActivity;
 import android.widget.Toast;
 
@@ -15,7 +17,7 @@ import java.util.ArrayList;
  * The base class for all Activities in the NewsBlur app.  Handles enforcement of
  * login state and tracking of sync/update broadcasts.
  */
-public class NbActivity extends FragmentActivity {
+public class NbActivity extends AppCompatActivity {
 
     public static final int UPDATE_DB_READY = (1<<0);
     public static final int UPDATE_METADATA = (1<<1);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java b/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java
index 9684aa983..671120465 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java
@@ -28,7 +28,7 @@ public class Profile extends NbActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_profile);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		apiManager = new APIManager(this);
         if (savedInstanceState == null) {
             userId = getIntent().getStringExtra(USER_ID);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java b/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java
index bd484072b..e8d4f6123 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java
@@ -46,7 +46,7 @@ public class SearchForFeeds extends NbActivity implements LoaderCallbacks<Search
 	@Override
 	protected void onCreate(Bundle arg0) {
 		super.onCreate(arg0);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		
 		setTitle(R.string.title_feed_search);
 		setContentView(R.layout.activity_feed_search);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java b/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
index 0fd95aff2..cd06cf40e 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
@@ -1,5 +1,6 @@
 package com.newsblur.activity;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentActivity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -10,7 +11,7 @@ import com.newsblur.util.PrefConstants;
 import com.newsblur.util.PrefsUtils;
 import com.newsblur.util.UIUtils;
 
-public class Settings extends FragmentActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class Settings extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -18,7 +19,7 @@ public class Settings extends FragmentActivity implements SharedPreferences.OnSh
 
         super.onCreate(savedInstanceState);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         SettingsFragment fragment = new SettingsFragment();
         getFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java
index 6c5c37db3..0583aedef 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java
@@ -1,13 +1,13 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java
index 6ee846b65..119a3260d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java
@@ -1,9 +1,10 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.newsblur.R;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java
index 62f25c837..a4fee31bc 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java
@@ -6,10 +6,11 @@ import java.util.List;
 import java.util.Set;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java
index 301228e59..20dcec549 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java
@@ -11,10 +11,11 @@ import com.newsblur.util.FeedUtils;
 import com.newsblur.util.UIUtils;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 public class DeleteFeedFragment extends DialogFragment {
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java
index 708be7ab1..4642836ec 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java
@@ -1,11 +1,11 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java
index 6283e5dd2..ae43f965a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java
@@ -1,10 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java
index bdcc862b5..c440fdc92 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java
@@ -4,10 +4,11 @@ import java.util.List;
 import java.util.Map;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java
index 4c4a1a5cb..ced1e801d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java
@@ -1,12 +1,13 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java
index ed2819ceb..47699b739 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java
@@ -1,9 +1,10 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.newsblur.R;
@@ -14,7 +15,7 @@ public class LogoutDialogFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(getResources().getString(R.string.logout_warning));
+        builder.setTitle(getResources().getString(R.string.logout_warning));
         builder.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java
index 3632d826b..1c67ba775 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java
@@ -3,10 +3,11 @@ package com.newsblur.fragment;
 import com.newsblur.util.FeedUtils;
 import com.newsblur.util.ReadingAction;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 public class ReadingActionConfirmationFragment extends DialogFragment {
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
index 8edf8a7a2..54658eeaa 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
@@ -1,7 +1,6 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,6 +15,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java
index 380010873..3173b57e9 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java
@@ -1,11 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java
index df4093c31..b9e275f17 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java
@@ -1,10 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java
index 930bdbb7d..3255a4dd9 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java
@@ -1,10 +1,10 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.newsblur.R;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java
index d99e461ba..dcdd6d333 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java
@@ -1,10 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java
index 7675e9e0b..dc96639f7 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java
@@ -3,10 +3,11 @@ package com.newsblur.fragment;
 import java.util.Map;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.InputType;
 import android.text.TextUtils;