diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceDividerItemDecoration.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceDividerItemDecoration.kt
index 1b33496160..6d4fb6fbe3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceDividerItemDecoration.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceDividerItemDecoration.kt
@@ -27,8 +27,8 @@ class SourceDividerItemDecoration(context: Context) : RecyclerView.ItemDecoratio
                 val params = child.layoutParams as RecyclerView.LayoutParams
                 val top = child.bottom + params.bottomMargin
                 val bottom = top + divider.intrinsicHeight
-                val left = parent.paddingLeft + holder.margin
-                val right = parent.width - parent.paddingRight - holder.margin
+                val left = parent.paddingStart + holder.margin
+                val right = parent.width - parent.paddingEnd - holder.margin
 
                 divider.setBounds(left, top, right, bottom)
                 divider.draw(c)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt
index 24c7c0a432..e70bccccac 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt
@@ -27,8 +27,8 @@ class ExtensionDividerItemDecoration(context: Context) : RecyclerView.ItemDecora
                 val params = child.layoutParams as RecyclerView.LayoutParams
                 val top = child.bottom + params.bottomMargin
                 val bottom = top + divider.intrinsicHeight
-                val left = parent.paddingLeft + holder.margin
-                val right = parent.width - parent.paddingRight - holder.margin
+                val left = parent.paddingStart + holder.margin
+                val right = parent.width - parent.paddingEnd - holder.margin
 
                 divider.setBounds(left, top, right, bottom)
                 divider.draw(c)
diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml
index 2eed51af8a..130fd4afed 100644
--- a/app/src/main/res/layout-land/manga_info_controller.xml
+++ b/app/src/main/res/layout-land/manga_info_controller.xml
@@ -21,24 +21,23 @@
             android:layout_height="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
             android:contentDescription="@string/description_cover"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintDimensionRatio="h,3:2"
             tools:background="@color/material_grey_700"
-            app:layout_constraintVertical_bias="0.0"
-            android:layout_marginStart="16dp"/>
+            app:layout_constraintVertical_bias="0.0" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab_favorite"
             style="@style/Theme.Widget.FAB"
             app:srcCompat="@drawable/ic_bookmark_border_white_24dp"
             android:layout_marginBottom="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/info_scrollview"
@@ -46,14 +45,12 @@
             android:layout_height="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/manga_cover"
-            app:layout_constraintRight_toRightOf="parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
+            app:layout_constraintStart_toEndOf="@+id/manga_cover"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -68,7 +65,7 @@
                     android:maxLines="2"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:autoSizeTextType="uniform"
                     app:autoSizeMinTextSize="12sp"
                     app:autoSizeMaxTextSize="20sp"
@@ -82,21 +79,20 @@
                     android:text="@string/manga_info_author_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_author"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_author_label"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginStart="8dp"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_author_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_artist_label"
@@ -106,21 +102,20 @@
                     android:text="@string/manga_info_artist_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_author_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_artist"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_artist_label"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginStart="8dp"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_artist_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_chapters_label"
@@ -130,21 +125,20 @@
                     android:text="@string/manga_info_last_chapter_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_artist_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_chapters"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_chapters_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_chapters_label"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginStart="8dp"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_chapters_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_last_update_label"
@@ -154,21 +148,20 @@
                     android:text="@string/manga_info_latest_data_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_last_update"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_last_update_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_last_update_label"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginStart="8dp"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_last_update_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_status_label"
@@ -178,21 +171,20 @@
                     android:text="@string/manga_info_status_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_status"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_status_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_status_label"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginStart="8dp"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_status_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_source_label"
@@ -202,21 +194,20 @@
                     android:text="@string/manga_info_source_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_status_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_source"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_source_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_source_label"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginStart="8dp"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_source_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_summary_label"
@@ -226,7 +217,7 @@
                     android:text="@string/description"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_source"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_summary"
@@ -235,9 +226,9 @@
                     android:layout_height="wrap_content"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_summary_label"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginRight="64dp"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:layout_marginEnd="64dp"/>
 
                 <me.gujun.android.taggroup.TagGroup
                     android:id="@+id/manga_genres_tags"
@@ -246,14 +237,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@+id/manga_summary"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:atg_borderStrokeWidth="1dp"
                     app:atg_backgroundColor="@android:color/transparent"
                     app:atg_borderColor="@color/md_blue_A400"
                     app:atg_textColor="@color/md_blue_A400"
-                    android:layout_marginRight="64dp"/>
-
+                    android:layout_marginEnd="64dp"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout-land/reader_color_filter_sheet.xml b/app/src/main/res/layout-land/reader_color_filter_sheet.xml
index 9cf10846dd..75c1f8424c 100644
--- a/app/src/main/res/layout-land/reader_color_filter_sheet.xml
+++ b/app/src/main/res/layout-land/reader_color_filter_sheet.xml
@@ -12,8 +12,8 @@
         android:id="@+id/frame"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/scroll"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/scroll"
         app:layout_constraintTop_toTopOf="@id/scroll"
         app:layout_constraintBottom_toBottomOf="@id/scroll">
 
@@ -40,8 +40,8 @@
         android:id="@+id/scroll"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@id/frame"
-        app:layout_constraintRight_toRightOf="parent">
+        app:layout_constraintStart_toEndOf="@id/frame"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <include layout="@layout/reader_color_filter"/>
 
diff --git a/app/src/main/res/layout/catalogue_drawer_content.xml b/app/src/main/res/layout/catalogue_drawer_content.xml
index b2b621a9cf..b4bf2e16bc 100644
--- a/app/src/main/res/layout/catalogue_drawer_content.xml
+++ b/app/src/main/res/layout/catalogue_drawer_content.xml
@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:clickable="true"
     android:orientation="vertical">
+
     <LinearLayout
         android:id="@+id/title_background"
         android:layout_width="match_parent"
@@ -14,9 +15,8 @@
         android:elevation="2dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?attr/listPreferredItemPaddingRight"
-        >
+        android:paddingStart="?attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
         <TextView
             android:id="@+id/title"
@@ -36,11 +36,13 @@
         android:layout_height="0dp"
         android:layout_weight="3"
         android:layout_gravity="top"/>
