diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64d5c1edd..a96d137cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
   <application
     android:name=".KiwixApp"
     android:icon="@mipmap/ic_launcher"
-    android:roundIcon="@mipmap/ic_launcher_round">
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:supportsRtl="true">
     <activity
       android:name=".splash.KiwixSplashActivity"
       android:label="@string/app_name"
diff --git a/app/src/main/res/layout/activity_local_file_transfer.xml b/app/src/main/res/layout/activity_local_file_transfer.xml
index a33eb1741..0a0571f02 100644
--- a/app/src/main/res/layout/activity_local_file_transfer.xml
+++ b/app/src/main/res/layout/activity_local_file_transfer.xml
@@ -17,16 +17,16 @@
     android:layout_marginStart="15dp"
     android:layout_marginLeft="15dp"
     android:background="@android:color/transparent"
-    android:paddingLeft="5dp"
+    android:paddingStart="5dp"
     android:paddingTop="5dp"
-    android:paddingRight="5dp"
+    android:paddingEnd="5dp"
     android:paddingBottom="1dp"
     android:text="@string/your_device"
     android:textSize="13sp"
     android:textStyle="italic"
     app:layout_constraintHorizontal_bias="0.0"
-    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/app_bar" />
 
   <TextView
@@ -36,15 +36,15 @@
     android:layout_marginStart="15dp"
     android:layout_marginLeft="15dp"
     android:background="@android:color/transparent"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
+    android:paddingStart="5dp"
+    android:paddingEnd="5dp"
     android:paddingBottom="5dp"
     android:textIsSelectable="true"
     android:textSize="17sp"
     android:textStyle="bold"
     app:layout_constraintHorizontal_bias="0.0"
-    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/text_view_your_device"
     tools:hint="Device Name" />
 
@@ -52,11 +52,11 @@
     android:id="@+id/view_device_list_boundary"
     android:layout_width="match_parent"
     android:layout_height="2dp"
-    android:layout_marginLeft="5dp"
-    android:layout_marginRight="5dp"
+    android:layout_marginStart="5dp"
+    android:layout_marginEnd="5dp"
     android:background="@color/accent"
-    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/text_view_device_name" />
 
   <TextView
@@ -69,8 +69,8 @@
     android:text="@string/nearby_devices"
     android:textSize="16sp"
     app:fontFamily="monospace"
-    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/view_device_list_boundary" />
 
   <androidx.recyclerview.widget.RecyclerView
@@ -79,8 +79,8 @@
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
     android:visibility="invisible"
-    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/text_view_available_device"
     app:layout_constraintVertical_bias="0.0" />
 
@@ -92,8 +92,8 @@
     android:background="@android:color/transparent"
     android:gravity="center"
     android:text="@string/no_devices_found"
-    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/text_view_available_device" />
 
   <ProgressBar
@@ -104,21 +104,21 @@
     android:background="@android:color/transparent"
     android:indeterminate="true"
     android:visibility="gone"
-    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/text_view_available_device" />
 
   <View
     android:id="@+id/view_file_list_boundary"
     android:layout_width="match_parent"
     android:layout_height="1dp"
-    android:layout_marginLeft="5dp"
+    android:layout_marginStart="5dp"
     android:layout_marginTop="200dp"
-    android:layout_marginRight="5dp"
+    android:layout_marginEnd="5dp"
     android:background="@color/accent"
     app:layout_constraintBottom_toTopOf="@+id/text_view_files_for_transfer"
-    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/text_view_available_device" />
 
   <TextView
@@ -132,8 +132,8 @@
     android:textSize="16sp"
     app:fontFamily="monospace"
     app:layout_constraintBottom_toTopOf="@id/recycler_view_transfer_files"
-    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/view_file_list_boundary" />
 
   <androidx.recyclerview.widget.RecyclerView
@@ -142,8 +142,8 @@
     android:layout_height="0dp"
     android:background="@android:color/transparent"
     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/text_view_files_for_transfer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_zim_host.xml b/app/src/main/res/layout/activity_zim_host.xml
