diff --git a/app/src/main/res/layout/activity_dialpad.xml b/app/src/main/res/layout/activity_dialpad.xml
index 721bab1f..224e68b7 100644
--- a/app/src/main/res/layout/activity_dialpad.xml
+++ b/app/src/main/res/layout/activity_dialpad.xml
@@ -27,7 +27,7 @@
         android:paddingStart="@dimen/normal_margin"
         android:paddingLeft="@dimen/normal_margin"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_list"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/dialpad_list">
 
         <include layout="@layout/fastscroller_handle_vertical"/>
@@ -45,7 +45,7 @@
         android:id="@+id/dialpad_input"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:gravity="center"
         android:inputType="phone"
         android:textCursorDrawable="@null"
@@ -58,10 +58,10 @@
         android:id="@+id/dialpad_clear_char"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:src="@drawable/ic_clear_char"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_input"
         app:layout_constraintEnd_toEndOf="parent"
@@ -72,7 +72,7 @@
         style="@style/DialpadNumberStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="1"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_4"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_2"
@@ -130,7 +130,7 @@
         style="@style/DialpadNumberStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="4"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_7"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_5"
@@ -142,7 +142,7 @@
         style="@style/DialpadLetterStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="GHI"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_7"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_5"
@@ -200,7 +200,7 @@
         style="@style/DialpadNumberStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="7"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_asterisk"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_8"
@@ -212,7 +212,7 @@
         style="@style/DialpadLetterStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="PQRS"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_asterisk"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_8"
@@ -246,7 +246,7 @@
         style="@style/DialpadNumberStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:text="9"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_hashtag"
         app:layout_constraintEnd_toEndOf="parent"
@@ -258,7 +258,7 @@
         style="@style/DialpadLetterStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:text="WXYZ"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_hashtag"
         app:layout_constraintEnd_toEndOf="parent"
@@ -270,7 +270,7 @@
         style="@style/DialpadNumberStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="*"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_call_button"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_0_holder"
@@ -302,9 +302,9 @@
             android:layout_alignTop="@+id/dialpad_0"
             android:layout_alignBottom="@+id/dialpad_0"
             android:layout_centerHorizontal="true"
-            android:layout_toRightOf="@+id/dialpad_0"
+            android:layout_toEndOf="@+id/dialpad_0"
             android:gravity="center"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/small_margin"
             android:text="+"
             android:textSize="@dimen/actionbar_text_size"/>
@@ -316,7 +316,7 @@
         style="@style/DialpadNumberStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:text="#"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_call_button"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_edit_contact.xml b/app/src/main/res/layout/activity_edit_contact.xml
index c98394fd..80c07042 100644
--- a/app/src/main/res/layout/activity_edit_contact.xml
+++ b/app/src/main/res/layout/activity_edit_contact.xml
@@ -11,9 +11,9 @@
         android:id="@+id/contact_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/normal_margin"
+        android:paddingStart="@dimen/normal_margin"
         android:paddingTop="@dimen/activity_margin"
-        android:paddingRight="@dimen/normal_margin"
+        android:paddingEnd="@dimen/normal_margin"
         android:paddingBottom="@dimen/medium_margin">
 
         <ImageView
@@ -28,8 +28,8 @@
             android:layout_height="@dimen/contact_actions_size"
             android:layout_alignTop="@+id/contact_photo"
             android:layout_alignBottom="@id/contact_photo"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_photo"
+            android:layout_marginStart="@dimen/medium_margin"
+            android:layout_toEndOf="@+id/contact_photo"
             android:adjustViewBounds="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="@dimen/tiny_margin"
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/contact_photo"
             android:layout_alignBottom="@id/contact_photo"
-            android:gravity="center_vertical|right">
+            android:gravity="center_vertical|end">
 
             <ImageView
                 android:id="@+id/contact_send_email"
@@ -49,8 +49,8 @@
                 android:layout_height="@dimen/contact_actions_size"
                 android:adjustViewBounds="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/activity_margin"
-                android:paddingRight="@dimen/activity_margin"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
                 android:src="@drawable/ic_email_big"/>
 
