diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index eb593f9e3e..17455304ab 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -69,6 +69,7 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:cardCornerRadius="12dp"
                 android:layout_margin="@dimen/material_generic"
                 app:cardElevation="@dimen/material_generic_card_elevation"
                 >
@@ -199,6 +200,7 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:cardCornerRadius="12dp"
                 android:layout_margin="@dimen/material_generic"
                 app:cardElevation="@dimen/material_generic_card_elevation"
                 >
@@ -497,6 +499,7 @@
             <!-- Support Development -->
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
+                app:cardCornerRadius="12dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/material_generic"
                 app:cardElevation="@dimen/material_generic_card_elevation"
@@ -817,6 +820,7 @@
             <!-- Translators -->
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
+                app:cardCornerRadius="12dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/material_generic"
                 app:cardElevation="@dimen/material_generic_card_elevation"
@@ -1307,6 +1311,7 @@
             <!-- Contributors -->
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
+                app:cardCornerRadius="12dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/material_generic"
                 app:cardElevation="@dimen/material_generic_card_elevation"
diff --git a/app/src/main/res/layout/fragment_ftp.xml b/app/src/main/res/layout/fragment_ftp.xml
index 57bcbcce38..bd119922e4 100644
--- a/app/src/main/res/layout/fragment_ftp.xml
+++ b/app/src/main/res/layout/fragment_ftp.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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/ftpserver_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/material_generic"
-    android:orientation="vertical"
     android:descendantFocusability="afterDescendants"
-    >
+    android:orientation="vertical"
+    android:padding="@dimen/material_generic">
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:padding="@dimen/material_generic"
-        app:cardUseCompatPadding="true"
+        android:descendantFocusability="afterDescendants"
         android:focusable="true"
+        android:padding="@dimen/material_generic"
+        app:cardCornerRadius="12dp"
         app:cardElevation="@dimen/material_generic_card_elevation"
-        android:descendantFocusability="afterDescendants">
+        app:cardUseCompatPadding="true"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:descendantFocusability="afterDescendants">
+            android:descendantFocusability="afterDescendants"
+            android:orientation="vertical">
 
             <!-- status -->
             <androidx.appcompat.widget.AppCompatTextView
@@ -32,24 +33,51 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:maxLines="1"
-                android:textSize="@dimen/material_generic_title"
                 android:padding="@dimen/padding_normal"
+                android:textSize="@dimen/material_generic_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <!-- port -->
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/text_view_ftp_url"
+                android:id="@+id/text_view_ftp_port"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
+                android:paddingLeft="@dimen/padding_normal"
+                android:paddingRight="@dimen/padding_normal"
+                android:paddingBottom="@dimen/padding_normal"
                 android:textSize="@dimen/material_generic_title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_status"/>
+
+            <!-- shared path -->
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/text_view_ftp_path"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/padding_normal"
+                android:paddingRight="@dimen/padding_normal"
                 android:paddingBottom="@dimen/padding_normal"
+                android:textSize="@dimen/material_generic_title"
+                app:drawableRightCompat="@drawable/ic_clear_all"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_port" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/text_view_ftp_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
                 android:paddingLeft="@dimen/padding_normal"
                 android:paddingRight="@dimen/padding_normal"
+                android:paddingBottom="@dimen/padding_normal"
+                android:textSize="@dimen/material_generic_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_status"/>
+                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_port" />
 
             <View
                 android:id="@+id/divider_ftp_status"
@@ -67,8 +95,8 @@
                 android:id="@+id/text_view_ftp_username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/material_generic_title"
                 android:padding="@dimen/padding_normal"
+                android:textSize="@dimen/material_generic_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/divider_ftp_status" />
@@ -80,77 +108,41 @@
                 android:id="@+id/text_view_ftp_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/material_generic_title"
-                android:paddingBottom="@dimen/padding_normal"
                 android:paddingLeft="@dimen/padding_normal"
                 android:paddingRight="@dimen/padding_normal"
+                android:paddingBottom="@dimen/padding_normal"
+                android:textSize="@dimen/material_generic_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_username"/>
+                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_username" />
 
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/ftp_password_visible"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?selectableItemBackground"
-                app:srcCompat="@drawable/ic_eye_grey600_24dp"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/text_view_ftp_password"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/text_view_ftp_username"
-                app:layout_constraintRight_toLeftOf="@id/text_view_ftp_password" />
+                app:srcCompat="@drawable/ic_eye_grey600_24dp" />
 
 
-            <!-- port -->
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/text_view_ftp_port"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/material_generic_title"
-                android:paddingBottom="@dimen/padding_normal"
-                android:paddingLeft="@dimen/padding_normal"
-                android:paddingRight="@dimen/padding_normal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_password"/>
 
-            <!-- shared path -->
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/text_view_ftp_path"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/material_generic_title"
-                android:paddingBottom="@dimen/padding_normal"
-                android:paddingLeft="@dimen/padding_normal"
-                android:paddingRight="@dimen/padding_normal"
-                app:drawableRightCompat="@drawable/ic_clear_all"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_port"/>
 