+
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?android:attr/divider"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,5 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/action_search"/>
+
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/catalogue_global_search_controller.xml b/app/src/main/res/layout/catalogue_global_search_controller.xml
index 4f9ab29f8e..7959047a90 100644
--- a/app/src/main/res/layout/catalogue_global_search_controller.xml
+++ b/app/src/main/res/layout/catalogue_global_search_controller.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:tools="http://schemas.android.com/tools"
-android:layout_width="match_parent"
-android:layout_height="wrap_content">
-
-<androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="4dp"
-    android:paddingTop="4dp"
-    android:clipToPadding="false"
-    tools:listitem="@layout/catalogue_global_search_controller_card" />
+    android:layout_height="wrap_content">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        tools:listitem="@layout/catalogue_global_search_controller_card" />
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/catalogue_global_search_controller_card.xml b/app/src/main/res/layout/catalogue_global_search_controller_card.xml
index 60c6ce4968..3b38de0f10 100644
--- a/app/src/main/res/layout/catalogue_global_search_controller_card.xml
+++ b/app/src/main/res/layout/catalogue_global_search_controller_card.xml
@@ -14,7 +14,7 @@
         android:padding="@dimen/material_component_text_fields_padding_above_and_below_label"
         app:layout_constraintBottom_toTopOf="@+id/source_card"
         app:layout_constraintHeight_default="wrap"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Title" />
 
@@ -45,5 +45,7 @@
             android:paddingStart="4dp"
             android:clipToPadding="false"
             tools:listitem="@layout/catalogue_global_search_controller_card_item" />
+
     </androidx.cardview.widget.CardView>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/catalogue_grid_item.xml b/app/src/main/res/layout/catalogue_grid_item.xml
index 614a0bbd19..5b833d32ff 100644
--- a/app/src/main/res/layout/catalogue_grid_item.xml
+++ b/app/src/main/res/layout/catalogue_grid_item.xml
@@ -41,14 +41,14 @@
                 android:layout_height="wrap_content"
                 android:background="@color/colorAccentDark"
                 android:paddingBottom="1dp"
-                android:paddingLeft="3dp"
-                android:paddingRight="3dp"
+                android:paddingStart="3dp"
+                android:paddingEnd="3dp"
                 android:paddingTop="1dp"
                 android:visibility="gone"
                 tools:visibility="visible"
                 tools:text="120"
-                app:layout_constraintLeft_toRightOf="@+id/download_text"
-                android:layout_marginLeft="4dp"
+                app:layout_constraintStart_toEndOf="@+id/download_text"
+                android:layout_marginStart="4dp"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginTop="4dp"/>
             <TextView
@@ -58,14 +58,14 @@
                 android:layout_height="wrap_content"
                 android:background="@color/md_red_500"
                 android:paddingBottom="1dp"
-                android:paddingLeft="3dp"
-                android:paddingRight="3dp"
+                android:paddingStart="3dp"
+                android:paddingEnd="3dp"
                 android:paddingTop="1dp"
                 android:visibility="gone"
                 tools:visibility="visible"
                 tools:text="120"
-                app:layout_constraintLeft_toRightOf="@+id/local_text"
-                android:layout_marginLeft="4dp"
+                app:layout_constraintStart_toEndOf="@+id/local_text"
+                android:layout_marginStart="4dp"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginTop="4dp"/>
             <TextView
@@ -75,14 +75,14 @@
                 android:layout_height="wrap_content"
                 android:background="@color/md_teal_500"
                 android:paddingBottom="1dp"
-                android:paddingLeft="3dp"
-                android:paddingRight="3dp"
+                android:paddingStart="3dp"
+                android:paddingEnd="3dp"
                 android:paddingTop="1dp"
                 android:visibility="gone"
                 tools:visibility="visible"
                 android:text="@string/local_source_badge"
-                android:layout_marginLeft="4dp"
-                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginStart="4dp"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginTop="4dp"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/catalogue_list_item.xml b/app/src/main/res/layout/catalogue_list_item.xml
index b83795268a..09b4e9943b 100644
--- a/app/src/main/res/layout/catalogue_list_item.xml
+++ b/app/src/main/res/layout/catalogue_list_item.xml
@@ -5,22 +5,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
-        android:layout_gravity="center_vertical"
+    android:layout_gravity="center_vertical"
     android:background="?attr/selectable_list_drawable"
     tools:layout_editor_absoluteY="25dp"
     tools:layout_editor_absoluteX="0dp">
+
    <ImageView
        android:id="@+id/thumbnail"
        android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
        android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
        android:layout_gravity="center_vertical"
        tools:src="@mipmap/ic_launcher"
-       app:layout_constraintLeft_toLeftOf="parent"
+       app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        android:paddingTop="8dp"
        android:paddingBottom="8dp"
-       android:layout_marginLeft="8dp"/>
+       android:layout_marginStart="8dp"/>
 
     <TextView
         android:id="@+id/title"
@@ -30,15 +31,14 @@
         android:ellipsize="end"
         android:maxLines="1"
         tools:text="Manga title"
-        android:layout_marginStart="8dp"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="8dp"
-        app:layout_constraintLeft_toRightOf="@+id/thumbnail"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintRight_toLeftOf="@+id/local_text"
-        android:layout_marginRight="8dp"
+        app:layout_constraintStart_toEndOf="@+id/thumbnail"
+        android:layout_marginStart="8dp"
+        app:layout_constraintEnd_toStartOf="@+id/local_text"
+        android:layout_marginEnd="8dp"
         app:layout_constraintVertical_bias="0.523"
         app:layout_constraintHorizontal_bias="0.007"/>
 
@@ -49,8 +49,8 @@
         android:layout_height="wrap_content"
         android:background="@color/md_teal_500"
         android:paddingBottom="1dp"
-        android:paddingLeft="3dp"
-        android:paddingRight="3dp"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp"
         android:paddingTop="1dp"
         android:layout_centerVertical="true"
         android:maxLines="1"
@@ -58,58 +58,57 @@
         android:visibility="gone"
         tools:visibility="visible"
         android:layout_marginEnd="8dp"
-        app:layout_constraintRight_toLeftOf="@+id/unread_text"
+        app:layout_constraintEnd_toStartOf="@+id/unread_text"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="8dp"/>
 
-        <TextView
-            android:id="@+id/unread_text"
-            style="@style/TextAppearance.Regular.Caption.Light"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@color/colorAccentLight"
-            android:paddingBottom="1dp"
-            android:paddingLeft="3dp"
-            android:paddingRight="3dp"
-            android:paddingTop="1dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:maxLines="1"
-            android:visibility="gone"
-            tools:text="130"
-            tools:visibility="visible"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/download_text"
-            android:layout_marginTop="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="8dp"
-            android:layout_marginRight="8dp"
-            app:layout_constraintRight_toRightOf="parent"/>
+    <TextView
+        android:id="@+id/unread_text"
+        style="@style/TextAppearance.Regular.Caption.Light"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/colorAccentLight"
+        android:paddingBottom="1dp"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp"
+        android:paddingTop="1dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:maxLines="1"
+        android:visibility="gone"
+        tools:text="130"
+        tools:visibility="visible"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/download_text"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"/>
 