index f7e2da6bc..6eed8ce08 100644
--- a/app/src/main/res/layout/activity_zim_host.xml
+++ b/app/src/main/res/layout/activity_zim_host.xml
@@ -28,8 +28,8 @@
     android:layout_marginBottom="8dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:layout_constraintBottom_toTopOf="@+id/startServerButton"
-    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/serverTextView" />
 
   <Button
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index b3a25591f..4cb54778d 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -6,16 +6,16 @@
   android:layout_height="wrap_content"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
-  android:paddingLeft="@dimen/activity_horizontal_margin"
+  android:paddingStart="@dimen/activity_horizontal_margin"
   android:paddingTop="@dimen/activity_vertical_margin"
-  android:paddingRight="@dimen/activity_horizontal_margin">
+  android:paddingEnd="@dimen/activity_horizontal_margin">
 
   <ImageView
     android:id="@+id/libraryDownloadFavicon"
     android:layout_width="@dimen/favicon_width"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginRight="@dimen/favicon_margin_right"
+    android:layout_marginEnd="@dimen/favicon_margin_right"
     android:adjustViewBounds="true"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:scaleType="fitCenter"
@@ -85,8 +85,8 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
-      android:layout_marginLeft="@dimen/stop_horizontal_margin"
-      android:layout_marginRight="@dimen/stop_horizontal_margin"
+      android:layout_marginStart="@dimen/stop_horizontal_margin"
+      android:layout_marginEnd="@dimen/stop_horizontal_margin"
       android:layout_weight="0.5"
       android:minWidth="@dimen/stop_min_width"
       android:minHeight="@dimen/stop_min_height"
diff --git a/app/src/main/res/layout/item_library.xml b/app/src/main/res/layout/item_library.xml
index df22a108f..3c82b31eb 100644
--- a/app/src/main/res/layout/item_library.xml
+++ b/app/src/main/res/layout/item_library.xml
@@ -13,8 +13,8 @@
     android:id="@+id/libraryBookFavicon"
     android:layout_width="@dimen/favicon_width"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/activity_horizontal_margin"
-    android:layout_marginRight="@dimen/favicon_margin_right"
+    android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginEnd="@dimen/favicon_margin_right"
     android:adjustViewBounds="true"
     android:scaleType="fitCenter"
     android:src="@mipmap/ic_launcher"
@@ -28,7 +28,7 @@
     style="@style/list_item_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/favicon_margin_right"
+    android:layout_marginStart="@dimen/favicon_margin_right"
     android:layout_marginTop="@dimen/activity_horizontal_margin"
     app:layout_constraintStart_toEndOf="@+id/libraryBookFavicon"
     app:layout_constraintTop_toTopOf="parent"
@@ -39,7 +39,7 @@
     style="@style/list_item_body"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:layout_marginRight="@dimen/activity_horizontal_margin"
+    android:layout_marginEnd="@dimen/activity_horizontal_margin"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="@+id/libraryBookTitle"
     app:layout_constraintTop_toBottomOf="@+id/libraryBookTitle"
@@ -79,7 +79,7 @@
     style="@style/list_item_body"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginRight="@dimen/activity_horizontal_margin"
+    android:layout_marginEnd="@dimen/activity_horizontal_margin"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="@+id/libraryBookSize"
     tools:text="Date" />
diff --git a/app/src/main/res/layout/item_transfer_list.xml b/app/src/main/res/layout/item_transfer_list.xml
index fc3ab7532..859b75c5c 100644
--- a/app/src/main/res/layout/item_transfer_list.xml
+++ b/app/src/main/res/layout/item_transfer_list.xml
@@ -12,15 +12,15 @@
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
     android:gravity="center_vertical"
-    android:paddingLeft="5dp"
+    android:paddingStart="5dp"
     android:paddingTop="1dp"
-    android:paddingRight="5dp"
+    android:paddingEnd="5dp"
     android:paddingBottom="1dp"
     android:textIsSelectable="true"
     android:textSize="14sp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintHorizontal_bias="0.0"
-    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:hint="File name" />
 
@@ -29,7 +29,7 @@
     android:layout_width="wrap_content"
     android:layout_height="0dp"
     android:background="@android:color/transparent"
