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 f95db44aea4d..4a54f266ef04 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
@@ -183,6 +183,11 @@ public abstract class DrawerActivity extends ToolbarActivity
     private TextView mQuotaTextPercentage;
     private TextView mQuotaTextLink;
 
+    private LinearLayout sidebarQuotaView;
+    private LinearProgressIndicator sidebarQuotaProgressBar;
+    private TextView sidebarQuotaTextPercentage;
+    private TextView sidebarQuotaTextLink;
+
     /**
      * runnable that will be executed after the drawer has been closed.
      */
@@ -194,6 +199,9 @@ public abstract class DrawerActivity extends ToolbarActivity
     private BottomNavigationView bottomNavigationView;
     private NavigationView drawerNavigationView;
 
+    private View sidebarMenu;
+    private NavigationView sidebarNavigationView;
+
     /**
      * Returns the navigation drawer menu item ID that represents
      * the current activity.
@@ -242,10 +250,18 @@ protected void setupDrawer(int id) {
             mDrawerLayout = findViewById(R.id.drawer_layout);
         }
 
+        if (sidebarMenu == null) {
+            sidebarMenu = findViewById(R.id.sidebar_menu);
+        }
+
         if (drawerNavigationView == null) {
             drawerNavigationView = findViewById(R.id.nav_view);
         }
 
+        if (sidebarMenu != null && sidebarNavigationView == null) {
+            sidebarNavigationView = sidebarMenu.findViewById(R.id.sidebar_view);
+        }
+
         if (drawerNavigationView != null) {
             viewThemeUtils.files.colorNavigationView(drawerNavigationView);
 
@@ -254,16 +270,23 @@ protected void setupDrawer(int id) {
             updateHeader();
 
             setupDrawerMenu(drawerNavigationView);
-            getAndDisplayUserQuota();
             setupQuotaElement();
-            highlightNavigationViewItem(id);
         }
 
-        setupDrawerToggle();
+        if (sidebarNavigationView != null) {
+            viewThemeUtils.files.colorNavigationView(sidebarNavigationView);
+
+            // Setting up drawer header
+            mNavigationViewHeader = sidebarNavigationView.getHeaderView(0);
+            updateHeader();
 
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            setupSidebarMenu(sidebarNavigationView);
+            setupSidebarQuotaElement();
         }
+        getAndDisplayUserQuota();
+        highlightNavigationViewItem(id);
+
+        setupDrawerToggle();
 
         if (bottomNavigationView == null) {
             bottomNavigationView = findViewById(R.id.bottom_navigation);
@@ -275,6 +298,12 @@ protected void setupDrawer(int id) {
             handleBottomNavigationViewClicks();
             highlightNavigationViewItem(id);
         }
+
+        if (!isDrawerLayout() && mMenuButton != null) {
+            mMenuButton.setVisibility(View.GONE);
+        }
+
+        hideOrShowSidebar();
     }
 
     /**
@@ -306,6 +335,15 @@ public void highlightNavigationViewItem(int menuItemId) {
             }
         }
 
+        if (sidebarNavigationView != null) {
+            NavigationViewExtensionsKt.unsetAllNavigationItems(sidebarNavigationView);
+            MenuItem menuItem = sidebarNavigationView.getMenu().findItem(menuItemId);
+
+            if (menuItem != null && !menuItem.isChecked()) {
+                menuItem.setChecked(true);
+            }
+        }
+
         if (bottomNavigationView != null) {
             NavigationViewExtensionsKt.unsetAllNavigationItems(bottomNavigationView);
             MenuItem menuItem = bottomNavigationView.getMenu().findItem(menuItemId);
@@ -408,6 +446,16 @@ private void setupQuotaElement() {
         viewThemeUtils.platform.colorViewBackground(mQuotaView);
     }
 
+    private void setupSidebarQuotaElement() {
+        sidebarQuotaView = (LinearLayout) findSidebarQuotaViewById(R.id.sidebar_quota);
+        sidebarQuotaProgressBar = (LinearProgressIndicator) findSidebarQuotaViewById(R.id.sidebar_quota_ProgressBar);
+        sidebarQuotaTextPercentage = (TextView) findSidebarQuotaViewById(R.id.sidebar_quota_percentage);
+        sidebarQuotaTextLink = (TextView) findSidebarQuotaViewById(R.id.sidebar_quota_link);
+        viewThemeUtils.material.colorProgressBar(sidebarQuotaProgressBar, ColorRole.PRIMARY);
+        sidebarQuotaProgressBar.setTrackStopIndicatorSize(0);
+        viewThemeUtils.platform.colorViewBackground(sidebarQuotaView);
+    }
+
     public void updateHeader() {
         final var account = getAccount();
         boolean isClientBranded = getResources().getBoolean(R.bool.is_branded_client);
@@ -582,6 +630,17 @@ private void setupDrawerMenu(NavigationView navigationView) {
         filterDrawerMenu(navigationView.getMenu(), account);
     }
 
+    private void setupSidebarMenu(NavigationView navigationView) {
+        navigationView.setNavigationItemSelectedListener(
+            menuItem -> {
+                onNavigationItemClicked(menuItem);
+                return true;
+        });
+
+        User account = accountManager.getUser();
+        filterDrawerMenu(navigationView.getMenu(), account);
+    }
+
     private void filterDrawerMenu(final Menu menu, @NonNull final User user) {
         final var optionalCapability = getCapabilities();
         if (optionalCapability.isPresent()) {
@@ -603,6 +662,10 @@ private void filterDrawerMenu(final Menu menu, @NonNull final User user) {
     private void onNavigationItemClicked(final MenuItem menuItem) {
         int itemId = menuItem.getItemId();
 
+        if (itemId == getMenuItemId()) {
+            return;
+        }
+
         if (itemId == R.id.nav_all_files || itemId == R.id.nav_personal_files) {
             closeDrawer();
             DrawerActivityExtensionsKt.navigateToAllFiles(this,itemId == R.id.nav_personal_files);
@@ -889,6 +952,10 @@ protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
         if (mDrawerToggle != null) {
             mDrawerToggle.setDrawerIndicatorEnabled(chosenFile != null && isRoot(chosenFile));
         }
+
+        if (!isDrawerLayout() && getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(!isRoot(chosenFile));
+        }
     }
 
     /**
@@ -898,9 +965,19 @@ protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
      */
     private void showQuota(boolean showQuota) {
         if (showQuota) {
-            mQuotaView.setVisibility(View.VISIBLE);
+            if (mQuotaView != null) {
+                mQuotaView.setVisibility(View.VISIBLE);
+            }
+            if (sidebarQuotaView != null) {
+                sidebarQuotaView.setVisibility(View.VISIBLE);
+            }
         } else {
-            mQuotaView.setVisibility(View.GONE);
+            if (mQuotaView != null) {
+                mQuotaView.setVisibility(View.GONE);
+            }
+            if (sidebarQuotaView != null) {
+                sidebarQuotaView.setVisibility(View.GONE);
+            }
         }
     }
 