-        <TextView
-            android:id="@+id/download_text"
-            style="@style/TextAppearance.Regular.Caption.Light"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@color/md_red_500"
-            android:paddingBottom="1dp"
-            android:paddingLeft="3dp"
-            android:paddingRight="3dp"
-            android:paddingTop="1dp"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@+id/unread_text"
-            android:maxLines="1"
-            android:visibility="gone"
-            tools:text="122"
-            tools:visibility="visible"
-            android:layout_marginEnd="8dp"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="8dp"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:id="@+id/download_text"
+        style="@style/TextAppearance.Regular.Caption.Light"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/md_red_500"
+        android:paddingBottom="1dp"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp"
+        android:paddingTop="1dp"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@+id/unread_text"
+        android:maxLines="1"
+        android:visibility="gone"
+        tools:text="122"
+        tools:visibility="visible"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="8dp"/>
 
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/catalogue_main_controller_card.xml b/app/src/main/res/layout/catalogue_main_controller_card.xml
index aec409b0a0..e0ba18d4ab 100644
--- a/app/src/main/res/layout/catalogue_main_controller_card.xml
+++ b/app/src/main/res/layout/catalogue_main_controller_card.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="@dimen/material_component_text_fields_padding_above_and_below_label"
+        android:paddingStart="@dimen/material_component_text_fields_padding_above_and_below_label"
         tools:text="Title" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/catalogue_main_controller_card_item.xml b/app/src/main/res/layout/catalogue_main_controller_card_item.xml
index 071c89ad77..faf7915d00 100644
--- a/app/src/main/res/layout/catalogue_main_controller_card_item.xml
+++ b/app/src/main/res/layout/catalogue_main_controller_card_item.xml
@@ -19,7 +19,7 @@
             android:padding="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@mipmap/ic_launcher_round" />
 
@@ -28,16 +28,14 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:maxLines="1"
-            android:paddingLeft="0dp"
             android:paddingStart="0dp"
-            android:paddingRight="8dp"
             android:paddingEnd="8dp"
             android:ellipsize="end"
             android:textAppearance="@style/TextAppearance.Regular.SubHeading"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/image"
+            app:layout_constraintStart_toEndOf="@+id/image"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/source_latest"
+            app:layout_constraintEnd_toStartOf="@+id/source_latest"
             tools:text="Source title"/>
 
         <Button
@@ -46,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/latest"
-            app:layout_constraintRight_toLeftOf="@+id/source_browse"
+            app:layout_constraintEnd_toStartOf="@+id/source_browse"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
@@ -56,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/browse"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml
index 681f229a0e..cc29883ce8 100644
--- a/app/src/main/res/layout/categories_item.xml
+++ b/app/src/main/res/layout/categories_item.xml
@@ -12,9 +12,7 @@
         android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
         android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
         android:clickable="true"
-        android:paddingLeft="@dimen/material_component_lists_icon_left_padding"
         android:paddingStart="@dimen/material_component_lists_icon_left_padding"
-        android:paddingRight="0dp"
         android:paddingEnd="0dp"
         tools:src="@mipmap/ic_launcher_round"/>
 
@@ -22,9 +20,7 @@
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/material_component_lists_text_left_padding"
         android:layout_marginStart="@dimen/material_component_lists_text_left_padding"
-        android:layout_marginRight="@dimen/material_component_lists_single_line_with_avatar_height"
         android:layout_marginEnd="@dimen/material_component_lists_single_line_with_avatar_height"
         android:ellipsize="end"
         android:maxLines="1"
@@ -41,4 +37,4 @@
         app:srcCompat="@drawable/ic_reorder_grey_24dp"
         android:tint="?android:attr/textColorPrimary"/>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/changelog_header_layout.xml b/app/src/main/res/layout/changelog_header_layout.xml
index e4c10220b5..65d97ab364 100644
--- a/app/src/main/res/layout/changelog_header_layout.xml
+++ b/app/src/main/res/layout/changelog_header_layout.xml
@@ -6,9 +6,8 @@
               android:gravity="center_vertical"
               android:minHeight="@dimen/chglib_material_minHeight"
               android:orientation="horizontal"
-              android:paddingLeft="@dimen/chglib_material_keyline1"
-              android:paddingRight="@dimen/chglib_material_keyline1">
-
+              android:paddingStart="@dimen/chglib_material_keyline1"
+              android:paddingEnd="@dimen/chglib_material_keyline1">
 
     <!-- ChangeLog Header [Version] You have to use the id="chg_headerVersion" -->
     <TextView
@@ -21,6 +20,6 @@
         android:paddingTop="@dimen/chglib_material_keyline1"
         android:textAppearance="@style/TextAppearance.Medium.Body2"
         android:textAllCaps="false"
-        android:textColor="?attr/colorAccent"
-        />
-</LinearLayout>
\ No newline at end of file
+        android:textColor="?attr/colorAccent" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/changelog_row_layout.xml b/app/src/main/res/layout/changelog_row_layout.xml
index 9044452765..b4eefb7ca9 100644
--- a/app/src/main/res/layout/changelog_row_layout.xml
+++ b/app/src/main/res/layout/changelog_row_layout.xml
@@ -7,7 +7,6 @@
               android:minHeight="@dimen/listPreferredItemHeightSmall"
               android:orientation="horizontal">
 
-
     <!-- ChangeLog Row [Bullet Point] You have to use the id="chg_textbullet" -->
     <TextView
         android:id="@+id/chg_textbullet"
@@ -15,13 +14,9 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:paddingEnd="0dp"
-        android:paddingLeft="@dimen/chglib_material_keyline1"
-        android:paddingRight="0dp"
         android:paddingStart="@dimen/chglib_material_keyline1"
         android:text="@string/changelog_row_bulletpoint"
-        android:textAppearance="@style/TextAppearance.Medium.Title"
-        />
-
+        android:textAppearance="@style/TextAppearance.Medium.Title" />
 
     <!-- ChangeLog Row [Text] You have to use the id="chg_text" -->
     <TextView
