diff --git a/app/src/main/res/drawable/empty_drawable_32dp.xml b/app/src/main/res/drawable/empty_drawable_32dp.xml
index 09b50315dc..5658901914 100644
--- a/app/src/main/res/drawable/empty_drawable_32dp.xml
+++ b/app/src/main/res/drawable/empty_drawable_32dp.xml
@@ -1,8 +1,7 @@
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/transparent"/>
+    <solid android:color="@android:color/transparent" />
     <size
         android:width="32dp"
         android:height="32dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/gradient_shape.xml b/app/src/main/res/drawable/gradient_shape.xml
index a15e5c609a..1ea15750db 100644
--- a/app/src/main/res/drawable/gradient_shape.xml
+++ b/app/src/main/res/drawable/gradient_shape.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle" >
+    android:shape="rectangle">
 
     <gradient
         android:angle="90"
-        android:startColor="#aa000000"
         android:centerColor="#00000000"
-        android:endColor="#00ffffff"/>
+        android:endColor="#00ffffff"
+        android:startColor="#aa000000" />
 
     <corners android:radius="0dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/ic_indeterminate_check_box_24dp.xml b/app/src/main/res/drawable/ic_indeterminate_check_box_24dp.xml
index fd5f8ceede..1f089d1d7d 100644
--- a/app/src/main/res/drawable/ic_indeterminate_check_box_24dp.xml
+++ b/app/src/main/res/drawable/ic_indeterminate_check_box_24dp.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/black"
-      android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM17,13H7v-2h10V13z"/>
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM17,13H7v-2h10V13z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 8ee4861fa5..4c97c6d1ac 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,34 +1,34 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="108.0"
-        android:viewportHeight="108.0">
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108.0"
+    android:viewportHeight="108.0">
     <path
-        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
+        android:fillColor="#000"
         android:fillType="evenOdd"
-        android:fillColor="#000"/>
+        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z" />
     <path
-        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
+        android:fillColor="#2E84BF"
         android:fillType="evenOdd"
-        android:fillColor="#2E84BF"/>
+        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z" />
     <path
-        android:pathData="M7.5,12.01C7.5,9.24 9.74,7 12.5,7L17.5,7L17.5,102L12.5,102C9.74,102 7.5,99.77 7.5,96.99L7.5,12.01Z"
+        android:fillColor="#69A3CB"
         android:fillType="evenOdd"
-        android:fillColor="#69A3CB"/>
+        android:pathData="M7.5,12.01C7.5,9.24 9.74,7 12.5,7L17.5,7L17.5,102L12.5,102C9.74,102 7.5,99.77 7.5,96.99L7.5,12.01Z" />
     <path
-        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
+        android:fillColor="#000"
         android:fillType="evenOdd"
-        android:fillColor="#000"/>
+        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0" />
     <path
-        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
+        android:fillColor="#CE2828"
         android:fillType="evenOdd"
-        android:fillColor="#CE2828"/>
+        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0" />
     <path
-        android:pathData="M54,54.5m-19.94,0a19.94,19.94 0,1 1,39.87 0a19.94,19.94 0,1 1,-39.87 0"
+        android:fillColor="#FFF"
         android:fillType="evenOdd"
-        android:fillColor="#FFF"/>
+        android:pathData="M54,54.5m-19.94,0a19.94,19.94 0,1 1,39.87 0a19.94,19.94 0,1 1,-39.87 0" />
     <path