@@ -914,25 +991,62 @@ private void showQuota(boolean showQuota) {
      */
     private void setQuotaInformation(long usedSpace, long totalSpace, int relative, long quotaValue) {
         if (GetUserInfoRemoteOperation.SPACE_UNLIMITED == quotaValue) {
-            mQuotaTextPercentage.setText(String.format(
-                getString(R.string.drawer_quota_unlimited),
-                DisplayUtils.bytesToHumanReadable(usedSpace)));
+            if (mQuotaTextPercentage != null) {
+                mQuotaTextPercentage.setText(String.format(
+                    getString(R.string.drawer_quota_unlimited),
+                    DisplayUtils.bytesToHumanReadable(usedSpace)));
+            }
+
+            if (sidebarQuotaTextPercentage != null) {
+                sidebarQuotaTextPercentage.setText(String.format(
+                    getString(R.string.drawer_quota_unlimited),
+                    DisplayUtils.bytesToHumanReadable(usedSpace)));
+            }
         } else {
-            mQuotaTextPercentage.setText(String.format(
-                getString(R.string.drawer_quota),
-                DisplayUtils.bytesToHumanReadable(usedSpace),
-                DisplayUtils.bytesToHumanReadable(totalSpace)));
+            if (mQuotaTextPercentage != null) {
+                mQuotaTextPercentage.setText(String.format(
+                    getString(R.string.drawer_quota),
+                    DisplayUtils.bytesToHumanReadable(usedSpace),
+                    DisplayUtils.bytesToHumanReadable(totalSpace)));
+            }
+
+            if (sidebarQuotaTextPercentage != null) {
+                sidebarQuotaTextPercentage.setText(String.format(
+                    getString(R.string.drawer_quota),
+                    DisplayUtils.bytesToHumanReadable(usedSpace),
+                    DisplayUtils.bytesToHumanReadable(totalSpace)));
+            }
+        }
+
+        if (mQuotaProgressBar != null) {
+            mQuotaProgressBar.setProgress(relative);
         }
 
-        mQuotaProgressBar.setProgress(relative);
+        if (sidebarQuotaProgressBar != null) {
+            sidebarQuotaProgressBar.setProgress(relative);
+        }
 
         if (relative < RELATIVE_THRESHOLD_WARNING) {
-            viewThemeUtils.material.colorProgressBar(mQuotaProgressBar, ColorRole.PRIMARY);
+            if (mQuotaProgressBar != null) {
+                viewThemeUtils.material.colorProgressBar(mQuotaProgressBar, ColorRole.PRIMARY);
+            }
+            if (sidebarQuotaProgressBar != null) {
+                viewThemeUtils.material.colorProgressBar(sidebarQuotaProgressBar, ColorRole.PRIMARY);
+            }
         } else {
-            viewThemeUtils.material.colorProgressBar(
-                mQuotaProgressBar,
-                getResources().getColor(R.color.infolevel_warning, null)
-                                                    );
+            if (mQuotaProgressBar != null) {
+                viewThemeUtils.material.colorProgressBar(
+                    mQuotaProgressBar,
+                    getResources().getColor(R.color.infolevel_warning, null)
+                                                        );
+            }
+
+            if (sidebarQuotaProgressBar != null) {
+                viewThemeUtils.material.colorProgressBar(
+                    sidebarQuotaProgressBar,
+                    getResources().getColor(R.color.infolevel_warning, null)
+                                                        );
+            }
         }
 
         updateQuotaLink();
@@ -940,15 +1054,15 @@ private void setQuotaInformation(long usedSpace, long totalSpace, int relative,
     }
 
     private void updateQuotaLink() {
-        if (mQuotaTextLink != null) {
-            if (MDMConfig.INSTANCE.externalSiteSupport(this)) {
-                List<ExternalLink> quotas = externalLinksProvider.getExternalLink(ExternalLinkType.QUOTA);
+        if (MDMConfig.INSTANCE.externalSiteSupport(this)) {
+            List<ExternalLink> quotas = externalLinksProvider.getExternalLink(ExternalLinkType.QUOTA);
 
-                float density = getResources().getDisplayMetrics().density;
-                final int size = Math.round(24 * density);
+            float density = getResources().getDisplayMetrics().density;
+            final int size = Math.round(24 * density);
 
-                if (!quotas.isEmpty()) {
-                    final ExternalLink firstQuota = quotas.get(0);
+            if (!quotas.isEmpty()) {
+                final ExternalLink firstQuota = quotas.get(0);
+                if (mQuotaTextLink != null) {
                     mQuotaTextLink.setText(firstQuota.getName());
                     mQuotaTextLink.setClickable(true);
                     mQuotaTextLink.setVisibility(View.VISIBLE);
@@ -960,18 +1074,51 @@ private void updateQuotaLink() {
                         startActivity(externalWebViewIntent);
                     });
 
+                    Target<Drawable> quotaTarget = createQuotaDrawableTarget(size, mQuotaTextLink);					
+                    GlideHelper.INSTANCE.loadIntoTarget(this,
+                                                        accountManager.getCurrentOwnCloudAccount(),
+                                                        firstQuota.getIconUrl(),
+                                                        quotaTarget,
+                                                        R.drawable.ic_link);
+                }
+                if (sidebarQuotaTextLink != null) {
+                    sidebarQuotaTextLink.setText(firstQuota.getName());
+                    sidebarQuotaTextLink.setClickable(true);
+                    sidebarQuotaTextLink.setVisibility(View.VISIBLE);
+                    sidebarQuotaTextLink.setOnClickListener(v -> {
+                        Intent externalWebViewIntent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
+                        externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, firstQuota.getName());
+                        externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_URL, firstQuota.getUrl());
+                        externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, true);
+                        startActivity(externalWebViewIntent);
+                    });
+					
+
                     Target<Drawable> quotaTarget = createQuotaDrawableTarget(size, mQuotaTextLink);
                     GlideHelper.INSTANCE.loadIntoTarget(this,
                                                         accountManager.getCurrentOwnCloudAccount(),
                                                         firstQuota.getIconUrl(),
                                                         quotaTarget,
                                                         R.drawable.ic_link);
-                } else {
-                    mQuotaTextLink.setVisibility(View.GONE);
                 }
             } else {
+                if (mQuotaTextLink != null) {
+                    mQuotaTextLink.setVisibility(View.GONE);
+                }
+
+                if (sidebarQuotaTextLink != null) {
+                    sidebarQuotaTextLink.setVisibility(View.GONE);
+                }
+
+            }
+        } else {
+            if (mQuotaTextLink != null) {
                 mQuotaTextLink.setVisibility(View.GONE);
             }
+
+            if (sidebarQuotaTextLink != null) {
+                sidebarQuotaTextLink.setVisibility(View.GONE);
+            }
         }
     }
 
@@ -1178,6 +1325,29 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
         if (mDrawerToggle != null) {
             mDrawerToggle.onConfigurationChanged(newConfig);
         }
+
+        hideOrShowSidebar();
+    }
+
+    private void hideOrShowSidebar() {
+        if (isDrawerLayout()) {
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            }
+
+            if (sidebarMenu != null) {
+                sidebarMenu.setVisibility(View.GONE);
+            }
+        } else {
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+            }
+
+            if (sidebarMenu != null) {
+                sidebarMenu.setVisibility(View.VISIBLE);
+            }
+            closeDrawer();
+        }
     }
 
     public void addOnBackPressedCallback() {
@@ -1245,6 +1415,16 @@ private View findQuotaViewById(int id) {
         }
     }
 