@@ -30,11 +25,11 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="@dimen/listPreferredItemHeightSmall"
-        android:paddingLeft="@dimen/chglib_material_keyline1"
-        android:paddingRight="@dimen/chglib_material_keyline1"
+        android:paddingStart="@dimen/chglib_material_keyline1"
+        android:paddingEnd="@dimen/chglib_material_keyline1"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:textAppearance="@style/TextAppearance.Regular.Body1"
-        tools:text="Use DashClock with Android 4.2's Daydream feature; great for use with desktop docks!"
-        />
-</LinearLayout>
\ No newline at end of file
+        tools:text="Use DashClock with Android 4.2's Daydream feature; great for use with desktop docks!" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/chapters_controller.xml b/app/src/main/res/layout/chapters_controller.xml
index ddbd394eec..b3662dcffe 100644
--- a/app/src/main/res/layout/chapters_controller.xml
+++ b/app/src/main/res/layout/chapters_controller.xml
@@ -26,8 +26,8 @@
             android:id="@+id/recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:paddingBottom="@dimen/fab_list_padding"
             android:clipToPadding="false"
             android:descendantFocusability="blocksDescendants"
diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml
index c164c0104a..3a69213bca 100644
--- a/app/src/main/res/layout/chapters_item.xml
+++ b/app/src/main/res/layout/chapters_item.xml
@@ -15,11 +15,11 @@
         android:ellipsize="end"
         android:maxLines="1"
         tools:text="Title"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/chapter_menu"
+        app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
         android:layout_marginTop="12dp"
-        android:layout_marginLeft="16dp"/>
+        android:layout_marginStart="16dp"/>
 
     <TextView
         android:id="@+id/chapter_scanlator"
@@ -28,11 +28,11 @@
         android:layout_height="wrap_content"
         tools:text="Scanlator"
         android:maxLines="1"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/chapter_title"
         app:layout_constraintBottom_toTopOf="@+id/chapter_date"
-        app:layout_constraintRight_toLeftOf="@+id/chapter_menu"
-        android:layout_marginLeft="16dp"/>
+        app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
+        android:layout_marginStart="16dp"/>
 
     <TextView
         android:id="@+id/chapter_date"
@@ -41,9 +41,9 @@
         android:layout_height="wrap_content"
         tools:text="22/02/2016"
         android:ellipsize="marquee"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:singleLine="true" />
 
     <TextView
@@ -54,8 +54,8 @@
         tools:text="Pages: 45"
         android:ellipsize="marquee"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         android:singleLine="true" />
 
     <ImageView
@@ -63,14 +63,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:srcCompat="@drawable/ic_more_vert_black_24dp"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:paddingStart="24dp"
         android:paddingEnd="16dp"
         android:layout_marginEnd="8dp"
-        android:paddingLeft="24dp"
-        android:paddingRight="16dp"
-        android:layout_marginRight="8dp"
         android:paddingBottom="24dp"
         android:paddingTop="12dp"
         android:contentDescription="@string/description_cover"/>
@@ -82,8 +79,8 @@
         android:layout_height="wrap_content"
         tools:text="DOWNLOADED"
         android:textAllCaps="true"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginRight="16dp"/>
+        android:layout_marginEnd="16dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/common_dialog_with_checkbox.xml b/app/src/main/res/layout/common_dialog_with_checkbox.xml
index 748a488ee8..46e39ae060 100644
--- a/app/src/main/res/layout/common_dialog_with_checkbox.xml
+++ b/app/src/main/res/layout/common_dialog_with_checkbox.xml
@@ -10,15 +10,12 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.Regular.Body1"/>
 
-
     <CheckBox
         android:id="@+id/checkbox_option"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="-5dp"
         android:layout_marginEnd="0dp"
-        android:layout_marginLeft="-5dp"
-        android:layout_marginRight="0dp"
         android:layout_marginTop="@dimen/material_component_dialogs_padding_between_text_and_touch_target"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 2008002f86..b7e7f8072a 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -4,15 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/material_layout_keylines_screen_edge_margin"
-    android:paddingRight="@dimen/material_layout_keylines_screen_edge_margin"
+    android:paddingStart="@dimen/material_layout_keylines_screen_edge_margin"
+    android:paddingEnd="@dimen/material_layout_keylines_screen_edge_margin"
     android:paddingTop="@dimen/material_component_lists_padding_above_list">
 
     <TextView
         android:id="@+id/download_progress_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
         tools:text="(0/10)"/>
@@ -21,8 +21,8 @@
         android:id="@+id/manga_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/download_progress_text"
-        android:layout_alignParentLeft="true"
+        android:layout_toStartOf="@id/download_progress_text"
+        android:layout_alignParentStart="true"
         android:maxLines="1"
         android:ellipsize="end"
         android:textAppearance="@style/TextAppearance.Regular.Body1"
@@ -45,4 +45,4 @@
         android:layout_below="@id/chapter_title"
         style="?android:attr/progressBarStyleHorizontal"/>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/extension_card_header.xml b/app/src/main/res/layout/extension_card_header.xml
index 1ed6c941c3..d101fd2bb5 100644
--- a/app/src/main/res/layout/extension_card_header.xml
+++ b/app/src/main/res/layout/extension_card_header.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     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:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -16,9 +15,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="8dp"
-            android:paddingLeft="@dimen/material_component_text_fields_padding_above_and_below_label"
+            android:paddingStart="@dimen/material_component_text_fields_padding_above_and_below_label"
             android:paddingTop="8dp"
             tools:text="Title"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/extension_card_item.xml b/app/src/main/res/layout/extension_card_item.xml
index 15266ac40b..016ee06fc2 100644
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@@ -19,7 +19,6 @@
             android:padding="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="h,1:1"
-            app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@mipmap/ic_launcher_round" />
@@ -29,7 +28,6 @@
             style="@style/TextAppearance.Regular"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="4dp"
             android:layout_marginEnd="4dp"
             android:ellipsize="end"
             android:maxLines="1"
@@ -55,7 +53,6 @@
             tools:text="English"
             tools:visibility="visible"/>
 
-
         <TextView
             android:id="@+id/version"
             style="@style/TextAppearance.Regular.Body1.Secondary"
@@ -64,8 +61,8 @@
             android:maxLines="1"
             android:textSize="12sp"
             app:layout_constraintBaseline_toBaselineOf="@id/lang"
-            app:layout_constraintLeft_toRightOf="@id/lang"
-            android:layout_marginLeft="4dp"
+            app:layout_constraintStart_toEndOf="@id/lang"
+            android:layout_marginStart="4dp"
             tools:text="Version" />
 
         <Button
@@ -73,7 +70,6 @@
             android:layout_width="wrap_content"
             android:layout_height="32dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
             android:foreground="?attr/selectableItemBackground"