@@ -58,11 +58,11 @@
                 android:id="@+id/contact_start_call"
                 android:layout_width="@dimen/contact_actions_size"
                 android:layout_height="@dimen/contact_actions_size"
-                android:layout_marginLeft="@dimen/normal_margin"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:adjustViewBounds="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/activity_margin"
-                android:paddingRight="@dimen/activity_margin"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
                 android:src="@drawable/ic_phone_big"/>
 
@@ -70,11 +70,11 @@
                 android:id="@+id/contact_send_sms"
                 android:layout_width="@dimen/contact_actions_size"
                 android:layout_height="@dimen/contact_actions_size"
-                android:layout_marginLeft="@dimen/normal_margin"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:adjustViewBounds="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/activity_margin"
-                android:paddingRight="@dimen/activity_margin"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
                 android:src="@drawable/ic_sms_big"/>
 
@@ -98,7 +98,7 @@
             android:layout_below="@+id/contact_photo"
             android:layout_centerVertical="true"
             android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:hint="@string/prefix"
             android:inputType="textCapWords"
             android:lines="1"
@@ -114,7 +114,7 @@
             android:layout_below="@+id/contact_prefix"
             android:layout_centerVertical="true"
             android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:hint="@string/first_name"
             android:inputType="textCapWords"
             android:lines="1"
@@ -146,7 +146,7 @@
             android:layout_below="@+id/contact_middle_name"
             android:layout_centerVertical="true"
             android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:hint="@string/surname"
             android:inputType="textCapWords"
             android:lines="1"
@@ -162,7 +162,7 @@
             android:layout_below="@+id/contact_surname"
             android:layout_centerVertical="true"
             android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:hint="@string/suffix"
             android:inputType="textCapWords"
             android:lines="1"
@@ -178,7 +178,7 @@
             android:layout_below="@+id/contact_suffix"
             android:layout_centerVertical="true"
             android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:hint="@string/nickname"
             android:inputType="textCapWords"
             android:lines="1"
@@ -204,7 +204,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_nickname"
             android:layout_marginBottom="@dimen/small_margin"
-            android:layout_toRightOf="@+id/contact_numbers_image"
+            android:layout_toEndOf="@+id/contact_numbers_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_edit_phone_number"/>
@@ -219,9 +219,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/medium_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -241,7 +241,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_numbers_add_new"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_edit_email"/>
@@ -256,9 +256,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/small_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -279,7 +279,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_emails_add_new"
             android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_edit_address"/>
@@ -294,9 +294,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/small_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -317,7 +317,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_addresses_add_new"
             android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_edit_im"/>
@@ -332,9 +332,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/small_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -355,7 +355,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_ims_add_new"
             android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_event"/>
@@ -370,9 +370,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/small_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -394,7 +394,7 @@
             android:layout_below="@+id/contact_events_add_new"
             android:layout_centerVertical="true"
             android:layout_marginTop="@dimen/normal_margin"
-            android:layout_toRightOf="@+id/contact_notes_image"
+            android:layout_toEndOf="@+id/contact_notes_image"
             android:hint="@string/notes"
             android:inputType="textCapSentences|textMultiLine"
             android:textCursorDrawable="@null"
@@ -418,7 +418,7 @@
             android:layout_below="@+id/contact_notes"
             android:layout_centerVertical="true"
             android:layout_marginTop="@dimen/normal_margin"
-            android:layout_toRightOf="@+id/contact_organization_image"
+            android:layout_toEndOf="@+id/contact_organization_image"
             android:hint="@string/company"
             android:inputType="textCapWords"
             android:maxLines="1"
@@ -433,7 +433,7 @@
             android:layout_below="@+id/contact_organization_company"
             android:layout_centerVertical="true"
             android:layout_marginTop="@dimen/normal_margin"
-            android:layout_toRightOf="@+id/contact_organization_image"
+            android:layout_toEndOf="@+id/contact_organization_image"
             android:hint="@string/job_position"
             android:inputType="textCapWords"
             android:maxLines="1"
@@ -458,7 +458,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_organization_job_position"
             android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_edit_website"/>
@@ -473,9 +473,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/small_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -496,7 +496,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_websites_add_new"
             android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical">
 
             <include layout="@layout/item_edit_group"/>