-        android:pathData="M52.04,46.3L47.42,46.3C46.14,46.3 44.93,46.23 44.2,46.14L44.2,49.76C45,49.65 46.16,49.6 47.42,49.6L60.58,49.6C61.86,49.6 63.02,49.65 63.82,49.76L63.82,46.14C63.09,46.23 61.86,46.3 60.58,46.3L55.69,46.3L55.69,45.07C55.69,44.43 55.73,43.95 55.82,43.45L51.9,43.45C51.99,44 52.04,44.43 52.04,45.07L52.04,46.3ZM46.78,60.68C45.46,60.68 44.29,60.63 43.45,60.52L43.45,64.14C44.34,64.03 45.46,63.98 46.78,63.98L61.29,63.98C62.57,63.98 63.71,64.03 64.57,64.14L64.57,60.52C63.73,60.63 62.57,60.68 61.29,60.68L58.24,60.68C59.33,58.06 59.99,56.23 60.7,53.91C61.34,51.81 61.34,51.81 61.56,51.13L57.58,50.06C57.51,50.93 57.37,51.52 56.89,53.41C56.19,56.14 55.32,58.74 54.5,60.68L46.78,60.68ZM46.48,51.36C47.55,54.02 48.28,56.53 49.03,60.15L52.66,58.9C51.65,54.98 50.92,52.66 49.94,50.11L46.48,51.36Z"
+        android:fillColor="#000"
         android:fillType="evenOdd"
-        android:fillColor="#000"/>
+        android:pathData="M52.04,46.3L47.42,46.3C46.14,46.3 44.93,46.23 44.2,46.14L44.2,49.76C45,49.65 46.16,49.6 47.42,49.6L60.58,49.6C61.86,49.6 63.02,49.65 63.82,49.76L63.82,46.14C63.09,46.23 61.86,46.3 60.58,46.3L55.69,46.3L55.69,45.07C55.69,44.43 55.73,43.95 55.82,43.45L51.9,43.45C51.99,44 52.04,44.43 52.04,45.07L52.04,46.3ZM46.78,60.68C45.46,60.68 44.29,60.63 43.45,60.52L43.45,64.14C44.34,64.03 45.46,63.98 46.78,63.98L61.29,63.98C62.57,63.98 63.71,64.03 64.57,64.14L64.57,60.52C63.73,60.63 62.57,60.68 61.29,60.68L58.24,60.68C59.33,58.06 59.99,56.23 60.7,53.91C61.34,51.81 61.34,51.81 61.56,51.13L57.58,50.06C57.51,50.93 57.37,51.52 56.89,53.41C56.19,56.14 55.32,58.74 54.5,60.68L46.78,60.68ZM46.48,51.36C47.55,54.02 48.28,56.53 49.03,60.15L52.66,58.9C51.65,54.98 50.92,52.66 49.94,50.11L46.48,51.36Z" />
 </vector>
diff --git a/app/src/main/res/drawable/manga_info_gradient.xml b/app/src/main/res/drawable/manga_info_gradient.xml
index d378ad2045..02692a50b0 100644
--- a/app/src/main/res/drawable/manga_info_gradient.xml
+++ b/app/src/main/res/drawable/manga_info_gradient.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle" >
+    android:shape="rectangle">
 
     <gradient
         android:angle="90"
-        android:startColor="#ffffffff"
-        android:endColor="#00ffffff"/>
+        android:endColor="#00ffffff"
+        android:startColor="#ffffffff" />
 
     <corners android:radius="0dp" />
 </shape>
diff --git a/app/src/main/res/drawable/ripple_dark.xml b/app/src/main/res/drawable/ripple_dark.xml
index 26f6902724..82fdde550b 100644
--- a/app/src/main/res/drawable/ripple_dark.xml
+++ b/app/src/main/res/drawable/ripple_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="?attr/rippleColor"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/rippleColor">
     <item android:drawable="@color/backgroundDark" />
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/drawable/ripple_light.xml b/app/src/main/res/drawable/ripple_light.xml
index 425e6e6767..a2bfca1d9d 100644
--- a/app/src/main/res/drawable/ripple_light.xml
+++ b/app/src/main/res/drawable/ripple_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="?attr/rippleColor"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/rippleColor">
     <item android:drawable="@color/backgroundLight" />
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/drawable/ripple_regular.xml b/app/src/main/res/drawable/ripple_regular.xml
index 6032d19cc3..d697f52330 100644
--- a/app/src/main/res/drawable/ripple_regular.xml
+++ b/app/src/main/res/drawable/ripple_regular.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="?attr/rippleColor"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/rippleColor" />
diff --git a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
index b7da6fdc35..ad99bbb47e 100644
--- a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="@color/colorPrimary"
@@ -14,9 +14,9 @@
         android:translateY="12">
         <path
             android:fillColor="@color/textColorPrimaryDark"
