diff --git a/app/src/basic/res/menu/main_activity_screens.xml b/app/src/basic/res/menu/main_activity_screens.xml
deleted file mode 100644
index 7b7a2ebcf..000000000
--- a/app/src/basic/res/menu/main_activity_screens.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools"
-      tools:ignore="MenuTitle">
-    <!-- android:title and android:icon are set dynamically in MainActivity -->
-    <item
-            app:showAsAction="ifRoom|withText"
-            android:id="@+id/latest"/>
-    <item
-            app:showAsAction="ifRoom|withText"
-            android:id="@+id/updates"/>
-    <item
-            app:showAsAction="ifRoom|withText"
-            android:id="@+id/settings"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/full/res/menu/main_activity_screens.xml b/app/src/full/res/menu/main_activity_screens.xml
index 1669f8ab0..ee5dcefb2 100644
--- a/app/src/full/res/menu/main_activity_screens.xml
+++ b/app/src/full/res/menu/main_activity_screens.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MenuTitle">
-    <!-- android:title and android:icon are set dynamically in MainActivity -->
     <item
         android:id="@+id/latest"
         android:enabled="true"
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 3de84d1d7..f8cad6676 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity {
         bottomNavigation.setOnNavigationItemSelectedListener(item -> {
             pager.scrollToPosition(item.getOrder());
 
-            if (item.getItemId() == 2) {
+            if (item.getItemId() == R.id.nearby) {
                 NearbyViewBinder.updateUsbOtg(MainActivity.this);
             }
 
diff --git a/app/src/main/res/menu/main_activity_screens.xml b/app/src/main/res/menu/main_activity_screens.xml
index 9d7fcb3f2..3e8dcd708 100644
--- a/app/src/main/res/menu/main_activity_screens.xml
+++ b/app/src/main/res/menu/main_activity_screens.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MenuTitle">
-    <!-- android:title and android:icon are set dynamically in MainActivity -->
     <item
         android:id="@+id/latest"
         android:enabled="true"