@@ -511,9 +511,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/small_margin"
             android:background="@drawable/button_background"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus"/>
 
@@ -535,11 +535,11 @@
             android:layout_below="@+id/contact_groups_add_new"
             android:layout_centerVertical="true"
             android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/activity_group_contacts.xml b/app/src/main/res/layout/activity_group_contacts.xml
index ad7edb2a..dcb5bfce 100644
--- a/app/src/main/res/layout/activity_group_contacts.xml
+++ b/app/src/main/res/layout/activity_group_contacts.xml
@@ -18,8 +18,8 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/activity_margin"
             android:gravity="center"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:text="@string/no_group_participants"
             android:textSize="@dimen/bigger_text_size"
             android:visibility="gone"/>
diff --git a/app/src/main/res/layout/activity_insert_edit_contact.xml b/app/src/main/res/layout/activity_insert_edit_contact.xml
index 50edfe57..c48cf5e6 100644
--- a/app/src/main/res/layout/activity_insert_edit_contact.xml
+++ b/app/src/main/res/layout/activity_insert_edit_contact.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:paddingRight="@dimen/activity_margin">
+        android:paddingEnd="@dimen/activity_margin">
 
         <ImageView
             android:id="@+id/new_contact_tmb"
@@ -26,7 +26,7 @@
             android:id="@+id/new_contact_name"
             android:layout_width="match_parent"
             android:layout_height="@dimen/create_new_contact_height"
-            android:layout_toRightOf="@+id/new_contact_tmb"
+            android:layout_toEndOf="@+id/new_contact_tmb"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/activity_manage_blocked_numbers.xml b/app/src/main/res/layout/activity_manage_blocked_numbers.xml
index 64a4f9b3..826e9a63 100644
--- a/app/src/main/res/layout/activity_manage_blocked_numbers.xml
+++ b/app/src/main/res/layout/activity_manage_blocked_numbers.xml
@@ -19,9 +19,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:paddingLeft="@dimen/big_margin"
+        android:paddingStart="@dimen/big_margin"
         android:paddingTop="@dimen/activity_margin"
-        android:paddingRight="@dimen/big_margin"
+        android:paddingEnd="@dimen/big_margin"
         android:text="@string/not_blocking_anyone"
         android:textSize="@dimen/bigger_text_size"
         android:visibility="gone"/>
diff --git a/app/src/main/res/layout/activity_select_contact.xml b/app/src/main/res/layout/activity_select_contact.xml
index c2f19d5a..017e414e 100644
--- a/app/src/main/res/layout/activity_select_contact.xml
+++ b/app/src/main/res/layout/activity_select_contact.xml
@@ -13,8 +13,8 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/activity_margin"
         android:gravity="center"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:text="@string/no_contacts_found"
         android:textSize="@dimen/bigger_text_size"
         android:visibility="gone"/>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 61cdd164..a6ea7d26 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -18,9 +18,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -40,9 +40,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -62,9 +62,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -84,9 +84,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -106,9 +106,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -130,9 +130,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -154,9 +154,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -178,9 +178,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -202,9 +202,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -226,9 +226,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -250,9 +250,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -274,9 +274,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -298,9 +298,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -322,9 +322,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -346,9 +346,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -358,8 +358,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_on_contact_click"
                 android:layout_toLeftOf="@+id/settings_on_contact_click"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/on_contact_click"/>
 
             <com.simplemobiletools.commons.views.MyTextView
diff --git a/app/src/main/res/layout/activity_view_contact.xml b/app/src/main/res/layout/activity_view_contact.xml
index 8ff9ba8b..99a4264f 100644
--- a/app/src/main/res/layout/activity_view_contact.xml
+++ b/app/src/main/res/layout/activity_view_contact.xml
@@ -28,8 +28,8 @@
             android:layout_height="@dimen/contact_actions_size"
             android:layout_alignTop="@+id/contact_photo"
             android:layout_alignBottom="@id/contact_photo"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_toRightOf="@+id/contact_photo"
+            android:layout_marginStart="@dimen/medium_margin"
+            android:layout_toEndOf="@+id/contact_photo"
             android:adjustViewBounds="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="@dimen/tiny_margin"
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/contact_photo"
             android:layout_alignBottom="@id/contact_photo"