-    android:paddingLeft="5dp"
+    android:paddingStart="5dp"
     android:paddingTop="1dp"
     android:paddingEnd="5dp"
     android:paddingRight="5dp"
@@ -37,8 +37,8 @@
     android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
-    app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
-    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintStart_toEndOf="@id/text_view_file_item_name"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
 
   <ImageView
@@ -49,15 +49,15 @@
     android:layout_marginRight="12dp"
     android:background="@android:color/transparent"
     android:contentDescription="@string/status"
-    android:paddingLeft="5dp"
+    android:paddingStart="5dp"
     android:paddingTop="1dp"
     android:paddingEnd="5dp"
     android:paddingRight="5dp"
     android:paddingBottom="1dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
-    app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
-    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintStart_toEndOf="@id/text_view_file_item_name"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     app:srcCompat="@drawable/ic_baseline_wait_24px" />
 
diff --git a/app/src/main/res/layout/library_divider.xml b/app/src/main/res/layout/library_divider.xml
index 225ae2536..124e0e65b 100644
--- a/app/src/main/res/layout/library_divider.xml
+++ b/app/src/main/res/layout/library_divider.xml
@@ -4,9 +4,9 @@
   android:layout_height="wrap_content"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
-  android:paddingLeft="@dimen/activity_horizontal_margin"
+  android:paddingStart="@dimen/activity_horizontal_margin"
   android:paddingTop="@dimen/activity_vertical_margin"
-  android:paddingRight="@dimen/activity_horizontal_margin"
+  android:paddingEnd="@dimen/activity_horizontal_margin"
   android:paddingBottom="@dimen/dimen_medium_padding">
 
   <TextView
diff --git a/app/src/main/res/layout/row_peer_device.xml b/app/src/main/res/layout/row_peer_device.xml
index b824cce1e..d2ad6dd87 100644
--- a/app/src/main/res/layout/row_peer_device.xml
+++ b/app/src/main/res/layout/row_peer_device.xml
@@ -13,9 +13,9 @@
     android:layout_weight="3"
     android:background="@android:color/transparent"
     android:gravity="center_horizontal"
-    android:paddingLeft="5dp"
+    android:paddingStart="5dp"
     android:paddingTop="1dp"
-    android:paddingRight="5dp"
+    android:paddingEnd="5dp"
     android:paddingBottom="1dp"
     android:textIsSelectable="false"
     android:textSize="17sp"
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index b5e18aaac..f4849e3f6 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -20,7 +20,7 @@ import org.gradle.api.JavaVersion
 
 object Config {
   const val compileSdk = 28
-  const val minSdk = 15
+  const val minSdk = 17
   const val targetSdk = 28
   val javaVersion = JavaVersion.VERSION_1_8
 }
diff --git a/core/src/main/res/layout/content_main.xml b/core/src/main/res/layout/content_main.xml
index 6e0c1b663..74ea2ee69 100644
--- a/core/src/main/res/layout/content_main.xml
+++ b/core/src/main/res/layout/content_main.xml
@@ -44,7 +44,7 @@
           android:layout_margin="@dimen/activity_horizontal_margin"
           android:text="@string/download_books"
           app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintRight_toRightOf="parent" />
+          app:layout_constraintEnd_toEndOf="parent" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
diff --git a/core/src/main/res/layout/dialog_add_note.xml b/core/src/main/res/layout/dialog_add_note.xml
index d39f96348..51ecd5c46 100644
--- a/core/src/main/res/layout/dialog_add_note.xml
+++ b/core/src/main/res/layout/dialog_add_note.xml
@@ -11,8 +11,8 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     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/app_bar">
 
     <LinearLayout
@@ -27,17 +27,17 @@
         android:background="@android:color/transparent"
         android:hint="@string/wiki_article_title"
         android:maxLines="1"
-        android:paddingLeft="20dp"
+        android:paddingStart="20dp"
         android:paddingTop="10dp"
-        android:paddingRight="20dp"
+        android:paddingEnd="20dp"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" />
 
       <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginEnd="15dp"
         android:layout_marginBottom="5dp"
         android:background="#000000" />
 
