diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
index 4e7940fce..cd014af2f 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
@@ -8,12 +8,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
-import androidx.cursoradapter.widget.CursorAdapter;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
@@ -26,6 +20,14 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cursoradapter.widget.CursorAdapter;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.InstalledAppProvider;
 import org.fdroid.fdroid.data.Schema.InstalledAppTable;
@@ -220,7 +222,7 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall
                     resource = R.drawable.ic_check_circle_white;
                     colour = getResources().getColor(R.color.swap_bright_blue);
                 } else {
-                    resource = R.drawable.ic_add_circle_outline_white;
+                    resource = R.drawable.ic_add_circle_outline;
                     colour = 0xFFD0D0D4;
                 }
                 imageView.setImageDrawable(getResources().getDrawable(resource));
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
index 7338a624d..ddf61b1a1 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
@@ -13,20 +13,19 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.TypedValue;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
 import androidx.preference.CheckBoxPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
 
-import android.text.TextUtils;
-import android.util.TypedValue;
-import info.guardianproject.panic.Panic;
-import info.guardianproject.panic.PanicResponder;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.installer.PrivilegedInstaller;
@@ -34,6 +33,9 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller;
 import java.util.ArrayList;
 import java.util.Set;
 
+import info.guardianproject.panic.Panic;
+import info.guardianproject.panic.PanicResponder;
+
 public class PanicPreferencesFragment extends PreferenceFragmentCompat
         implements SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -130,9 +132,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
                 }
             }
         } else {
-            Preference preference = new Preference(getActivity());
+            Preference preference = new Preference(requireActivity());
             preference.setIntent(intent);
-            Drawable icon = getResources().getDrawable(R.drawable.ic_add_circle_outline_white);
+            Drawable icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add_circle_outline);
             icon.setColorFilter(new LightingColorFilter(0, getResources().getColor(R.color.swap_light_grey_icon)));
             preference.setSingleLineTitle(true);
             preference.setTitle(R.string.panic_add_apps_to_uninstall);
diff --git a/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png
deleted file mode 100644
index dfb1269b5..000000000
Binary files a/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png
deleted file mode 100644
index 2bfb3f60b..000000000
Binary files a/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png
deleted file mode 100644
index 972d0f0aa..000000000
Binary files a/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png
deleted file mode 100644
index a676ca880..000000000
Binary files a/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png
deleted file mode 100644
index b03ff5285..000000000
Binary files a/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable/ic_add_circle_outline.xml b/app/src/full/res/drawable/ic_add_circle_outline.xml
new file mode 100644
index 000000000..69f1469be
--- /dev/null
+++ b/app/src/full/res/drawable/ic_add_circle_outline.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/full/res/layout-v11/select_local_apps_list_item.xml b/app/src/full/res/layout-v11/select_local_apps_list_item.xml
index 40884a6cf..c3eac8226 100644
--- a/app/src/full/res/layout-v11/select_local_apps_list_item.xml
+++ b/app/src/full/res/layout-v11/select_local_apps_list_item.xml
@@ -43,7 +43,7 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         tools:suppress="InconsistentLayout"
-        android:src="@drawable/ic_add_circle_outline_white" />
+        android:src="@drawable/ic_add_circle_outline" />
 
     <TwoLineListItem
         android:layout_toRightOf="@android:id/icon"
diff --git a/app/src/full/res/layout-v17/select_local_apps_list_item.xml b/app/src/full/res/layout-v17/select_local_apps_list_item.xml
index 815f72b40..47c96f43f 100644
--- a/app/src/full/res/layout-v17/select_local_apps_list_item.xml
+++ b/app/src/full/res/layout-v17/select_local_apps_list_item.xml
@@ -39,7 +39,7 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         tools:suppress="InconsistentLayout"
-        android:src="@drawable/ic_add_circle_outline_white" />
+        android:src="@drawable/ic_add_circle_outline" />
 
     <TwoLineListItem
         android:layout_toEndOf="@android:id/icon"