-            android:gravity="center_vertical|right">
+            android:gravity="center_vertical|end">
 
             <ImageView
                 android:id="@+id/contact_send_email"
@@ -59,11 +59,11 @@
                 android:id="@+id/contact_start_call"
                 android:layout_width="@dimen/contact_actions_size"
                 android:layout_height="@dimen/contact_actions_size"
-                android:layout_marginLeft="@dimen/normal_margin"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:adjustViewBounds="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/activity_margin"
-                android:paddingRight="@dimen/activity_margin"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
                 android:src="@drawable/ic_phone_big"/>
 
@@ -71,11 +71,11 @@
                 android:id="@+id/contact_send_sms"
                 android:layout_width="@dimen/contact_actions_size"
                 android:layout_height="@dimen/contact_actions_size"
-                android:layout_marginLeft="@dimen/normal_margin"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:adjustViewBounds="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/activity_margin"
-                android:paddingRight="@dimen/activity_margin"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
                 android:src="@drawable/ic_sms_big"/>
 
@@ -98,11 +98,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_photo"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
@@ -114,11 +114,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_prefix"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
@@ -130,11 +130,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_first_name"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
@@ -146,11 +146,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_middle_name"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
@@ -162,11 +162,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_surname"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
@@ -178,11 +178,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_suffix"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
@@ -204,9 +204,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_nickname"
-            android:layout_toRightOf="@+id/contact_numbers_image"
+            android:layout_toEndOf="@+id/contact_numbers_image"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/small_margin"/>
+            android:paddingStart="@dimen/small_margin"/>
 
         <ImageView
             android:id="@+id/contact_emails_image"
@@ -224,9 +224,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_numbers_holder"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/small_margin"/>
+            android:paddingStart="@dimen/small_margin"/>
 
         <ImageView
             android:id="@+id/contact_addresses_image"
@@ -244,9 +244,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_emails_holder"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/small_margin"/>
+            android:paddingStart="@dimen/small_margin"/>
 
         <ImageView
             android:id="@+id/contact_ims_image"
@@ -264,9 +264,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_addresses_holder"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/small_margin"/>
+            android:paddingStart="@dimen/small_margin"/>
 
         <ImageView
             android:id="@+id/contact_events_image"
@@ -284,7 +284,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_ims_holder"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical"/>
 
         <ImageView
@@ -304,10 +304,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_events_holder"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_notes_image"
+            android:layout_toEndOf="@+id/contact_notes_image"
             android:background="?attr/selectableItemBackground"
             android:lineSpacingExtra="@dimen/medium_margin"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:textSize="@dimen/bigger_text_size"/>
@@ -329,10 +329,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_notes"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_organization_image"
+            android:layout_toEndOf="@+id/contact_organization_image"
             android:background="?attr/selectableItemBackground"
             android:lineSpacingExtra="@dimen/medium_margin"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:textSize="@dimen/bigger_text_size"/>
@@ -343,10 +343,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_organization_company"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_organization_image"
+            android:layout_toEndOf="@+id/contact_organization_image"
             android:background="?attr/selectableItemBackground"
             android:lineSpacingExtra="@dimen/medium_margin"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:textSize="@dimen/bigger_text_size"/>
@@ -367,7 +367,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_organization_job_position"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical"/>
 
         <ImageView
@@ -386,9 +386,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_websites_holder"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/small_margin"/>
+            android:paddingStart="@dimen/small_margin"/>
 
         <ImageView
             android:id="@+id/contact_source_image"
@@ -407,11 +407,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_groups_holder"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/contact_name_image"
+            android:layout_toEndOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
             android:lines="1"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/normal_margin"
             android:paddingBottom="@dimen/normal_margin"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/dialog_add_blocked_number.xml b/app/src/main/res/layout/dialog_add_blocked_number.xml
index 1e0024d5..bc928869 100644
--- a/app/src/main/res/layout/dialog_add_blocked_number.xml
+++ b/app/src/main/res/layout/dialog_add_blocked_number.xml
@@ -10,9 +10,9 @@
         android:id="@+id/add_blocked_number_edittext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:layout_marginTop="@dimen/small_margin"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:inputType="phone"
         android:textCursorDrawable="@null"
         android:textSize="@dimen/bigger_text_size"/>