@@ -84,7 +80,6 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Details"/>
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/extension_detail_controller.xml b/app/src/main/res/layout/extension_detail_controller.xml
index 0713e670d4..137b81f853 100644
--- a/app/src/main/res/layout/extension_detail_controller.xml
+++ b/app/src/main/res/layout/extension_detail_controller.xml
@@ -9,8 +9,8 @@
         android:id="@+id/extension_icon"
         android:layout_width="56dp"
         android:layout_height="56dp"
-        android:layout_marginLeft="16dp"
-        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginStart="16dp"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/extension_title"
         app:layout_constraintBottom_toBottomOf="@id/extension_pkg"
         android:src="@mipmap/ic_launcher"/>
@@ -20,9 +20,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         style="@style/TextAppearance.Regular.SubHeading"
-        app:layout_constraintLeft_toRightOf="@id/extension_icon"
+        app:layout_constraintStart_toEndOf="@id/extension_icon"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Tachiyomi: Extension"/>
 
@@ -34,7 +34,7 @@
         android:layout_weight="1"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@id/extension_title"
-        app:layout_constraintLeft_toLeftOf="@id/extension_title"
+        app:layout_constraintStart_toStartOf="@id/extension_title"
         tools:text="Version: 1.0.0" />
 
     <TextView
@@ -45,19 +45,19 @@
         android:layout_weight="1"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@id/extension_version"
-        app:layout_constraintLeft_toLeftOf="@id/extension_title"
+        app:layout_constraintStart_toStartOf="@id/extension_title"
         tools:text="Language: English" />
 
     <TextView
         android:id="@+id/extension_pkg"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:singleLine="true"
         android:ellipsize="middle"
         app:layout_constraintTop_toBottomOf="@id/extension_lang"
-        app:layout_constraintLeft_toLeftOf="@id/extension_title"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="@id/extension_title"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:text="eu.kanade.tachiyomi.extension.en.myext"/>
 
     <Button
@@ -69,8 +69,8 @@
         android:layout_marginTop="16dp"
         android:text="@string/ext_uninstall"
         style="@style/Theme.Widget.Button.Colored"
-        app:layout_constraintLeft_toLeftOf="@id/guideline"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="@id/guideline"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/extension_pkg" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -79,8 +79,8 @@
         android:layout_height="0dp"
         android:layout_marginTop="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/extension_uninstall_button"/>
 
     <eu.kanade.tachiyomi.widget.EmptyView
@@ -90,8 +90,8 @@
         android:visibility="gone"
         android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/extension_uninstall_button"/>
 
     <androidx.constraintlayout.widget.Guideline
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index eeb03a594b..3024704b0e 100644
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -9,11 +9,8 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        xmlns:android="http://schemas.android.com/apk/res/android">
+        android:layout_height="match_parent">
 
         <View
             android:id="@+id/guideline"
@@ -37,8 +34,8 @@
             tools:background="@color/material_grey_700"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <ImageView
             android:id="@+id/manga_cover"
@@ -46,12 +43,12 @@
             android:layout_height="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:contentDescription="@string/description_cover"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintDimensionRatio="h,2:3"
             tools:background="@color/material_grey_700"/>
 
@@ -61,10 +58,10 @@
             app:srcCompat="@drawable/ic_add_to_library_24dp"
             android:layout_marginTop="0dp"
             android:layout_marginBottom="0dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
             app:layout_constraintTop_toBottomOf="@+id/guideline"
             app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintRight_toRightOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/info_scrollview"
@@ -72,12 +69,12 @@
             android:layout_height="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:layout_marginLeft="0dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintLeft_toLeftOf="@+id/guideline2"
-            app:layout_constraintRight_toRightOf="parent">
+            app:layout_constraintStart_toStartOf="@+id/guideline2"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -92,7 +89,7 @@
                     android:maxLines="2"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:autoSizeTextType="uniform"
                     app:autoSizeMinTextSize="12sp"
                     app:autoSizeMaxTextSize="20sp"
@@ -107,20 +104,20 @@
                     android:textIsSelectable="false"
 
                     app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_author"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_author_label"
-                    app:layout_constraintRight_toRightOf="parent"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_author_label"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_artist_label"
@@ -130,20 +127,20 @@
                     android:text="@string/manga_info_artist_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_author_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_artist"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_artist_label"
-                    app:layout_constraintRight_toRightOf="parent"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_artist_label"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_chapters_label"
@@ -153,20 +150,20 @@
                     android:text="@string/manga_info_last_chapter_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_artist_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_chapters"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_chapters_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_chapters_label"
-                    app:layout_constraintRight_toRightOf="parent"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_chapters_label"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_last_update_label"
@@ -176,20 +173,20 @@
                     android:text="@string/manga_info_latest_data_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_last_update"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_last_update_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_last_update_label"
-                    app:layout_constraintRight_toRightOf="parent"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_last_update_label"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_status_label"
@@ -199,20 +196,20 @@
                     android:text="@string/manga_info_status_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_status"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_status_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_status_label"
-                    app:layout_constraintRight_toRightOf="parent"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_status_label"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_source_label"
@@ -222,20 +219,20 @@
                     android:text="@string/manga_info_source_label"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toBottomOf="@+id/manga_status_label"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
                     android:id="@+id/manga_source"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_source_label"
-                    app:layout_constraintLeft_toRightOf="@+id/manga_source_label"
-                    app:layout_constraintRight_toRightOf="parent"/>
+                    app:layout_constraintStart_toEndOf="@+id/manga_source_label"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -246,14 +243,13 @@
             style="@style/TextAppearance.Medium.Body2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginTop="8dp"
             android:text="@string/description"
             app:layout_constraintTop_toBottomOf="@+id/guideline"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             android:textIsSelectable="false"/>
 
         <androidx.core.widget.NestedScrollView
@@ -262,8 +258,8 @@
             android:layout_height="wrap_content"
             app:layout_constrainedHeight="true"
             app:layout_constraintBottom_toTopOf="@id/manga_genres_tags"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/manga_summary_label"
             app:layout_constraintVertical_bias="0.0"
             app:layout_constraintVertical_chainStyle="packed">
@@ -273,8 +269,8 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:textIsSelectable="false" />
 
         </androidx.core.widget.NestedScrollView>
@@ -287,12 +283,10 @@
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginBottom="8dp"
             app:layout_constrainedHeight="true"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/description_scrollview"
             app:layout_constraintBottom_toBottomOf="parent"
             app:atg_borderStrokeWidth="1dp"
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index 6080e48357..c7796fae9f 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -13,7 +13,7 @@
     <ImageView
         android:layout_width="64dp"
         android:layout_height="64dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="@dimen/navigation_drawer_header_margin"
         android:scaleType="centerCrop"
         android:src="@drawable/tachiyomi_circle" />
