diff --git a/app/src/main/res/layout-w900dp/drug_list.xml b/app/src/main/res/layout-w900dp/drug_list.xml
index 6f8d0f6..ea61160 100644
--- a/app/src/main/res/layout-w900dp/drug_list.xml
+++ b/app/src/main/res/layout-w900dp/drug_list.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     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:baselineAligned="false"
     android:divider="?android:attr/dividerHorizontal"
     android:orientation="horizontal"
@@ -23,8 +23,8 @@
         android:name="net.foucry.pilldroid.MedicamentListFragment"
         android:layout_width="@dimen/item_width"
         android:layout_height="match_parent"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         app:layoutManager="LinearLayoutManager"
         tools:context="net.foucry.pilldroid.DrugListActivity"
         tools:listitem="@layout/drug_list_content" />
diff --git a/app/src/main/res/layout/custom_dialog_layout_one_button.xml b/app/src/main/res/layout/custom_dialog_layout_one_button.xml
index ccfe978..446a4a2 100644
--- a/app/src/main/res/layout/custom_dialog_layout_one_button.xml
+++ b/app/src/main/res/layout/custom_dialog_layout_one_button.xml
@@ -10,12 +10,12 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         app:cardCornerRadius="11dp"
         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">
 
         <LinearLayout
@@ -37,27 +37,27 @@
                 android:id="@id/msg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="22dp"
+                android:layout_marginStart="22dp"
                 android:layout_marginTop="18dp"
-                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
                 android:fontFamily="@font/opensans_semibold"
                 android:text="@string/app_name"
                 android:textColor="@color/grey"
                 android:textSize="15dp"
-                tools:ignore="HardcodedText,RtlHardcoded,SpUsage"/>
+                tools:ignore="HardcodedText,SpUsage"/>
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@id/cpl"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="22dp"
+                android:layout_marginStart="22dp"
                 android:layout_marginTop="18dp"
-                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
                 android:fontFamily="@font/opensans_regular"
                 android:text="@string/app_version"
                 android:textColor="#757575"
                 android:textSize="14dp"
-                tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+                tools:ignore="HardcodedText,SpUsage" />
 
 
             <com.google.android.material.button.MaterialButton
@@ -74,12 +74,12 @@
                 android:background="@drawable/rounded_btn"
                 android:gravity="center"
                 android:maxLines="1"
-                android:paddingLeft="25dp"
-                android:paddingRight="25dp"
+                android:paddingStart="25dp"
+                android:paddingEnd="25dp"
                 android:text="Close"
                 android:textColor="#212121"
                 android:textSize="16sp"
-                tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+                tools:ignore="HardcodedText,SpUsage" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/custom_dialog_layout_two_button.xml b/app/src/main/res/layout/custom_dialog_layout_two_button.xml
index 63cc048..ae57134 100644
--- a/app/src/main/res/layout/custom_dialog_layout_two_button.xml
+++ b/app/src/main/res/layout/custom_dialog_layout_two_button.xml
@@ -10,12 +10,12 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         app:cardCornerRadius="11dp"
         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">
 
     <LinearLayout
@@ -35,28 +35,28 @@
             android:id="@id/msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="22dp"
+            android:layout_marginStart="22dp"
             android:layout_marginTop="18dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginEnd="12dp"
             android:fontFamily="@font/opensans_semibold"
             android:text="@string/app_name"
             android:textColor="@color/grey"
             android:textSize="15dp"
             android:labelFor="@+id/msg"
-            tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+            tools:ignore="HardcodedText,SpUsage" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@id/cpl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="22dp"
+            android:layout_marginStart="22dp"
             android:layout_marginTop="18dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginEnd="12dp"
             android:fontFamily="@font/opensans_regular"
             android:text="@string/app_version"
             android:textColor="@color/grey"
             android:textSize="14dp"
-            tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+            tools:ignore="HardcodedText,SpUsage" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/input_dialog.xml b/app/src/main/res/layout/input_dialog.xml
index 8920979..3b642ba 100644
--- a/app/src/main/res/layout/input_dialog.xml
+++ b/app/src/main/res/layout/input_dialog.xml
@@ -29,14 +29,14 @@
             android:gravity="center"
             android:maxLines="1"
             android:minWidth="100dp"
-            android:paddingLeft="25dp"
-            android:paddingRight="25dp"
+            android:paddingStart="25dp"
+            android:paddingEnd="25dp"
             android:text="@string/button_cancel"
             android:textColor="#212121"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+            tools:ignore="HardcodedText,SpUsage" />
 
         <Space
             android:id="@+id/space"
@@ -56,8 +56,8 @@
             android:gravity="center"
             android:maxLines="1"
             android:minWidth="100dp"
-            android:paddingLeft="25dp"
-            android:paddingRight="25dp"
+            android:paddingStart="25dp"
+            android:paddingEnd="25dp"
             android:text="@string/button_ok"
             android:textColor="#212121"
             android:textSize="16sp"
@@ -65,7 +65,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/notagreed"
             app:layout_constraintVertical_bias="0.0"
-            tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+            tools:ignore="HardcodedText,SpUsage" />
 
         <EditText
             android:id="@+id/editcip13"
diff --git a/app/src/main/res/layout/welcome1.xml b/app/src/main/res/layout/welcome1.xml
index 7e652f0..e8eba62 100644
--- a/app/src/main/res/layout/welcome1.xml
+++ b/app/src/main/res/layout/welcome1.xml
@@ -27,8 +27,8 @@
         android:layout_width="wrap_content"
         android:layout_height="58dp"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide1_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/welcome10.xml b/app/src/main/res/layout/welcome10.xml
index a603b68..12443eb 100644
--- a/app/src/main/res/layout/welcome10.xml
+++ b/app/src/main/res/layout/welcome10.xml
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide10_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/welcome11.xml b/app/src/main/res/layout/welcome11.xml
index a50227a..0789eb1 100644
--- a/app/src/main/res/layout/welcome11.xml
+++ b/app/src/main/res/layout/welcome11.xml
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide11_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/welcome12.xml b/app/src/main/res/layout/welcome12.xml
index 06ddb2a..a14663a 100644
--- a/app/src/main/res/layout/welcome12.xml
+++ b/app/src/main/res/layout/welcome12.xml
@@ -29,8 +29,8 @@
         android:layout_width="350dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide12_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/welcome2.xml b/app/src/main/res/layout/welcome2.xml
index 2302bca..9a07be7 100644
--- a/app/src/main/res/layout/welcome2.xml
+++ b/app/src/main/res/layout/welcome2.xml
@@ -29,8 +29,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide2_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/welcome3.xml b/app/src/main/res/layout/welcome3.xml
index d220c6d..776112e 100644
--- a/app/src/main/res/layout/welcome3.xml
+++ b/app/src/main/res/layout/welcome3.xml
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="33dp"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide3_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/welcome4.xml b/app/src/main/res/layout/welcome4.xml
index b565d7e..eabeef9 100644
--- a/app/src/main/res/layout/welcome4.xml
+++ b/app/src/main/res/layout/welcome4.xml
@@ -26,8 +26,8 @@
         android:layout_width="wrap_content"
         android:layout_height="36dp"
         android:layout_marginTop="20dp"
-        android:paddingLeft="@dimen/desc_padding"
-        android:paddingRight="@dimen/desc_padding"
+        android:paddingStart="@dimen/desc_padding"
+        android:paddingEnd="@dimen/desc_padding"
         android:text="@string/slide4_desc"
         android:textAlignment="center"
         android:textColor="@android:color/white"