-            android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
+            android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
         <path
             android:fillColor="@color/textColorPrimaryDark"
-            android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/>
+            android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml
index 6617825eee..1d054fb765 100644
--- a/app/src/main/res/drawable/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable/sc_explore_48dp.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="@color/colorPrimary"
diff --git a/app/src/main/res/drawable/sc_history_48dp.xml b/app/src/main/res/drawable/sc_history_48dp.xml
index 8a2b52150a..ebf179e4d8 100644
--- a/app/src/main/res/drawable/sc_history_48dp.xml
+++ b/app/src/main/res/drawable/sc_history_48dp.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="@color/colorPrimary"
diff --git a/app/src/main/res/drawable/sc_new_releases_48dp.xml b/app/src/main/res/drawable/sc_new_releases_48dp.xml
index 338211308d..ac295ee81d 100644
--- a/app/src/main/res/drawable/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable/sc_new_releases_48dp.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="@color/colorPrimary"
diff --git a/app/src/main/res/layout/chapter_download_view.xml b/app/src/main/res/layout/chapter_download_view.xml
index 201d665f54..5653c4af69 100644
--- a/app/src/main/res/layout/chapter_download_view.xml
+++ b/app/src/main/res/layout/chapter_download_view.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="42dp"
     android:layout_height="42dp"
-    android:padding="8dp"
-    android:background="@drawable/ripple_regular">
+    android:background="@drawable/ripple_regular"
+    android:padding="8dp">
 
     <ImageView
         android:id="@+id/download_icon"
diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml
index afef9a3986..6fcdc726e4 100644
--- a/app/src/main/res/layout/chapters_item.xml
+++ b/app/src/main/res/layout/chapters_item.xml
@@ -54,8 +54,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/common_tabbed_sheet.xml b/app/src/main/res/layout/common_tabbed_sheet.xml
index 59976cf09a..8adb541458 100644
--- a/app/src/main/res/layout/common_tabbed_sheet.xml
+++ b/app/src/main/res/layout/common_tabbed_sheet.xml
@@ -21,11 +21,11 @@
             app:layout_constraintEnd_toStartOf="@+id/menu"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:tabRippleColor="?attr/rippleColor"
-            app:tabTextColor="@color/tabs_selector_background"
-            app:tabIndicatorColor="?attr/colorAccent"
             app:tabGravity="fill"
-            app:tabMode="fixed" />
+            app:tabIndicatorColor="?attr/colorAccent"
+            app:tabMode="fixed"
+            app:tabRippleColor="?attr/rippleColor"
+            app:tabTextColor="@color/tabs_selector_background" />
 
         <ImageButton
             android:id="@+id/menu"
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index e1bd58d781..5c593abc09 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -38,8 +38,8 @@
         android:id="@+id/chapter_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
         android:layout_toEndOf="@id/reorder"
         android:ellipsize="end"
         android:maxLines="1"
@@ -91,8 +91,8 @@
         android:layout_toEndOf="@id/download_progress_text"
         android:background="@drawable/ripple_regular"
         android:contentDescription="@string/action_menu"
-        android:paddingVertical="16dp"
         android:paddingHorizontal="10dp"
+        android:paddingVertical="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 5c35cdf1c1..745ef3885a 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -82,8 +82,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         app:itemIconTint="@color/nav_selector"
-        app:itemTextColor="@color/nav_selector"
         app:itemRippleColor="?attr/rippleNavColor"
+        app:itemTextColor="@color/nav_selector"
         app:labelVisibilityMode="labeled"
         app:layout_insetEdge="bottom"
         app:menu="@menu/main_nav" />
diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index 706c5cf517..9bfc791a45 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -142,10 +142,10 @@
             android:layout_marginStart="16dp"
             android:text="@string/add_to_library"
             app:icon="@drawable/ic_favorite_border_24dp"