+    private View findSidebarQuotaViewById(int id) {
+        View v = ((NavigationView) findViewById(R.id.sidebar_view)).getHeaderView(0).findViewById(id);
+
+        if (v != null) {
+            return v;
+        } else {
+            return findViewById(id);
+        }
+    }
+
     /**
      * restart helper method which is called after a changing the current account.
      */
@@ -1486,4 +1666,8 @@ public boolean isToolbarStyleSearch() {
             menuItemId == R.id.nav_all_files ||
             menuItemId == R.id.nav_personal_files;
     }
+
+    protected boolean isDrawerLayout() {
+        return getResources().getBoolean(R.bool.is_support_drawer);
+    }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
index 05178e85acaa..4ab425dbcfaf 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -394,6 +394,16 @@ class FileDisplayActivity :
                 }
             }
         }
+
+        if (isDrawerLayout) {
+            mMenuButton.visibility = View.VISIBLE
+        } else {
+            if (isRoot(currentDir)) {
+                mMenuButton.visibility = View.GONE
+            } else {
+                mMenuButton.visibility = View.VISIBLE
+            }
+        }
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -1059,6 +1069,9 @@ class FileDisplayActivity :
     private fun exitSelectionMode() {
         val ocFileListFragment = this.listOfFilesFragment
         ocFileListFragment?.exitSelectionMode()
+
+        // Update toolbar with current directory
+        updateActionBarTitleAndHomeButton(currentDir)
     }
 
     private fun requestUploadOfFilesFromFileSystem(data: Intent, resultCode: Int) {
@@ -1981,6 +1994,16 @@ class FileDisplayActivity :
             chosenFile = file // if no file is passed, current file decides
         }
         super.updateActionBarTitleAndHomeButton(chosenFile)