diff --git a/app/src/main/res/layout/navigation_view_checkbox.xml b/app/src/main/res/layout/navigation_view_checkbox.xml
index ecc547fc5e..82ef90d095 100644
--- a/app/src/main/res/layout/navigation_view_checkbox.xml
+++ b/app/src/main/res/layout/navigation_view_checkbox.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
     android:focusable="true">
 
@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingLeft="@dimen/material_component_lists_icon_left_padding"
+        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:background="@android:color/transparent"
         android:gravity="center_vertical|start"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/navigation_view_checkedtext.xml b/app/src/main/res/layout/navigation_view_checkedtext.xml
index 7358b6f298..69813970e0 100644
--- a/app/src/main/res/layout/navigation_view_checkedtext.xml
+++ b/app/src/main/res/layout/navigation_view_checkedtext.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
     android:focusable="true">
 
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index d3399c50fc..970101cc39 100644
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -7,8 +7,8 @@
     android:background="?colorPrimary"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:elevation="2dp">
 
     <TextView
@@ -27,4 +27,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_radio.xml b/app/src/main/res/layout/navigation_view_radio.xml
index 9d660b3551..e9df8114a4 100644
--- a/app/src/main/res/layout/navigation_view_radio.xml
+++ b/app/src/main/res/layout/navigation_view_radio.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
     android:focusable="true">
 
@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingLeft="@dimen/material_component_lists_icon_left_padding"
+        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:background="@android:color/transparent"
         android:gravity="center_vertical|start"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/navigation_view_spinner.xml b/app/src/main/res/layout/navigation_view_spinner.xml
index 2838204bfb..b3e8809a30 100644
--- a/app/src/main/res/layout/navigation_view_spinner.xml
+++ b/app/src/main/res/layout/navigation_view_spinner.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
     android:focusable="true">
 
diff --git a/app/src/main/res/layout/navigation_view_text.xml b/app/src/main/res/layout/navigation_view_text.xml
index 31c22748e7..3f4b88713f 100644
--- a/app/src/main/res/layout/navigation_view_text.xml
+++ b/app/src/main/res/layout/navigation_view_text.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
     android:focusable="true">
 
diff --git a/app/src/main/res/layout/pref_item_source.xml b/app/src/main/res/layout/pref_item_source.xml
index 88680c72e3..2a2fbc3d87 100644
--- a/app/src/main/res/layout/pref_item_source.xml
+++ b/app/src/main/res/layout/pref_item_source.xml
@@ -8,8 +8,8 @@
     android:clipToPadding="false"
     android:gravity="center_vertical"
     android:minHeight="42dp"
-    android:paddingLeft="?listPreferredItemPaddingLeft"
-    android:paddingRight="?listPreferredItemPaddingRight"
+    android:paddingStart="?listPreferredItemPaddingStart"
+    android:paddingEnd="?listPreferredItemPaddingEnd"
     tools:ignore="RtlHardcoded">
 
     <LinearLayout
@@ -19,8 +19,8 @@
         android:clipToPadding="false"
         android:gravity="start|center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"/>
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"/>
 
     <TextView
         android:id="@android:id/title"
@@ -43,12 +43,11 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginEnd="-16dp"
-        android:layout_marginRight="-16dp"
         android:clipToPadding="false"
         android:gravity="end|center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:visibility="gone">
 
         <ImageView
@@ -59,4 +58,4 @@
     </LinearLayout>
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/pref_library_columns.xml b/app/src/main/res/layout/pref_library_columns.xml
index eab84cc2e7..ca5fa23f55 100644
--- a/app/src/main/res/layout/pref_library_columns.xml
+++ b/app/src/main/res/layout/pref_library_columns.xml
@@ -5,8 +5,8 @@
               android:layout_height="match_parent"
               android:orientation="horizontal"
               android:paddingBottom="@dimen/dialog_content_padding"
-              android:paddingLeft="@dimen/dialog_content_padding"
-              android:paddingRight="@dimen/dialog_content_padding"
+              android:paddingStart="@dimen/dialog_content_padding"
+              android:paddingEnd="@dimen/dialog_content_padding"
               android:paddingTop="@dimen/dialog_margin_top_content">
 
     <LinearLayout
@@ -53,4 +53,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml
index 68b51b3a39..74940f2cd3 100644
--- a/app/src/main/res/layout/reader_color_filter.xml
+++ b/app/src/main/res/layout/reader_color_filter.xml
@@ -10,7 +10,7 @@
         android:id="@+id/spinner_end"
         android:layout_width="16dp"
         android:layout_height="0dp"
-        app:layout_constraintLeft_toRightOf="parent" />
+        app:layout_constraintStart_toEndOf="parent" />
 
     <!-- Color filter -->
 
@@ -20,8 +20,8 @@
         android:layout_height="wrap_content"
         android:text="@string/pref_custom_color_filter"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <!-- Red filter -->
 
@@ -30,12 +30,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:max="255"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
         app:layout_constraintTop_toBottomOf="@id/switch_color_filter"
-        app:layout_constraintLeft_toRightOf="@id/txt_color_filter_red_symbol"
-        app:layout_constraintRight_toLeftOf="@id/txt_color_filter_red_value" />
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_red_symbol"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value" />
 
     <TextView
         android:id="@+id/txt_color_filter_red_symbol"
@@ -45,18 +45,17 @@
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <TextView
         android:id="@+id/txt_color_filter_red_value"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"/>
 
     <!-- Green filter -->
 
@@ -65,12 +64,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:max="255"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintLeft_toRightOf="@id/txt_color_filter_green_symbol"
-        app:layout_constraintRight_toLeftOf="@id/txt_color_filter_green_value" />
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_green_symbol"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value" />
 
     <TextView
         android:id="@+id/txt_color_filter_green_symbol"
@@ -80,18 +79,17 @@
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <TextView
         android:id="@+id/txt_color_filter_green_value"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"/>
 
     <!-- Blue filter -->
 
@@ -100,12 +98,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:max="255"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintLeft_toRightOf="@id/txt_color_filter_blue_symbol"
-        app:layout_constraintRight_toLeftOf="@id/txt_color_filter_blue_value" />
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_blue_symbol"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value" />
 
     <TextView
         android:id="@+id/txt_color_filter_blue_symbol"