-            app:rippleColor="?attr/rippleColor"
             app:layout_constraintEnd_toStartOf="@+id/btn_tracking"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/manga_info" />
+            app:layout_constraintTop_toBottomOf="@+id/manga_info"
+            app:rippleColor="?attr/rippleColor" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_tracking"
@@ -155,10 +155,10 @@
             android:text="@string/manga_tracking_tab"
             android:visibility="gone"
             app:icon="@drawable/ic_sync_24dp"
-            app:rippleColor="?attr/rippleColor"
             app:layout_constraintEnd_toStartOf="@+id/btn_webview"
             app:layout_constraintStart_toEndOf="@+id/btn_favorite"
             app:layout_constraintTop_toBottomOf="@+id/manga_info"
+            app:rippleColor="?attr/rippleColor"
             tools:visibility="visible" />
 
         <com.google.android.material.button.MaterialButton
@@ -170,10 +170,10 @@
             android:text="@string/action_web_view"
             android:visibility="gone"
             app:icon="@drawable/ic_public_24dp"
-            app:rippleColor="?attr/rippleColor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_tracking"
             app:layout_constraintTop_toBottomOf="@+id/manga_info"
+            app:rippleColor="?attr/rippleColor"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index e98107edd2..772122e56a 100644
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
     android:background="?android:attr/colorBackground"
+    android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
diff --git a/app/src/main/res/layout/navigation_view_spinner.xml b/app/src/main/res/layout/navigation_view_spinner.xml
index e253f4dd09..acab1c8f08 100644
--- a/app/src/main/res/layout/navigation_view_spinner.xml
+++ b/app/src/main/res/layout/navigation_view_spinner.xml
@@ -12,10 +12,10 @@
         android:id="@+id/nav_view_item_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="1"
-        android:layout_gravity="center"
         android:paddingEnd="8dp"
         tools:text="Filter:" />
 
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index 575d8181a8..94f4ece1b6 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -61,8 +61,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary" />
+            android:background="?attr/colorPrimary"
+            android:minHeight="?attr/actionBarSize" />
 
         <LinearLayout
             android:id="@+id/reader_menu_bottom"
diff --git a/app/src/main/res/layout/reader_color_filter_settings.xml b/app/src/main/res/layout/reader_color_filter_settings.xml
index 65288cddf2..804b5f1446 100644
--- a/app/src/main/res/layout/reader_color_filter_settings.xml
+++ b/app/src/main/res/layout/reader_color_filter_settings.xml
@@ -15,9 +15,9 @@
             android:id="@+id/switch_color_filter"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/pref_custom_color_filter"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:text="@string/pref_custom_color_filter"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -102,8 +102,8 @@
             android:id="@+id/txt_color_filter_blue_symbol"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/color_filter_b_value"
             android:paddingStart="16dp"
+            android:text="@string/color_filter_b_value"
             android:textAppearance="@style/TextAppearance.Medium.SubHeading"
             app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
             app:layout_constraintStart_toStartOf="parent"
@@ -162,8 +162,8 @@
             android:id="@+id/txt_color_filter_alpha_value"
             android:layout_width="30dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
             android:layout_alignParentEnd="true"
+            android:layout_marginEnd="16dp"
             android:textAppearance="@style/TextAppearance.Medium.SubHeading"
             app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
             app:layout_constraintEnd_toEndOf="parent"
@@ -187,8 +187,8 @@
             android:id="@+id/grayscale"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingEnd="16dp"
             android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             android:text="@string/pref_grayscale"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintTop_toBottomOf="@id/color_filter_mode" />
@@ -200,8 +200,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:paddingEnd="16dp"
             android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             android:text="@string/pref_custom_brightness"
             app:layout_constraintTop_toBottomOf="@id/grayscale" />
 