+
+        if (isDrawerLayout) {
+            mMenuButton.visibility = View.VISIBLE
+        } else {
+            if (isRoot(currentDir)) {
+                mMenuButton.visibility = View.GONE
+            } else {
+                mMenuButton.visibility = View.VISIBLE
+            }
+        }
     }
 
     override fun isDrawerIndicatorAvailable(): Boolean = isRoot(getCurrentDir())
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index f5cda35ea67e..c06524adb1c9 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -8,35 +8,61 @@
 -->
 <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true"
-    android:focusable="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:focusable="true">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                layout="@layout/sidebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
 
-        <include layout="@layout/toolbar_standard" />
+        </FrameLayout>
 
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/compose_view"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_weight="1"/>
-
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bottom_navigation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:labelVisibilityMode="labeled"
-            app:menu="@menu/bottom_navigation_menu"
-            app:layout_behavior="com.nextcloud.ui.behavior.OnScrollBehavior" />
-
-    </LinearLayout>
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include layout="@layout/toolbar_standard" />
+
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/compose_view"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottom_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                app:labelVisibilityMode="labeled"
+                app:menu="@menu/bottom_navigation_menu"
+                app:layout_behavior="com.nextcloud.ui.behavior.OnScrollBehavior" />
+
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/activity_navigator.xml b/app/src/main/res/layout/activity_navigator.xml
index 3654aeaecbd2..ecf69249d5e7 100644
--- a/app/src/main/res/layout/activity_navigator.xml
+++ b/app/src/main/res/layout/activity_navigator.xml
@@ -10,21 +10,48 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include
-            android:id="@+id/appbar"
-            layout="@layout/toolbar_standard" />
+        <FrameLayout
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/fragment_container_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+            <include
+                layout="@layout/sidebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        </FrameLayout>
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                android:id="@+id/appbar"
+                layout="@layout/toolbar_standard" />
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/fragment_container_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/contacts_preference.xml b/app/src/main/res/layout/contacts_preference.xml
index bce8b5ae69a4..9d14cced471f 100644
--- a/app/src/main/res/layout/contacts_preference.xml
+++ b/app/src/main/res/layout/contacts_preference.xml
@@ -7,27 +7,55 @@
   ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- The main content view -->