@@ -46,13 +46,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
-        android:gravity="top|left"
+        android:gravity="top|start"
         android:hint="@string/note"
         android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
         android:minLines="6"
-        android:paddingLeft="20dp"
+        android:paddingStart="20dp"
         android:paddingTop="5dp"
-        android:paddingRight="20dp"
+        android:paddingEnd="20dp"
         android:paddingBottom="10dp"
         android:scrollbars="vertical"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
diff --git a/core/src/main/res/layout/item_book.xml b/core/src/main/res/layout/item_book.xml
index 52c090cc9..b3213bcad 100644
--- a/core/src/main/res/layout/item_book.xml
+++ b/core/src/main/res/layout/item_book.xml
@@ -120,8 +120,8 @@
     android:layout_height="0dp"
     android:background="?android:attr/selectableItemBackground"
     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_toTopOf="parent"
     tools:visibility="gone" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/src/main/res/layout/kiwix_search_widget.xml b/core/src/main/res/layout/kiwix_search_widget.xml
index fb7ad24d4..37da6d782 100644
--- a/core/src/main/res/layout/kiwix_search_widget.xml
+++ b/core/src/main/res/layout/kiwix_search_widget.xml
@@ -3,8 +3,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="@dimen/kiwix_search_widget_layout_id_height"
-  android:layout_marginLeft="@dimen/kiwix_search_widget_margin"
-  android:layout_marginRight="@dimen/kiwix_search_widget_margin"
+  android:layout_marginStart="@dimen/kiwix_search_widget_margin"
+  android:layout_marginEnd="@dimen/kiwix_search_widget_margin"
   android:background="@drawable/search_widget_background"
   android:gravity="center_vertical"
   android:orientation="horizontal"
diff --git a/core/src/main/res/layout/section_list.xml b/core/src/main/res/layout/section_list.xml
index 9f9c9041a..c8c8d1ce9 100644
--- a/core/src/main/res/layout/section_list.xml
+++ b/core/src/main/res/layout/section_list.xml
@@ -13,14 +13,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_centerVertical="true"
-    android:layout_marginLeft="@dimen/title_text_margin"
-    android:layout_marginRight="@dimen/title_text_margin"
+    android:layout_marginStart="@dimen/title_text_margin"
+    android:layout_marginEnd="@dimen/title_text_margin"
     android:ellipsize="end"
     android:fontFamily="sans-serif-light"
     android:gravity="center_vertical"
     android:maxLines="1"
     android:minHeight="?listPreferredItemHeightSmall"
-    android:paddingLeft="@dimen/title_text_padding"
+    android:paddingStart="@dimen/title_text_padding"
     android:textAppearance="?textAppearanceBody1"
     tools:text="Some text" />
 
diff --git a/core/src/main/res/layout/slider_dialog.xml b/core/src/main/res/layout/slider_dialog.xml
index fe3ffc906..c094588bd 100644
--- a/core/src/main/res/layout/slider_dialog.xml
+++ b/core/src/main/res/layout/slider_dialog.xml
@@ -3,9 +3,9 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
-  android:paddingLeft="@dimen/slider_dialog_horizontal_padding"
+  android:paddingStart="@dimen/slider_dialog_horizontal_padding"
   android:paddingTop="@dimen/dimen_medium_padding"
-  android:paddingRight="@dimen/slider_dialog_horizontal_padding"
+  android:paddingEnd="@dimen/slider_dialog_horizontal_padding"
   android:paddingBottom="@dimen/dimen_medium_padding">
 
   <TextView
diff --git a/core/src/main/res/layout/webview_search.xml b/core/src/main/res/layout/webview_search.xml
index 3841612e1..971b9cc6e 100644
--- a/core/src/main/res/layout/webview_search.xml
+++ b/core/src/main/res/layout/webview_search.xml
@@ -23,7 +23,7 @@
     android:id="@+id/edit"
     android:layout_width="0dip"
     android:layout_height="wrap_content"
-    android:layout_marginRight="@dimen/webview_search_edit_text_margin_right"
+    android:layout_marginEnd="@dimen/webview_search_edit_text_margin_right"
     android:layout_weight="1"
     android:focusableInTouchMode="true"
     android:hint="@string/search_label"