@@ -115,18 +113,17 @@
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <TextView
         android:id="@+id/txt_color_filter_blue_value"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"/>
 
     <!-- Alpha filter -->
 
@@ -135,12 +132,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:max="255"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintLeft_toRightOf="@id/txt_color_filter_alpha_symbol"
-        app:layout_constraintRight_toLeftOf="@id/txt_color_filter_alpha_value" />
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_alpha_symbol"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value" />
 
     <TextView
         android:id="@+id/txt_color_filter_alpha_symbol"
@@ -150,18 +147,17 @@
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <TextView
         android:id="@+id/txt_color_filter_alpha_value"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"/>
 
     <!-- Filter mode -->
 
@@ -170,8 +166,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_color_filter_mode"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/color_filter_mode"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/color_filter_mode"
         app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"/>
 
     <androidx.appcompat.widget.AppCompatSpinner
@@ -181,8 +177,8 @@
         android:layout_marginTop="16dp"
         android:entries="@array/color_filter_modes"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintLeft_toRightOf="@id/verticalcenter"
-        app:layout_constraintRight_toRightOf="@id/spinner_end" />
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
 
     <!-- Brightness -->
 
@@ -200,12 +196,12 @@
         android:id="@+id/brightness_seekbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
         app:layout_constraintTop_toBottomOf="@id/custom_brightness"
-        app:layout_constraintLeft_toRightOf="@id/txt_brightness_seekbar_icon"
-        app:layout_constraintRight_toLeftOf="@id/txt_brightness_seekbar_value"
+        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
+        app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
         app:max_seek="100"
         app:min_seek="-75" />
 
@@ -218,7 +214,7 @@
         app:srcCompat="@drawable/ic_brightness_5_black_24dp"
         app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
         app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <TextView
         android:id="@+id/txt_brightness_seekbar_value"
@@ -227,7 +223,7 @@
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
         app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"/>
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/verticalcenter"
diff --git a/app/src/main/res/layout/reader_page_sheet.xml b/app/src/main/res/layout/reader_page_sheet.xml
index 446f00d617..2cd9b7d96a 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -11,9 +11,7 @@
         android:id="@+id/set_as_cover_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingLeft="16dp"
         android:paddingStart="16dp"
-        android:paddingRight="16dp"
         android:paddingEnd="16dp"
         android:gravity="center"
         android:clickable="true"
@@ -29,7 +27,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="32dp"
             android:layout_marginStart="32dp"
             android:text="@string/set_as_cover"/>
 
@@ -39,9 +36,7 @@
         android:id="@+id/share_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingLeft="16dp"
         android:paddingStart="16dp"
-        android:paddingRight="16dp"
         android:paddingEnd="16dp"
         android:gravity="center"
         android:clickable="true"
@@ -56,7 +51,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="32dp"
             android:layout_marginStart="32dp"
             android:text="@string/action_share"/>
 
@@ -66,9 +60,7 @@
         android:id="@+id/save_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingLeft="16dp"
         android:paddingStart="16dp"
-        android:paddingRight="16dp"
         android:paddingEnd="16dp"
         android:gravity="center"
         android:clickable="true"
@@ -84,7 +76,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="32dp"
             android:layout_marginStart="32dp"
             android:text="@string/action_save"/>
 
diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml
index f18cc12c98..20e9d3286b 100644
--- a/app/src/main/res/layout/reader_settings_sheet.xml
+++ b/app/src/main/res/layout/reader_settings_sheet.xml
@@ -19,32 +19,32 @@
         android:text="@string/pref_category_general"
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/pull_up_for_more"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:text="@string/reader_pull_up_for_more_options"
         android:textColor="?android:attr/textColorHint"
-        app:layout_constraintLeft_toRightOf="@id/general_prefs"
+        app:layout_constraintStart_toEndOf="@id/general_prefs"
         app:layout_constraintTop_toTopOf="@id/general_prefs" />
 
     <androidx.legacy.widget.Space
         android:id="@+id/spinner_end"
         android:layout_width="16dp"
         android:layout_height="0dp"
-        app:layout_constraintLeft_toRightOf="parent" />
+        app:layout_constraintStart_toEndOf="parent" />
 
     <TextView
         android:id="@+id/viewer_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/viewer_for_this_series"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalcenter"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/verticalcenter"
         app:layout_constraintBaseline_toBaselineOf="@id/viewer" />
 
     <androidx.appcompat.widget.AppCompatSpinner
@@ -54,8 +54,8 @@
         android:layout_marginTop="16dp"
         android:entries="@array/viewers_selector"
         app:layout_constraintTop_toBottomOf="@id/pull_up_for_more"
-        app:layout_constraintLeft_toRightOf="@id/verticalcenter"
-        app:layout_constraintRight_toRightOf="@id/spinner_end" />
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
 
     <TextView
         android:id="@+id/rotation_mode_text"
@@ -63,8 +63,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/pref_rotation_type"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalcenter"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/verticalcenter"
         app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode" />
 
     <androidx.appcompat.widget.AppCompatSpinner
@@ -74,16 +74,16 @@
         android:layout_marginTop="16dp"
         android:entries="@array/rotation_type"
         app:layout_constraintTop_toBottomOf="@id/viewer"
-        app:layout_constraintLeft_toRightOf="@id/verticalcenter"
-        app:layout_constraintRight_toRightOf="@id/spinner_end" />
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
 
     <TextView
         android:id="@+id/background_color_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_reader_theme"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/background_color"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/background_color"
         app:layout_constraintBaseline_toBaselineOf="@id/background_color"/>
 
     <androidx.appcompat.widget.AppCompatSpinner
@@ -93,8 +93,8 @@
         android:layout_marginTop="16dp"
         android:entries="@array/reader_themes"
         app:layout_constraintTop_toBottomOf="@id/rotation_mode"
-        app:layout_constraintLeft_toRightOf="@id/verticalcenter"
-        app:layout_constraintRight_toRightOf="@id/spinner_end" />
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/show_page_number"
@@ -159,7 +159,7 @@
         android:text="@string/pager_viewer"
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/end_general_preferences" />
 
     <TextView
@@ -167,8 +167,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_image_scale_type"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalcenter"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/verticalcenter"
         app:layout_constraintBaseline_toBaselineOf="@id/scale_type"/>
 
     <androidx.appcompat.widget.AppCompatSpinner
@@ -177,8 +177,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/image_scale_type"
-        app:layout_constraintLeft_toRightOf="@id/verticalcenter"
-        app:layout_constraintRight_toRightOf="@id/spinner_end"
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintTop_toBottomOf="@id/pager_prefs"/>
 
     <TextView