-    <RelativeLayout
-        android:id="@+id/contacts_layout"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/toolbar_standard" />
+        android:layout_height="match_parent">
 
         <FrameLayout
-            android:id="@+id/frame_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/appbar">
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                layout="@layout/sidebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
 
         </FrameLayout>
-    </RelativeLayout>
+
+        <!-- The main content view -->
+        <RelativeLayout
+            android:id="@+id/contacts_layout"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include layout="@layout/toolbar_standard" />
+
+            <FrameLayout
+                android:id="@+id/frame_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/appbar">
+
+            </FrameLayout>
+        </RelativeLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/files.xml b/app/src/main/res/layout/files.xml
index 98af6d19fb14..884bed514235 100644
--- a/app/src/main/res/layout/files.xml
+++ b/app/src/main/res/layout/files.xml
@@ -17,57 +17,83 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include
-            android:id="@+id/appbar"
-            layout="@layout/toolbar_standard" />
+        <FrameLayout
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                layout="@layout/sidebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
+
+        </FrameLayout>
 
-        <!-- The main content view -->
-        <LinearLayout
-            android:id="@+id/root_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/bg_default"
-            android:baselineAligned="false"
-            android:contentDescription="@string/list_layout"
-            android:orientation="horizontal"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <FrameLayout
-                android:id="@+id/left_fragment_container"
-                android:layout_width="0dp"
+            <include
+                android:id="@+id/appbar"
+                layout="@layout/toolbar_standard" />
+
+            <!-- The main content view -->
+            <LinearLayout
+                android:id="@+id/root_layout"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+                android:background="@color/bg_default"
+                android:baselineAligned="false"
+                android:contentDescription="@string/list_layout"
+                android:orientation="horizontal"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        </LinearLayout>
+                <FrameLayout
+                    android:id="@+id/left_fragment_container"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bottom_navigation"
-            app:labelVisibilityMode="labeled"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:menu="@menu/bottom_navigation_menu"
-            app:layout_behavior="com.nextcloud.ui.behavior.OnScrollBehavior" />
+            </LinearLayout>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_main"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_marginEnd="@dimen/standard_margin"
-            android:layout_marginBottom="@dimen/floating_action_button_bottom_margin"
-            android:contentDescription="@string/fab_label"
-            app:srcCompat="@drawable/ic_plus"
-            app:layout_behavior="com.nextcloud.ui.behavior.OnScrollBehavior"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottom_navigation"
+                app:labelVisibilityMode="labeled"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                app:menu="@menu/bottom_navigation_menu"
+                app:layout_behavior="com.nextcloud.ui.behavior.OnScrollBehavior" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/fab_main"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_marginEnd="@dimen/standard_margin"
+                android:layout_marginBottom="@dimen/floating_action_button_bottom_margin"
+                android:contentDescription="@string/fab_label"
+                app:srcCompat="@drawable/ic_plus"
+                app:layout_behavior="com.nextcloud.ui.behavior.OnScrollBehavior"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/sidebar.xml b/app/src/main/res/layout/sidebar.xml
new file mode 100644
index 000000000000..2c4ca2ffd95f
--- /dev/null
+++ b/app/src/main/res/layout/sidebar.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<com.google.android.material.navigation.NavigationView
+    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"
+    android:id="@+id/sidebar_view"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="start"
+    android:layout_weight="1"
+    android:background="@color/appbar"
+    android:theme="@style/NavigationView_ItemTextAppearance"
+    app:headerLayout="@layout/drawer_header"
+    app:itemTextColor="@color/drawer_text_color"
+    app:menu="@menu/partial_drawer_entries">
+
+    <LinearLayout
+        android:id="@+id/sidebar_quota"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:clickable="false"
+        android:orientation="vertical"
+        android:background="@color/appbar"
+        android:paddingLeft="@dimen/drawer_content_horizontal_padding"
+        android:paddingTop="@dimen/standard_padding"
+        android:paddingRight="@dimen/drawer_content_horizontal_padding"
+        android:paddingBottom="@dimen/standard_padding"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/sidebar_quota_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/alternate_half_padding" />
+
+        <com.google.android.material.progressindicator.LinearProgressIndicator
+            android:id="@+id/sidebar_quota_ProgressBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="false"
+            android:indeterminateOnly="false"
+            android:text="@string/drawer_quota"
+            app:trackCornerRadius="5dp"
+            app:trackThickness="5dp"
+            tools:progress="50" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/sidebar_quota_percentage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/alternate_half_padding"
+            android:fontFamily="sans-serif-medium"
+            android:text="@string/drawer_quota"
+            android:textColor="@color/drawer_text_color" />
+
+    </LinearLayout>
+
+</com.google.android.material.navigation.NavigationView>
diff --git a/app/src/main/res/layout/synced_folders_layout.xml b/app/src/main/res/layout/synced_folders_layout.xml
index 7101594d388e..92889a1eea7c 100644
--- a/app/src/main/res/layout/synced_folders_layout.xml
+++ b/app/src/main/res/layout/synced_folders_layout.xml
@@ -15,71 +15,97 @@
     android:layout_height="match_parent"
     tools:openDrawer="start">
 