diff --git a/app/src/main/res/layout/dialog_change_sorting.xml b/app/src/main/res/layout/dialog_change_sorting.xml
index cbc6504b..75257e06 100644
--- a/app/src/main/res/layout/dialog_change_sorting.xml
+++ b/app/src/main/res/layout/dialog_change_sorting.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin">
 
         <RadioGroup
diff --git a/app/src/main/res/layout/dialog_create_new_group.xml b/app/src/main/res/layout/dialog_create_new_group.xml
index 58884ff9..268d09e3 100644
--- a/app/src/main/res/layout/dialog_create_new_group.xml
+++ b/app/src/main/res/layout/dialog_create_new_group.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"
+    android:paddingStart="@dimen/activity_margin"
+    android:paddingEnd="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
diff --git a/app/src/main/res/layout/dialog_custom_label.xml b/app/src/main/res/layout/dialog_custom_label.xml
index 746ae0cd..5f8103c3 100644
--- a/app/src/main/res/layout/dialog_custom_label.xml
+++ b/app/src/main/res/layout/dialog_custom_label.xml
@@ -10,8 +10,8 @@
         android:id="@+id/custom_label_edittext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:inputType="textCapSentences"
         android:textCursorDrawable="@null"
         android:textSize="@dimen/normal_text_size"/>
diff --git a/app/src/main/res/layout/dialog_export_contacts.xml b/app/src/main/res/layout/dialog_export_contacts.xml
index b1708d9a..a7c38dc1 100644
--- a/app/src/main/res/layout/dialog_export_contacts.xml
+++ b/app/src/main/res/layout/dialog_export_contacts.xml
@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin">
+        android:paddingEnd="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/export_contacts_folder_label"
@@ -26,10 +26,10 @@
             android:id="@+id/export_contacts_folder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:layout_marginBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -43,10 +43,10 @@
             android:id="@+id/export_contacts_filename"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:layout_marginBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/normal_margin"
-            android:paddingRight="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:textSize="@dimen/normal_text_size"/>
 
         <ImageView
diff --git a/app/src/main/res/layout/dialog_import_contacts.xml b/app/src/main/res/layout/dialog_import_contacts.xml
index 98ef049f..eb7452ff 100644
--- a/app/src/main/res/layout/dialog_import_contacts.xml
+++ b/app/src/main/res/layout/dialog_import_contacts.xml
@@ -6,8 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"
+    android:paddingStart="@dimen/activity_margin"
+    android:paddingEnd="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
diff --git a/app/src/main/res/layout/dialog_manage_visible_fields.xml b/app/src/main/res/layout/dialog_manage_visible_fields.xml
index 477e1210..acf214b2 100644
--- a/app/src/main/res/layout/dialog_manage_visible_fields.xml
+++ b/app/src/main/res/layout/dialog_manage_visible_fields.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
diff --git a/app/src/main/res/layout/dialog_manage_visible_tabs.xml b/app/src/main/res/layout/dialog_manage_visible_tabs.xml
index 65e8978c..51a0b8bd 100644
--- a/app/src/main/res/layout/dialog_manage_visible_tabs.xml
+++ b/app/src/main/res/layout/dialog_manage_visible_tabs.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
diff --git a/app/src/main/res/layout/dialog_select_groups.xml b/app/src/main/res/layout/dialog_select_groups.xml
index 21a468d9..675feedd 100644
--- a/app/src/main/res/layout/dialog_select_groups.xml
+++ b/app/src/main/res/layout/dialog_select_groups.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:paddingTop="@dimen/normal_margin"/>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/item_add_favorite_with_number.xml b/app/src/main/res/layout/item_add_favorite_with_number.xml
index c8544807..7aabf543 100644
--- a/app/src/main/res/layout/item_add_favorite_with_number.xml
+++ b/app/src/main/res/layout/item_add_favorite_with_number.xml
@@ -13,7 +13,7 @@
         android:id="@+id/contact_holder"
         android:layout_width="match_parent"
         android:layout_height="@dimen/contact_item_height"
-        android:paddingRight="@dimen/normal_margin">
+        android:paddingEnd="@dimen/normal_margin">
 
         <ImageView
             android:id="@+id/contact_tmb"