diff --git a/app/src/main/res/layout/reader_general_settings.xml b/app/src/main/res/layout/reader_general_settings.xml
index d2894b1a28..00e248ec1b 100644
--- a/app/src/main/res/layout/reader_general_settings.xml
+++ b/app/src/main/res/layout/reader_general_settings.xml
@@ -23,8 +23,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_show_page_number" />
+            android:text="@string/pref_show_page_number"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/fullscreen"
@@ -32,8 +32,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_fullscreen" />
+            android:text="@string/pref_fullscreen"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/cutout_short"
@@ -41,8 +41,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_cutout_short"
+            android:textColor="?android:attr/textColorSecondary"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -52,8 +52,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_keep_screen_on" />
+            android:text="@string/pref_keep_screen_on"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/long_tap"
@@ -61,8 +61,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_read_with_long_tap" />
+            android:text="@string/pref_read_with_long_tap"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/always_show_chapter_transition"
@@ -70,8 +70,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_always_show_chapter_transition" />
+            android:text="@string/pref_always_show_chapter_transition"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/page_transitions"
@@ -79,8 +79,8 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_page_transitions" />
+            android:text="@string/pref_page_transitions"
+            android:textColor="?android:attr/textColorSecondary" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/reader_pager_settings.xml b/app/src/main/res/layout/reader_pager_settings.xml
index fb6249eac8..ccd148b0dd 100644
--- a/app/src/main/res/layout/reader_pager_settings.xml
+++ b/app/src/main/res/layout/reader_pager_settings.xml
@@ -10,9 +10,9 @@
         android:id="@+id/pager_prefs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pager_viewer"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:text="@string/pager_viewer"
         android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
 
     <eu.kanade.tachiyomi.widget.MaterialSpinnerView
@@ -49,8 +49,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:text="@string/pref_crop_borders" />
+        android:text="@string/pref_crop_borders"
+        android:textColor="?android:attr/textColorSecondary" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/dual_page_split"
@@ -58,8 +58,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:text="@string/pref_dual_page_split" />
+        android:text="@string/pref_dual_page_split"
+        android:textColor="?android:attr/textColorSecondary" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/dual_page_invert"
@@ -67,8 +67,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/pref_dual_page_invert"
+        android:textColor="?android:attr/textColorSecondary"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/reader_reading_mode_settings.xml b/app/src/main/res/layout/reader_reading_mode_settings.xml
index d6e3581899..a258c63703 100644
--- a/app/src/main/res/layout/reader_reading_mode_settings.xml
+++ b/app/src/main/res/layout/reader_reading_mode_settings.xml
@@ -14,10 +14,10 @@
             android:id="@+id/for_this_series_prefs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/pref_category_for_this_series"
+            android:layout_marginTop="16dp"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:layout_marginTop="16dp"
+            android:text="@string/pref_category_for_this_series"
             android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
 
         <eu.kanade.tachiyomi.widget.MaterialSpinnerView
diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml
index f9f23788b2..91ad0b7730 100644
--- a/app/src/main/res/layout/reader_webtoon_settings.xml
+++ b/app/src/main/res/layout/reader_webtoon_settings.xml
@@ -10,9 +10,9 @@
         android:id="@+id/webtoon_prefs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/webtoon_viewer"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:text="@string/webtoon_viewer"
         android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
 
     <eu.kanade.tachiyomi.widget.MaterialSpinnerView
@@ -42,8 +42,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:text="@string/pref_crop_borders" />
+        android:text="@string/pref_crop_borders"
+        android:textColor="?android:attr/textColorSecondary" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/dual_page_split"
@@ -51,17 +51,17 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:text="@string/pref_dual_page_split" />
+        android:text="@string/pref_dual_page_split"
+        android:textColor="?android:attr/textColorSecondary" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/dual_page_invert"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/pref_dual_page_invert"
+        android:textColor="?android:attr/textColorSecondary"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/source_filter_sheet.xml b/app/src/main/res/layout/source_filter_sheet.xml
index 2bef6300c8..044075429d 100644
--- a/app/src/main/res/layout/source_filter_sheet.xml
+++ b/app/src/main/res/layout/source_filter_sheet.xml
@@ -42,8 +42,8 @@
         android:layout_height="0dp"
         android:layout_gravity="top"
         android:layout_weight="1"