-    <!-- Main content -->
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <!-- Toolbar -->
-        <include layout="@layout/toolbar_standard" />
-
-        <LinearLayout
-            android:id="@+id/ListLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        <FrameLayout
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <include
-                android:id="@+id/storage_permission_warning_banner"
-                layout="@layout/storage_permission_warning_banner"
+                layout="@layout/sidebar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:layout_marginTop="@dimen/standard_margin"
-                android:layout_marginHorizontal="@dimen/standard_margin"
-                tools:visibility="visible" />
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
+
+        </FrameLayout>
+
+        <!-- Main content -->
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <FrameLayout
+            <!-- Toolbar -->
+            <include layout="@layout/toolbar_standard" />
+
+            <LinearLayout
+                android:id="@+id/ListLayout"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@android:id/list"
+                <include
+                    android:id="@+id/storage_permission_warning_banner"
+                    layout="@layout/storage_permission_warning_banner"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/synced_folders_recycler_view_layout_margin"
-                    android:layout_marginLeft="@dimen/synced_folders_recycler_view_layout_margin"
-                    android:layout_marginRight="@dimen/synced_folders_recycler_view_layout_margin"
-                    android:clipToPadding="false"
-                    android:scrollbarStyle="outsideOverlay"
-                    android:scrollbars="vertical"
-                    android:visibility="visible" />
-
-                <LinearLayout
-                    android:id="@+id/loading_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:layout_marginTop="@dimen/standard_margin"
+                    android:layout_marginHorizontal="@dimen/standard_margin"
+                    tools:visibility="visible" />
+
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:visibility="gone">
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
 