@@ -28,12 +28,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/contact_tmb"
-            android:layout_toLeftOf="@+id/contact_checkbox"
-            android:layout_toRightOf="@+id/contact_tmb"
+            android:layout_toStartOf="@+id/contact_checkbox"
+            android:layout_toEndOf="@+id/contact_tmb"
             android:ellipsize="end"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:paddingTop="@dimen/small_margin"
             android:textSize="@dimen/bigger_text_size"
             tools:text="John Doe"/>
@@ -42,10 +42,10 @@
             android:id="@+id/contact_number"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/contact_name"
+            android:layout_alignStart="@+id/contact_name"
             android:layout_below="@+id/contact_name"
-            android:layout_toLeftOf="@+id/contact_checkbox"
-            android:layout_toRightOf="@+id/contact_tmb"
+            android:layout_toStartOf="@+id/contact_checkbox"
+            android:layout_toEndOf="@+id/contact_tmb"
             android:maxLines="1"
             android:textSize="@dimen/bigger_text_size"
             tools:text="0123 456 789"/>
@@ -54,7 +54,7 @@
             android:id="@+id/contact_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/contact_item_height"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:clickable="false"
             android:gravity="center_vertical"/>
 
diff --git a/app/src/main/res/layout/item_add_favorite_without_number.xml b/app/src/main/res/layout/item_add_favorite_without_number.xml
index a9ecb39d..4e168131 100644
--- a/app/src/main/res/layout/item_add_favorite_without_number.xml
+++ b/app/src/main/res/layout/item_add_favorite_without_number.xml
@@ -13,7 +13,7 @@
         android:id="@+id/contact_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingRight="@dimen/normal_margin">
+        android:paddingEnd="@dimen/normal_margin">
 
         <ImageView
             android:id="@+id/contact_tmb"
@@ -27,8 +27,8 @@
             android:id="@+id/contact_name"
             android:layout_width="match_parent"
             android:layout_height="@dimen/contact_item_height"
-            android:layout_toLeftOf="@+id/contact_checkbox"
-            android:layout_toRightOf="@+id/contact_tmb"
+            android:layout_toStartOf="@+id/contact_checkbox"
+            android:layout_toEndOf="@+id/contact_tmb"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
@@ -39,7 +39,7 @@
             android:id="@+id/contact_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/contact_item_height"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:clickable="false"
             android:gravity="center_vertical"/>
 
diff --git a/app/src/main/res/layout/item_contact_with_number.xml b/app/src/main/res/layout/item_contact_with_number.xml
index 4ecf2645..30de2427 100644
--- a/app/src/main/res/layout/item_contact_with_number.xml
+++ b/app/src/main/res/layout/item_contact_with_number.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/contact_item_with_number_height"
         android:paddingTop="@dimen/tiny_margin"
-        android:paddingRight="@dimen/activity_margin">
+        android:paddingEnd="@dimen/activity_margin">
 
         <ImageView
             android:id="@+id/contact_tmb"
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/contact_tmb"
-            android:layout_toRightOf="@+id/contact_tmb"
+            android:layout_toEndOf="@+id/contact_tmb"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="@dimen/big_text_size"
@@ -40,8 +40,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_name"
-            android:layout_alignLeft="@+id/contact_name"
-            android:layout_toRightOf="@+id/contact_tmb"
+            android:layout_alignStart="@+id/contact_name"
+            android:layout_toEndOf="@+id/contact_tmb"
             android:maxLines="1"
             android:textSize="@dimen/bigger_text_size"
             tools:text="0123 456 789"/>
diff --git a/app/src/main/res/layout/item_contact_without_number.xml b/app/src/main/res/layout/item_contact_without_number.xml
index ac84b0a0..ba87da39 100644
--- a/app/src/main/res/layout/item_contact_without_number.xml
+++ b/app/src/main/res/layout/item_contact_without_number.xml
@@ -14,7 +14,7 @@
         android:id="@+id/contact_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingRight="@dimen/activity_margin">
+        android:paddingEnd="@dimen/activity_margin">
 
         <ImageView
             android:id="@+id/contact_tmb"