diff --git a/custom/src/main/AndroidManifest.xml b/custom/src/main/AndroidManifest.xml
index ddaa8abb1..a2e338144 100644
--- a/custom/src/main/AndroidManifest.xml
+++ b/custom/src/main/AndroidManifest.xml
@@ -6,7 +6,8 @@
   <application
     android:name=".CustomApp"
     android:icon="@mipmap/ic_launcher"
-    android:roundIcon="@mipmap/ic_launcher_round">
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:supportsRtl="true">
     <activity
       android:name=".splash.CustomSplashActivity"
       android:label="@string/app_name"
diff --git a/custom/src/main/res/layout/activity_custom_download.xml b/custom/src/main/res/layout/activity_custom_download.xml
index 4c9b5478f..ffec0624b 100644
--- a/custom/src/main/res/layout/activity_custom_download.xml
+++ b/custom/src/main/res/layout/activity_custom_download.xml
@@ -12,8 +12,8 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="100dp"
     android:src="@mipmap/ic_launcher_foreground"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
 
   <ViewAnimator
@@ -23,8 +23,8 @@
     android:inAnimation="@android:anim/fade_in"
     android:outAnimation="@android:anim/fade_out"
     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/cd_icon">
 
     <include layout="@layout/layout_custom_download_required" />
diff --git a/custom/src/main/res/layout/layout_custom_download_complete.xml b/custom/src/main/res/layout/layout_custom_download_complete.xml
index bcdb979d3..a0a8572ae 100644
--- a/custom/src/main/res/layout/layout_custom_download_complete.xml
+++ b/custom/src/main/res/layout/layout_custom_download_complete.xml
@@ -13,8 +13,8 @@
     android:gravity="center"
     android:text="@string/complete"
     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_toTopOf="parent"
     app:layout_constraintVertical_bias=".3" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/custom/src/main/res/layout/layout_custom_download_error.xml b/custom/src/main/res/layout/layout_custom_download_error.xml
index f1f5b99d7..4b8edb63e 100644
--- a/custom/src/main/res/layout/layout_custom_download_error.xml
+++ b/custom/src/main/res/layout/layout_custom_download_error.xml
@@ -13,8 +13,8 @@
     android:layout_height="wrap_content"
     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_toTopOf="parent"
     app:layout_constraintVertical_bias=".3" />
 
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="20dp"
     android:text="@string/retry"
-    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/cd_error_text" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/custom/src/main/res/layout/layout_custom_download_in_progress.xml b/custom/src/main/res/layout/layout_custom_download_in_progress.xml
index 14a99dc76..eefa43a79 100644
--- a/custom/src/main/res/layout/layout_custom_download_in_progress.xml
+++ b/custom/src/main/res/layout/layout_custom_download_in_progress.xml
@@ -10,8 +10,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     app:layout_constraintBottom_toTopOf="@id/cd_progress"
-    app:layout_constraintLeft_toLeftOf="@+id/cd_progress"
-    app:layout_constraintRight_toRightOf="@+id/cd_progress" />
+    app:layout_constraintStart_toStartOf="@+id/cd_progress"
+    app:layout_constraintEnd_toEndOf="@+id/cd_progress" />
 
   <ProgressBar
     android:id="@+id/cd_progress"
@@ -20,8 +20,8 @@
     android:layout_height="wrap_content"
     android:max="100"
     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_toTopOf="parent"
     app:layout_constraintVertical_bias=".3" />
 
diff --git a/custom/src/main/res/layout/layout_custom_download_required.xml b/custom/src/main/res/layout/layout_custom_download_required.xml
index 52ab465f5..65d926d59 100644
--- a/custom/src/main/res/layout/layout_custom_download_required.xml
+++ b/custom/src/main/res/layout/layout_custom_download_required.xml
@@ -13,8 +13,8 @@
     android:gravity="center"
     android:text="@string/invalid_installation"
     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_toTopOf="parent"
     app:layout_constraintVertical_bias=".3" />
 
@@ -24,8 +24,8 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="20dp"
     android:text="@string/download"
-    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/cd_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>