-                    <include layout="@layout/synced_folders_list_item_shimmer" />
-                    <include layout="@layout/synced_folders_list_item_shimmer" />
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@android:id/list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginBottom="@dimen/synced_folders_recycler_view_layout_margin"
+                        android:layout_marginLeft="@dimen/synced_folders_recycler_view_layout_margin"
+                        android:layout_marginRight="@dimen/synced_folders_recycler_view_layout_margin"
+                        android:clipToPadding="false"
+                        android:scrollbarStyle="outsideOverlay"
+                        android:scrollbars="vertical"
+                        android:visibility="visible" />
 
-                </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/loading_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:visibility="gone">
 
-                <include
-                    android:id="@+id/emptyList"
-                    layout="@layout/empty_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                        <include layout="@layout/synced_folders_list_item_shimmer" />
+                        <include layout="@layout/synced_folders_list_item_shimmer" />
+
+                    </LinearLayout>
+
+                    <include
+                        android:id="@+id/emptyList"
+                        layout="@layout/empty_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
 
-            </FrameLayout>
+                </FrameLayout>
 
-        </LinearLayout>
+            </LinearLayout>
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/toolbar_standard.xml b/app/src/main/res/layout/toolbar_standard.xml
index af71bd5843e2..3452301acf0d 100644
--- a/app/src/main/res/layout/toolbar_standard.xml
+++ b/app/src/main/res/layout/toolbar_standard.xml
@@ -169,7 +169,6 @@
                 android:layout_width="@dimen/minimum_size_for_touchable_area"
                 android:layout_height="@dimen/minimum_size_for_touchable_area"
                 android:layout_marginStart="@dimen/standard_quarter_margin"
-                android:layout_marginEnd="@dimen/standard_half_margin"
                 android:contentDescription="@string/drawer_open"
                 app:cornerRadius="@dimen/button_corner_radius"
                 app:icon="@drawable/ic_menu"
@@ -180,6 +179,7 @@
                 android:id="@+id/home_search_container"
                 android:layout_width="0dp"
                 android:layout_height="50dp"
+                android:layout_marginStart="@dimen/standard_half_margin"
                 android:layout_marginEnd="@dimen/standard_half_margin"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/trashbin_activity.xml b/app/src/main/res/layout/trashbin_activity.xml
index 1c8fd6e58391..b5d4ba010252 100644
--- a/app/src/main/res/layout/trashbin_activity.xml
+++ b/app/src/main/res/layout/trashbin_activity.xml
@@ -14,55 +14,80 @@
     android:clickable="true"
     android:focusable="true">
 
-    <!-- The main content view -->
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include
-            android:id="@+id/toolbar_standard_include"
-            layout="@layout/toolbar_standard" />
+        <FrameLayout
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/list_fragment_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar_standard_include">
+            <include
+                layout="@layout/sidebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
 
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                android:id="@+id/swipe_containing_list"
+        </FrameLayout>
+
+        <!-- The main content view -->
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                android:id="@+id/toolbar_standard_include"
+                layout="@layout/toolbar_standard" />
+
+            <androidx.coordinatorlayout.widget.CoordinatorLayout
+                android:id="@+id/list_fragment_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:footerDividersEnabled="false"
-                android:visibility="visible"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+                android:layout_below="@id/toolbar_standard_include">
 
-                <com.owncloud.android.ui.EmptyRecyclerView
-                    android:id="@android:id/list"
+                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                    android:id="@+id/swipe_containing_list"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                    android:layout_height="match_parent"
+                    android:footerDividersEnabled="false"
+                    android:visibility="visible"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout
-                android:id="@+id/loading_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
+                    <com.owncloud.android.ui.EmptyRecyclerView
+                        android:id="@android:id/list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-                <include layout="@layout/trashbin_item_shimmer" />
-                <include layout="@layout/trashbin_item_shimmer" />
-                <include layout="@layout/trashbin_item_shimmer" />
+                <LinearLayout
+                    android:id="@+id/loading_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
-            </LinearLayout>
+                    <include layout="@layout/trashbin_item_shimmer" />
+                    <include layout="@layout/trashbin_item_shimmer" />
+                    <include layout="@layout/trashbin_item_shimmer" />
 