@@ -186,8 +186,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_zoom_start"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalcenter"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/verticalcenter"
         app:layout_constraintBaseline_toBaselineOf="@id/zoom_start"/>
 
     <androidx.appcompat.widget.AppCompatSpinner
@@ -197,8 +197,8 @@
         android:entries="@array/zoom_start"
         android:layout_marginTop="16dp"
         app:layout_constraintTop_toBottomOf="@id/scale_type"
-        app:layout_constraintLeft_toRightOf="@id/verticalcenter"
-        app:layout_constraintRight_toRightOf="@id/spinner_end" />
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/crop_borders"
@@ -228,7 +228,7 @@
         android:text="@string/webtoon_viewer"
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/end_general_preferences" />
 
     <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/layout/recent_chapters_item.xml b/app/src/main/res/layout/recent_chapters_item.xml
index 4fc025ad3e..2bbf80d5ae 100644
--- a/app/src/main/res/layout/recent_chapters_item.xml
+++ b/app/src/main/res/layout/recent_chapters_item.xml
@@ -11,12 +11,10 @@
         android:id="@+id/manga_cover"
         android:layout_width="56dp"
         android:layout_height="0dp"
-        android:paddingLeft="16dp"
         android:paddingStart="16dp"
-        android:paddingRight="0dp"
         android:paddingEnd="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/tachiyomi_circle" />
 
@@ -24,14 +22,13 @@
         android:id="@+id/manga_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Body1"
         app:layout_constraintBottom_toTopOf="@+id/chapter_title"
-        app:layout_constraintLeft_toRightOf="@+id/manga_cover"
-        app:layout_constraintRight_toLeftOf="@+id/chapter_menu"
+        app:layout_constraintStart_toEndOf="@+id/manga_cover"
+        app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Manga title" />
@@ -40,16 +37,14 @@
         android:id="@+id/chapter_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_marginRight="8dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Caption"
-        app:layout_constraintLeft_toRightOf="@+id/manga_cover"
+        app:layout_constraintStart_toEndOf="@+id/manga_cover"
         app:layout_constraintTop_toBottomOf="@+id/manga_title"
-        app:layout_constraintRight_toLeftOf="@+id/download_text"
+        app:layout_constraintEnd_toStartOf="@+id/download_text"
         app:layout_constraintBottom_toBottomOf="parent"
         tools:text="Chapter title" />
 
@@ -57,12 +52,11 @@
         android:id="@+id/download_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="3dp"
         android:textAllCaps="true"
         android:textSize="12sp"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         tools:text="Downloaded" />
 
@@ -72,7 +66,7 @@
         android:layout_height="0dp"
         android:paddingBottom="18dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
@@ -80,8 +74,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_gravity="center|end"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp" />
+            android:layout_marginEnd="16dp" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/recent_chapters_section_item.xml b/app/src/main/res/layout/recent_chapters_section_item.xml
index e8fbaf52a1..29d82660cc 100644
--- a/app/src/main/res/layout/recent_chapters_section_item.xml
+++ b/app/src/main/res/layout/recent_chapters_section_item.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -7,8 +6,6 @@
     android:background="?attr/colorPrimary"
     android:gravity="center_vertical"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:elevation="4dp">
 
diff --git a/app/src/main/res/layout/recently_read_item.xml b/app/src/main/res/layout/recently_read_item.xml
index 08eb39ea3c..99c7f1ec3e 100644
--- a/app/src/main/res/layout/recently_read_item.xml
+++ b/app/src/main/res/layout/recently_read_item.xml
@@ -65,8 +65,10 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_toEndOf="@id/remove"
-                android:layout_toRightOf="@id/remove"
                 android:text="@string/action_resume"/>
+
         </RelativeLayout>
+
     </LinearLayout>
+
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 3dff2a7797..b15dcb88e3 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -15,7 +15,7 @@
             android:layout_width="48dp"
             android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:clickable="true"
             tools:background="#2E51A2">
@@ -36,8 +36,8 @@
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
             android:padding="16dp"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
@@ -51,7 +51,6 @@
                 style="@style/TextAppearance.Medium.Button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:ellipsize="middle"
                 android:gravity="end"
@@ -65,12 +64,10 @@
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginStart="16dp"
             android:background="?android:attr/divider"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/title_container" />
 
         <LinearLayout
@@ -80,8 +77,8 @@
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
             android:padding="16dp"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/divider1">
 
             <TextView
@@ -95,7 +92,6 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:gravity="end"
                 tools:text="Reading" />
@@ -107,12 +103,10 @@
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginStart="16dp"
             android:background="?android:attr/divider"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/status_container" />
 
         <LinearLayout
@@ -122,8 +116,8 @@
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
             android:padding="16dp"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/divider2">
 
             <TextView
@@ -137,7 +131,6 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:gravity="end"
                 tools:text="12/24" />
@@ -149,12 +142,10 @@
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginStart="16dp"
             android:background="?android:attr/divider"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/chapters_container" />
 
         <LinearLayout
@@ -164,8 +155,8 @@
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
             android:padding="16dp"
-            app:layout_constraintLeft_toRightOf="@+id/logo_container"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/logo_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/divider3">
 
             <TextView
@@ -179,7 +170,6 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:gravity="end"
                 tools:text="10" />
diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index 2f9bf182ef..c92bc525d0 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -20,8 +20,6 @@
             android:layout_marginBottom="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
             android:contentDescription="@string/description_cover"
             android:scaleType="centerCrop"
@@ -35,8 +33,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:maxLines="3"
@@ -51,7 +47,6 @@
             android:id="@+id/track_search_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:text="@string/track_type"
@@ -65,7 +60,6 @@
             android:id="@+id/track_search_type_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@@ -79,7 +73,6 @@
             android:id="@+id/track_search_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:text="@string/track_start_date"
@@ -93,7 +86,6 @@
             android:id="@+id/track_search_start_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@@ -107,7 +99,6 @@
             android:id="@+id/track_search_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:text="@string/track_status"
@@ -121,24 +112,21 @@
             android:id="@+id/track_search_status_result"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/track_search_status"
             app:layout_constraintTop_toBottomOf="@id/track_search_start"
-            tools:text="Ongoing"
-            />
+            tools:text="Ongoing" />
 
         <TextView
             android:id="@+id/track_search_summary"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginBottom="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
             android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:maxLines="7"
@@ -160,4 +148,5 @@
             app:layout_constraintGuide_begin="150dp"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.cardview.widget.CardView>