diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 9a3d87ac5854..611026d1df38 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -442,9 +442,6 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
                                menuItem.getItemId());
         } else if (itemId == R.id.nav_gallery) {
             startPhotoSearch(menuItem);
-        } else if (itemId == R.id.nav_on_device) {
-            EventBus.getDefault().post(new ChangeMenuEvent());
-            showFiles(true);
         } else if (itemId == R.id.nav_uploads) {
             startActivity(UploadListActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         } else if (itemId == R.id.nav_trashbin) {
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index dcbfde829a8c..48be8848e5ba 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1184,13 +1184,8 @@ protected void onResume() {
     }
 
     private void setDrawerAllFiles() {
-        if (MainApp.isOnlyOnDevice()) {
-            setDrawerMenuItemChecked(R.id.nav_on_device);
-            setupToolbar();
-        } else {
             setDrawerMenuItemChecked(R.id.nav_all_files);
             setupHomeSearchToolbarWithSortAndListButtons();
-        }
     }
 
     public void initSyncBroadcastReceiver() {
diff --git a/app/src/main/res/menu/partial_drawer_entries.xml b/app/src/main/res/menu/partial_drawer_entries.xml
index 246e19c9802f..bfb9b64ee675 100644
--- a/app/src/main/res/menu/partial_drawer_entries.xml
+++ b/app/src/main/res/menu/partial_drawer_entries.xml
@@ -43,21 +43,16 @@
             android:id="@+id/nav_gallery"
             android:icon="@drawable/nav_photos"
             android:title="@string/drawer_item_gallery" />
-        <item
-            android:id="@+id/nav_shared"
-            android:orderInCategory="0"
-            android:icon="@drawable/nav_shared"
-            android:title="@string/drawer_item_shared" />
-        <item
+         <item
             android:id="@+id/nav_groupfolders"
             android:orderInCategory="0"
             android:icon="@drawable/ic_group"
             android:title="@string/drawer_item_groupfolders" />
         <item
-            android:id="@+id/nav_on_device"
-            android:icon="@drawable/nav_on_device"
+            android:id="@+id/nav_shared"
             android:orderInCategory="0"
-            android:title="@string/drawer_item_on_device"/>
+            android:icon="@drawable/nav_shared"
+            android:title="@string/drawer_item_shared" />
         <item
             android:id="@+id/nav_recently_modified"
             android:icon="@drawable/nav_recently"