-            <include
-                android:id="@+id/empty_list"
-                layout="@layout/empty_list" />
+                </LinearLayout>
+
+                <include
+                    android:id="@+id/empty_list"
+                    layout="@layout/empty_list" />
 
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+            </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    </RelativeLayout>
+        </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/upload_list_layout.xml b/app/src/main/res/layout/upload_list_layout.xml
index 8dfbe1fb69d4..b4224c51b4d4 100755
--- a/app/src/main/res/layout/upload_list_layout.xml
+++ b/app/src/main/res/layout/upload_list_layout.xml
@@ -8,47 +8,75 @@
   ~ SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
 -->
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true"
     android:focusable="true">
 
-    <!-- The main content view -->
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/toolbar_standard" />
+        android:layout_height="match_parent">
 
         <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/appbar">
+            android:id="@+id/sidebar_menu"
+            android:layout_width="@dimen/drawer_width"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                layout="@layout/sidebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="start" />
+
+        </FrameLayout>
+
+        <!-- The main content view -->
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/sidebar_menu"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                android:id="@+id/swipe_containing_list"
+            <include layout="@layout/toolbar_standard" />
+
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:footerDividersEnabled="false"
-                android:visibility="visible">
+                android:layout_below="@id/appbar">
 
-                <com.owncloud.android.ui.EmptyRecyclerView
-                    android:id="@android:id/list"
-                    android:padding="@dimen/standard_half_padding"
+                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                    android:id="@+id/swipe_containing_list"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:footerDividersEnabled="false"
+                    android:visibility="visible">
 
-            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                    <com.owncloud.android.ui.EmptyRecyclerView
+                        android:id="@android:id/list"
+                        android:padding="@dimen/standard_half_padding"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
 
-            <include
-                android:id="@+id/empty_list"
-                layout="@layout/empty_list" />
+                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        </FrameLayout>
+                <include
+                    android:id="@+id/empty_list"
+                    layout="@layout/empty_list" />
+
+            </FrameLayout>
+
+        </RelativeLayout>
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/values-sw600dp/bool.xml b/app/src/main/res/values-sw600dp/bool.xml
new file mode 100644
index 000000000000..2e4fa466b2a2
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/bool.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<resources>
+    <bool name="is_support_drawer">false</bool>
+</resources>
diff --git a/app/src/main/res/values-sw600dp/dims.xml b/app/src/main/res/values-sw600dp/dims.xml
index 7436d593a3c5..1abd0e1019f7 100644
--- a/app/src/main/res/values-sw600dp/dims.xml
+++ b/app/src/main/res/values-sw600dp/dims.xml
@@ -8,5 +8,6 @@
 -->
 <resources>
   <integer name="media_grid_width">6</integer>
-    <dimen name="file_icon_size_grid">512dp</dimen>
+  <dimen name="file_icon_size_grid">512dp</dimen>
+  <dimen name="drawer_width">300dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-w600dp/bool.xml b/app/src/main/res/values-w600dp/bool.xml
new file mode 100644
index 000000000000..2e4fa466b2a2
--- /dev/null
+++ b/app/src/main/res/values-w600dp/bool.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<resources>
+    <bool name="is_support_drawer">false</bool>
+</resources>
diff --git a/app/src/main/res/values-w600dp/dims.xml b/app/src/main/res/values-w600dp/dims.xml
new file mode 100644
index 000000000000..8883840772a3
--- /dev/null
+++ b/app/src/main/res/values-w600dp/dims.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<resources>
+  <dimen name="drawer_width">300dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index ef48d5a0e566..31cb2b2c1978 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -8,4 +8,5 @@
 -->
 <resources>
     <bool name="show_push_warning">true</bool>
+    <bool name="is_support_drawer">true</bool>
 </resources>