-            <View
-                android:id="@+id/divider_ftp_start"
-                android:layout_width="wrap_content"
-                android:layout_height="1dp"
-                android:paddingLeft="@dimen/padding_normal"
-                android:paddingRight="@dimen/padding_normal"
-                android:background="@color/divider"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_ftp_path" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/startStopButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:text="@string/start_ftp"
-                android:padding="@dimen/padding_normal"
-                android:focusable="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/divider_ftp_start"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/startStopButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:background="?attr/selectableItemBackground"
+        android:focusable="true"
+        android:elevation="@dimen/material_generic_card_elevation"
+        android:padding="@dimen/padding_normal"
+        android:text="@string/start_ftp"
+        tools:targetApi="lollipop" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_appbar.xml b/app/src/main/res/layout/layout_appbar.xml
index 3e142057d1..d49ce747c0 100644
--- a/app/src/main/res/layout/layout_appbar.xml
+++ b/app/src/main/res/layout/layout_appbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.appbar.AppBarLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/lin"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,7 +10,6 @@
 
     <androidx.appcompat.widget.Toolbar
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/action_bar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
@@ -34,10 +34,10 @@
         >
 
         <HorizontalScrollView
-            android:paddingRight="16dp"
+            android:paddingEnd="16dp"
             android:scrollbars="none"
             android:id="@+id/scroll"
-            android:paddingLeft="72dp"
+            android:paddingStart="72dp"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:focusable="true">
@@ -53,13 +53,14 @@
         </HorizontalScrollView>
         <LinearLayout
             android:id="@+id/pathbar"
-            android:paddingRight="16dp"
+            android:paddingEnd="16dp"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:clickable="false"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            tools:ignore="RtlSymmetry">
 
             <HorizontalScrollView
                 android:scrollbars="none"
@@ -67,9 +68,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="false"
-                android:paddingLeft="72dp"
+                android:paddingStart="72dp"
                 android:paddingTop="5dp"
-                android:focusable="true">
+                android:focusable="true"
+                tools:ignore="RtlSymmetry">
 
                 <LinearLayout
                     android:clickable="false"
@@ -99,11 +101,12 @@
                 android:textSize="12sp"
                 android:paddingBottom="8dp"
                 android:paddingTop="5dp"
-                android:paddingLeft="72dp"
+                android:paddingStart="72dp"
                 android:textColor="@android:color/white"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start"
-                android:id="@+id/pathname" />
+                android:id="@+id/pathname"
+                tools:ignore="RtlSymmetry" />
 
         </LinearLayout>
     </FrameLayout>
diff --git a/app/src/main/res/layout/main_frag.xml b/app/src/main/res/layout/main_frag.xml
index 92f0b96603..3d832d97d8 100644
--- a/app/src/main/res/layout/main_frag.xml
+++ b/app/src/main/res/layout/main_frag.xml
@@ -29,54 +29,61 @@
      As the main content view, the view below consumes the entire
      space available using match_parent in both dimensions.
     -->
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/activity_main_swipe_refresh_layout"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:focusable="false"
-        >
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="18dp"
+        android:layout_marginEnd="12dp"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="@dimen/eight_dp">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/listView"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/activity_main_swipe_refresh_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:divider="@null"
-            android:scrollbars="none"
-            android:descendantFocusability="afterDescendants"
-            />
+            android:focusable="false"
+            android:padding="@dimen/eight_dp">
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/listView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:descendantFocusability="afterDescendants"
+                android:divider="@null"
+                android:scrollbars="none" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </androidx.cardview.widget.CardView>
 
     <com.amaze.filemanager.ui.views.FastScroller
         android:id="@+id/fastscroll"
-        android:orientation="vertical"
         android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="right"
-        android:layout_height="match_parent"/>
+        android:orientation="vertical" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/nofilelayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:visibility="gone"
         android:focusable="false"
-        >
+        android:scrollbars="none"
+        android:visibility="gone">
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:descendantFocusability="afterDescendants"
-            >
+            android:descendantFocusability="afterDescendants">
 
             <RelativeLayout
                 android:id="@+id/no_files_relative"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
-                android:focusable="true"
                 android:background="@drawable/ripple_focusable"
-                >
+                android:focusable="true">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
@@ -85,19 +92,19 @@
                     android:layout_centerHorizontal="true"
                     android:layout_centerVertical="true"
                     android:layout_marginBottom="@dimen/material_generic_medium"
-                    app:srcCompat="@drawable/ic_insert_drive_file_white_36dp"/>
+                    app:srcCompat="@drawable/ic_insert_drive_file_white_36dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/nofiletext"
                     style="@android:style/TextAppearance.Medium"
                     android:layout_width="wrap_content"
-                    android:textColor="#666666"
-                    android:id="@+id/nofiletext"
-                    android:layout_marginTop="10dp"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/image"
-                    android:fontFamily="sans-serif-medium"
                     android:layout_centerHorizontal="true"
-                    android:text="@string/no_files"/>
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/no_files"
+                    android:textColor="#666666" />
             </RelativeLayout>
         </androidx.core.widget.NestedScrollView>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/main_toolbar.xml b/app/src/main/res/layout/main_toolbar.xml
index 737f5d4456..d5bd0e55f3 100644
--- a/app/src/main/res/layout/main_toolbar.xml
+++ b/app/src/main/res/layout/main_toolbar.xml
@@ -74,7 +74,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
         <com.leinardi.android.speeddial.SpeedDialView
-                android:id="@+id/fabs_menu"
+                android:id="@+id/fabs_menu" 
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/rowlayout.xml b/app/src/main/res/layout/rowlayout.xml
index ba7d67ec00..a9eb438d40 100644
--- a/app/src/main/res/layout/rowlayout.xml
+++ b/app/src/main/res/layout/rowlayout.xml
@@ -103,6 +103,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:padding="8dp"
+        android:rotation="90"
         android:clickable="true"
         app:srcCompat="@drawable/ic_more_vert_black_48dp"
         android:nextFocusLeft="@id/second"