diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index a5ad991c..0d375c8b 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1752,7 +1752,7 @@ public class Helper {
                 is.close();
                 String json = new String(buffer, StandardCharsets.UTF_8);
                 Gson gson = new Gson();
-                AlertDialog.Builder dialogBuilderOptin = new AlertDialog.Builder(activity);
+                AlertDialog.Builder dialogBuilderOptin = new AlertDialog.Builder(activity, Helper.dialogStyle());
                 PopupReleaseNotesBinding binding = PopupReleaseNotesBinding.inflate(activity.getLayoutInflater());
                 dialogBuilderOptin.setView(binding.getRoot());
                 try {
diff --git a/app/src/main/java/app/fedilab/android/helper/MediaHelper.java b/app/src/main/java/app/fedilab/android/helper/MediaHelper.java
index 1603b57d..93c1b8d3 100644
--- a/app/src/main/java/app/fedilab/android/helper/MediaHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/MediaHelper.java
@@ -293,7 +293,7 @@ public class MediaHelper {
         AudioRecorder mAudioRecorder = AudioRecorder.getInstance();
         File mAudioFile = new File(filePath);
         PopupRecordBinding binding = PopupRecordBinding.inflate(activity.getLayoutInflater());
-        AlertDialog.Builder audioPopup = new AlertDialog.Builder(activity);
+        AlertDialog.Builder audioPopup = new AlertDialog.Builder(activity, Helper.dialogStyle());
         audioPopup.setView(binding.getRoot());
         AlertDialog alert = audioPopup.create();
         alert.show();
@@ -341,7 +341,7 @@ public class MediaHelper {
      * @param listener - OnSchedule
      */
     public static void scheduleMessage(Activity activity, OnSchedule listener) {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
         DatetimePickerBinding binding = DatetimePickerBinding.inflate(activity.getLayoutInflater());
 
         dialogBuilder.setView(binding.getRoot());
diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index 6521c9dd..b912fe3a 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -680,7 +680,7 @@ public class PinnedTimelineHelper {
                 itemShowReplies.setChecked(show_replies);
                 editor.apply();
             } else if (itemId == R.id.action_filter) {
-                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
                 LayoutInflater inflater = activity.getLayoutInflater();
                 View dialogView = inflater.inflate(R.layout.popup_filter_regex, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
@@ -869,7 +869,7 @@ public class PinnedTimelineHelper {
                     e.printStackTrace();
                 }
             } else if (itemId == R.id.action_any) {
-                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
                 LayoutInflater inflater = activity.getLayoutInflater();
                 View dialogView = inflater.inflate(R.layout.tags_any, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
@@ -898,7 +898,7 @@ public class PinnedTimelineHelper {
                 LayoutInflater inflater;
                 View dialogView;
                 AlertDialog alertDialog;
-                dialogBuilder = new AlertDialog.Builder(activity);
+                dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
                 inflater = activity.getLayoutInflater();
                 dialogView = inflater.inflate(R.layout.tags_all, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
@@ -927,7 +927,7 @@ public class PinnedTimelineHelper {
                 LayoutInflater inflater;
                 View dialogView;
                 AlertDialog alertDialog;
-                dialogBuilder = new AlertDialog.Builder(activity);
+                dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
                 inflater = activity.getLayoutInflater();
                 dialogView = inflater.inflate(R.layout.tags_all, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
@@ -956,7 +956,7 @@ public class PinnedTimelineHelper {
                 LayoutInflater inflater;
                 View dialogView;
                 AlertDialog alertDialog;
-                dialogBuilder = new AlertDialog.Builder(activity);
+                dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
                 inflater = activity.getLayoutInflater();
                 dialogView = inflater.inflate(R.layout.tags_name, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
@@ -1144,7 +1144,7 @@ public class PinnedTimelineHelper {
                 }
             });
             changes[0] = true;
-            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
             LayoutInflater inflater = activity.getLayoutInflater();
             View dialogView = inflater.inflate(R.layout.tags_instance, new LinearLayout(activity), false);
             dialogBuilder.setView(dialogView);
@@ -1228,7 +1228,7 @@ public class PinnedTimelineHelper {
         if (remoteInstance == null)
             return;
         String accounts = remoteInstance.host;
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
         LayoutInflater inflater = activity.getLayoutInflater();
         View dialogView = inflater.inflate(R.layout.tags_any, new LinearLayout(activity), false);
         dialogBuilder.setView(dialogView);
diff --git a/app/src/main/res/layout/drawer_reorder.xml b/app/src/main/res/layout/drawer_reorder.xml
index ee7228fd..ef89d84e 100644
--- a/app/src/main/res/layout/drawer_reorder.xml
+++ b/app/src/main/res/layout/drawer_reorder.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?selectableItemBackground">
+    android:background="?colorSurface"
+    android:foregroundTint="?android:colorBackground">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -13,15 +14,16 @@
         android:layout_margin="10dp"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center"
+            tools:src="@drawable/ic_baseline_home_24"
             android:contentDescription="@string/instance_logo"
             android:scaleType="center" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -29,7 +31,7 @@
             android:layout_weight="1" />
 
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/hide"
             android:layout_width="40dp"
             android:layout_height="40dp"
@@ -39,7 +41,7 @@
             android:src="@drawable/ic_baseline_visibility_off_24"
             tools:ignore="RtlHardcoded" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/delete"
             android:layout_width="40dp"
             android:layout_height="40dp"
@@ -50,7 +52,7 @@
             android:visibility="gone"
             tools:ignore="RtlHardcoded" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/handle"
             android:layout_width="40dp"
             android:layout_height="40dp"