-        android:paddingBottom="8dp"
         android:clipChildren="false"
-        android:clipToPadding="false" />
+        android:clipToPadding="false"
+        android:paddingBottom="8dp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/source_main_controller_card_item.xml b/app/src/main/res/layout/source_main_controller_card_item.xml
index 5ea31cfc03..cfe0bb83ec 100644
--- a/app/src/main/res/layout/source_main_controller_card_item.xml
+++ b/app/src/main/res/layout/source_main_controller_card_item.xml
@@ -48,7 +48,7 @@
         app:layout_constraintStart_toEndOf="@id/image"
         app:layout_constraintTop_toBottomOf="@+id/title"
         tools:text="English"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <Button
         android:id="@+id/source_latest"
diff --git a/app/src/main/res/layout/source_progress_item.xml b/app/src/main/res/layout/source_progress_item.xml
index c4ccef6f78..5a2988e280 100644
--- a/app/src/main/res/layout/source_progress_item.xml
+++ b/app/src/main/res/layout/source_progress_item.xml
@@ -1,9 +1,9 @@
 <?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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="8dp">
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
diff --git a/app/src/main/res/layout/spinner_preference.xml b/app/src/main/res/layout/spinner_preference.xml
index d58ae3af2b..354bf5b7b8 100644
--- a/app/src/main/res/layout/spinner_preference.xml
+++ b/app/src/main/res/layout/spinner_preference.xml
@@ -15,13 +15,13 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:attr/textColorSecondary"
         android:paddingEnd="8dp"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/center_guideline"
         app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Title" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/track_controller.xml b/app/src/main/res/layout/track_controller.xml
index 6db9156a1c..144d462359 100644
--- a/app/src/main/res/layout/track_controller.xml
+++ b/app/src/main/res/layout/track_controller.xml
@@ -4,7 +4,7 @@
     android:id="@+id/track_recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipToPadding="false"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
-    android:clipToPadding="false"
     tools:listitem="@layout/track_item" />
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 47b2f94717..7325d4b362 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -148,8 +148,8 @@
                 android:gravity="center"
                 android:maxLines="1"
                 android:padding="16dp"
-                app:layout_constraintStart_toEndOf="@+id/vert_divider_2"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/vert_divider_2"
                 app:layout_constraintTop_toBottomOf="@+id/top_divider"
                 tools:text="10" />
 
@@ -159,8 +159,8 @@
                 android:layout_height="1dp"
                 android:alpha="0.25"
                 android:background="?android:attr/textColorHint"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/track_score" />
 
             <TextView
@@ -173,8 +173,8 @@
                 android:gravity="center"
                 android:maxLines="1"
                 android:padding="16dp"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/vert_divider_3"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/bottom_divider"
                 tools:text="4/16/2020" />
 
@@ -187,8 +187,8 @@
                 android:alpha="0.25"
                 android:background="?android:attr/textColorHint"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/track_start_date"
                 app:layout_constraintEnd_toStartOf="@+id/track_finish_date"
+                app:layout_constraintStart_toEndOf="@+id/track_start_date"
                 app:layout_constraintTop_toTopOf="@+id/bottom_divider" />
 
             <TextView
@@ -201,8 +201,8 @@
                 android:gravity="center"
                 android:maxLines="1"
                 android:padding="16dp"
-                app:layout_constraintStart_toEndOf="@+id/vert_divider_3"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/vert_divider_3"
                 app:layout_constraintTop_toBottomOf="@+id/bottom_divider"
                 tools:text="4/16/2020" />
 
diff --git a/app/src/main/res/layout/updates_item.xml b/app/src/main/res/layout/updates_item.xml
index b7602a5f65..78974d3140 100644
--- a/app/src/main/res/layout/updates_item.xml
+++ b/app/src/main/res/layout/updates_item.xml
@@ -55,8 +55,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>