diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index 00ef2c20b..64f210bad 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -44,7 +44,6 @@ import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.zxing.integration.android.IntentIntegrator;
@@ -273,7 +272,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         CharSequence title = getString(titleResId);
         next.setTitle(title);
         next.setTitleCondensed(title);
-        MenuItemCompat.setShowAsAction(next, MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        next.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
@@ -302,8 +301,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         SearchView searchView = new SearchView(this);
 
         MenuItem searchMenuItem = menu.findItem(R.id.action_search);
-        MenuItemCompat.setActionView(searchMenuItem, searchView);
-        MenuItemCompat.setShowAsAction(searchMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        searchMenuItem.setActionView(searchView);
+        searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
 
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
index 6c09008b2..46655d9de 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.MenuItemCompat;
+import androidx.core.content.ContextCompat;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
@@ -113,7 +113,7 @@ public class SelectInstalledAppsActivity extends AppCompatActivity implements Lo
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuItem menuItem = menu.add(R.string.menu_select_for_wipe);
-        MenuItemCompat.setShowAsAction(menuItem, MenuItem.SHOW_AS_ACTION_ALWAYS);
+        menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         checkId = menuItem.getItemId();
         menuItem.setIcon(R.drawable.check);
         return true;