@@ -28,7 +28,7 @@
             android:id="@+id/contact_name"
             android:layout_width="match_parent"
             android:layout_height="@dimen/contact_item_height"
-            android:layout_toRightOf="@+id/contact_tmb"
+            android:layout_toEndOf="@+id/contact_tmb"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/item_edit_address.xml b/app/src/main/res/layout/item_edit_address.xml
index 36a6e910..d742a213 100644
--- a/app/src/main/res/layout/item_edit_address.xml
+++ b/app/src/main/res/layout/item_edit_address.xml
@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/contact_address_type"
         android:layout_toStartOf="@+id/contact_address_type"
         android:hint="@string/address"
         android:inputType="textCapWords|textMultiLine"
@@ -23,12 +22,11 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/contact_address"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_alignTop="@+id/contact_address"
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
         android:paddingRight="@dimen/medium_margin"
         android:text="@string/address"
         android:textSize="@dimen/bigger_text_size"/>
diff --git a/app/src/main/res/layout/item_edit_email.xml b/app/src/main/res/layout/item_edit_email.xml
index 921e7b2e..3fb37f47 100644
--- a/app/src/main/res/layout/item_edit_email.xml
+++ b/app/src/main/res/layout/item_edit_email.xml
@@ -31,8 +31,8 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/home"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_edit_group.xml b/app/src/main/res/layout/item_edit_group.xml
index 5a5620e1..ac346c36 100644
--- a/app/src/main/res/layout/item_edit_group.xml
+++ b/app/src/main/res/layout/item_edit_group.xml
@@ -15,8 +15,8 @@
         android:alpha="0.5"
         android:background="?attr/selectableItemBackground"
         android:paddingBottom="@dimen/normal_margin"
-        android:paddingLeft="@dimen/small_margin"
-        android:paddingRight="@dimen/small_margin"
+        android:paddingStart="@dimen/small_margin"
+        android:paddingEnd="@dimen/small_margin"
         android:paddingTop="@dimen/normal_margin"
         android:text="@string/no_groups"
         android:textSize="@dimen/bigger_text_size"/>
@@ -26,12 +26,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/contact_group"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignTop="@+id/contact_group"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/medium_margin"
-        android:layout_marginLeft="@dimen/small_margin"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginStart="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:layout_marginTop="@dimen/medium_margin"
         android:background="@drawable/button_background"
         android:padding="@dimen/medium_margin"
diff --git a/app/src/main/res/layout/item_edit_im.xml b/app/src/main/res/layout/item_edit_im.xml
index ea82a20e..01cd411f 100644
--- a/app/src/main/res/layout/item_edit_im.xml
+++ b/app/src/main/res/layout/item_edit_im.xml
@@ -30,8 +30,8 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/skype"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_edit_phone_number.xml b/app/src/main/res/layout/item_edit_phone_number.xml
index 3eb2708c..0107e0c3 100644
--- a/app/src/main/res/layout/item_edit_phone_number.xml
+++ b/app/src/main/res/layout/item_edit_phone_number.xml
@@ -31,8 +31,8 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/mobile"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml
index ae370f5d..eeb3deef 100644
--- a/app/src/main/res/layout/item_event.xml
+++ b/app/src/main/res/layout/item_event.xml
@@ -15,8 +15,8 @@
         android:alpha="0.5"
         android:background="?attr/selectableItemBackground"
         android:paddingBottom="@dimen/normal_margin"
-        android:paddingLeft="@dimen/small_margin"
-        android:paddingRight="@dimen/small_margin"
+        android:paddingStart="@dimen/small_margin"
+        android:paddingEnd="@dimen/small_margin"
         android:paddingTop="@dimen/normal_margin"
         android:text="@string/unknown"
         android:textSize="@dimen/bigger_text_size"/>
@@ -32,7 +32,7 @@
         android:layout_marginLeft="@dimen/small_margin"
         android:layout_marginRight="@dimen/small_margin"
         android:layout_marginTop="@dimen/medium_margin"
-        android:layout_toLeftOf="@+id/contact_event_type"
+        android:layout_toStartOf="@+id/contact_event_type"
         android:background="@drawable/button_background"
         android:padding="@dimen/medium_margin"
         android:src="@drawable/ic_minus"
@@ -49,8 +49,8 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/birthday"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_filter_contact_source.xml b/app/src/main/res/layout/item_filter_contact_source.xml
index 29ded9de..8c19bbc4 100644
--- a/app/src/main/res/layout/item_filter_contact_source.xml
+++ b/app/src/main/res/layout/item_filter_contact_source.xml
@@ -11,8 +11,8 @@
         android:id="@+id/filter_contact_source_checkbox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/medium_margin"
+        android:layout_marginEnd="@dimen/medium_margin"
         android:clickable="false"
-        android:paddingLeft="@dimen/small_margin"/>
+        android:paddingStart="@dimen/small_margin"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_group.xml b/app/src/main/res/layout/item_group.xml
index d8106772..d44c1079 100644
--- a/app/src/main/res/layout/item_group.xml
+++ b/app/src/main/res/layout/item_group.xml
@@ -14,7 +14,7 @@
         android:id="@+id/group_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingRight="@dimen/activity_margin">
+        android:paddingEnd="@dimen/activity_margin">
 
         <ImageView
             android:id="@+id/group_tmb"
@@ -28,7 +28,7 @@
             android:id="@+id/group_name"
             android:layout_width="match_parent"
             android:layout_height="@dimen/contact_item_height"
-            android:layout_toRightOf="@+id/group_tmb"
+            android:layout_toEndOf="@+id/group_tmb"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/item_textview.xml b/app/src/main/res/layout/item_textview.xml
index 486dfee7..ea6670c5 100644
--- a/app/src/main/res/layout/item_textview.xml
+++ b/app/src/main/res/layout/item_textview.xml
@@ -4,8 +4,8 @@
     android:id="@+id/item_textview"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/activity_margin"
+    android:layout_marginStart="@dimen/activity_margin"
     android:background="?attr/selectableItemBackground"
     android:paddingBottom="@dimen/activity_margin"
-    android:paddingLeft="@dimen/medium_margin"
+    android:paddingStart="@dimen/medium_margin"
     android:paddingTop="@dimen/activity_margin"/>
diff --git a/app/src/main/res/layout/item_view_address.xml b/app/src/main/res/layout/item_view_address.xml
index c3f46463..73f3dfc9 100644
--- a/app/src/main/res/layout/item_view_address.xml
+++ b/app/src/main/res/layout/item_view_address.xml
@@ -27,8 +27,8 @@
         android:layout_alignTop="@+id/contact_address"
         android:layout_centerVertical="true"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/home"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_view_im.xml b/app/src/main/res/layout/item_view_im.xml
index fb689418..3ee5f615 100644
--- a/app/src/main/res/layout/item_view_im.xml
+++ b/app/src/main/res/layout/item_view_im.xml
@@ -30,8 +30,8 @@
         android:layout_alignTop="@+id/contact_im"
         android:layout_centerVertical="true"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/aim"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_view_phone_number.xml b/app/src/main/res/layout/item_view_phone_number.xml
index d4dea4a8..12e8bbae 100644
--- a/app/src/main/res/layout/item_view_phone_number.xml
+++ b/app/src/main/res/layout/item_view_phone_number.xml
@@ -30,8 +30,8 @@
         android:layout_alignTop="@+id/contact_number"
         android:layout_centerVertical="true"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/mobile"
         android:textSize="@dimen/bigger_text_size"/>
 
diff --git a/app/src/main/res/layout/item_website.xml b/app/src/main/res/layout/item_website.xml
index 39d029bc..0fad1c95 100644
--- a/app/src/main/res/layout/item_website.xml
+++ b/app/src/main/res/layout/item_website.xml
@@ -7,8 +7,8 @@
     android:layout_centerVertical="true"
     android:background="?attr/selectableItemBackground"
     android:paddingBottom="@dimen/normal_margin"
-    android:paddingLeft="@dimen/small_margin"
-    android:paddingRight="@dimen/small_margin"
+    android:paddingStart="@dimen/small_margin"
+    android:paddingEnd="@dimen/small_margin"
     android:paddingTop="@dimen/normal_margin"
     android:text="@string/unknown"
     android:textSize="@dimen/bigger_text_size"/>