diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 84912ef58..bbf53b09e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -48,9 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:paddingStart="@dimen/normal_margin"
-            android:paddingLeft="@dimen/normal_margin"
             android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
@@ -62,7 +60,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentBottom="true"
             android:paddingTop="@dimen/normal_margin"
             android:visibility="gone">
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 222ca5826..852cec099 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -48,9 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:paddingStart="@dimen/normal_margin"
-            android:paddingLeft="@dimen/normal_margin"
             android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
@@ -62,7 +60,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentBottom="true"
             android:paddingTop="@dimen/normal_margin"
             android:visibility="gone">
diff --git a/app/src/main/res/layout/activity_panorama_photo.xml b/app/src/main/res/layout/activity_panorama_photo.xml
index 199fb8d8f..0a4cd3f99 100644
--- a/app/src/main/res/layout/activity_panorama_photo.xml
+++ b/app/src/main/res/layout/activity_panorama_photo.xml
@@ -23,7 +23,7 @@
         android:id="@+id/cardboard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_cardboard"/>
@@ -32,7 +32,7 @@
         android:id="@+id/explore"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_explore"/>
diff --git a/app/src/main/res/layout/activity_panorama_video.xml b/app/src/main/res/layout/activity_panorama_video.xml
index 343496d24..45e5fb637 100644
--- a/app/src/main/res/layout/activity_panorama_video.xml
+++ b/app/src/main/res/layout/activity_panorama_video.xml
@@ -17,7 +17,7 @@
         android:id="@+id/explore"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_explore"/>
@@ -26,7 +26,7 @@
         android:id="@+id/cardboard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_cardboard"/>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index c0f1c51a9..9331be83c 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -29,7 +29,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/customize_colors"/>
 
         </RelativeLayout>
@@ -52,7 +51,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/use_english_language"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -75,7 +73,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/change_date_and_time_format"/>
 
         </RelativeLayout>
@@ -97,7 +94,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_file_loading_priority"
-                android:layout_toLeftOf="@+id/settings_file_loading_priority"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingRight="@dimen/medium_margin"
                 android:text="@string/file_loading_priority"/>
@@ -107,9 +103,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
                 android:layout_marginEnd="@dimen/small_margin"
-                android:layout_marginRight="@dimen/small_margin"
                 android:background="@null"
                 android:clickable="false"/>
 
@@ -127,7 +121,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/visibility"
             android:textAllCaps="true"
@@ -150,7 +143,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/manage_included_folders"/>
 
         </RelativeLayout>
@@ -172,7 +164,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/manage_excluded_folders"/>
 
         </RelativeLayout>
@@ -194,7 +185,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/manage_hidden_folders"/>
 
         </RelativeLayout>
@@ -217,7 +207,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_hidden_items"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -235,7 +224,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/videos"
             android:textAllCaps="true"
@@ -259,7 +247,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/autoplay_videos"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -283,7 +270,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/remember_last_video_position"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -307,7 +293,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/loop_videos"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -331,7 +316,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/open_videos_on_separate_screen"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -355,7 +339,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_video_gestures"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -373,7 +356,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/thumbnails"
             android:textAllCaps="true"
@@ -397,7 +379,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/animate_gifs"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -421,7 +402,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/crop_thumbnails"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -445,7 +425,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_thumbnail_video_duration"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -469,7 +448,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_media_count"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -487,7 +465,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/scrolling"
             android:textAllCaps="true"
@@ -511,7 +488,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_info_bubble"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -535,7 +511,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/scroll_thumbnails_horizontally"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -559,7 +534,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/enable_pull_to_refresh"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -577,7 +551,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/fullscreen_media"
             android:textAllCaps="true"
@@ -601,7 +574,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/max_brightness"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -625,7 +597,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/black_background_at_fullscreen"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -649,7 +620,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/hide_system_ui_at_fullscreen"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -673,7 +643,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_instant_change"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -697,7 +666,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_photo_gestures"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -721,7 +689,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_down_gesture"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -745,7 +712,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_notch"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -768,7 +734,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_screen_rotation"
-                android:layout_toLeftOf="@+id/settings_screen_rotation"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingRight="@dimen/medium_margin"
                 android:text="@string/screen_rotation_by"/>
@@ -778,9 +743,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
                 android:layout_marginEnd="@dimen/small_margin"
-                android:layout_marginRight="@dimen/small_margin"
                 android:background="@null"
                 android:clickable="false"/>
 
@@ -798,7 +761,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/deep_zoomable_images"
             android:textAllCaps="true"
@@ -822,7 +784,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_deep_zooming_images"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -846,7 +807,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_rotating_gestures"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -870,7 +830,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_highest_quality"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -894,7 +853,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/allow_one_to_one_zoom"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -912,7 +870,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/extended_details"
             android:textAllCaps="true"
@@ -936,7 +893,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_extended_details"
                 app:switchPadding="@dimen/medium_margin"/>
         </RelativeLayout>
@@ -959,7 +915,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/hide_extended_details"
                 app:switchPadding="@dimen/medium_margin"/>
         </RelativeLayout>
@@ -981,7 +936,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/manage_extended_details"/>
 
         </RelativeLayout>
@@ -998,7 +952,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/security"
             android:textAllCaps="true"
@@ -1022,7 +975,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/password_protect_hidden_items"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1046,7 +998,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/password_protect_whole_app"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1070,7 +1021,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/password_protect_file_deletion"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1088,7 +1038,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/file_operations"
             android:textAllCaps="true"
@@ -1112,7 +1061,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/delete_empty_folders"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1136,7 +1084,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/keep_last_modified"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1160,7 +1107,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/skip_delete_confirmation"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1178,7 +1124,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/bottom_actions"
             android:textAllCaps="true"
@@ -1202,7 +1147,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_at_bottom"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1225,7 +1169,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/manage_bottom_actions"/>
 
         </RelativeLayout>
@@ -1242,7 +1185,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/recycle_bin"
             android:textAllCaps="true"
@@ -1266,7 +1208,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/move_items_into_recycle_bin"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1290,7 +1231,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_recycle_bin"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1314,7 +1254,6 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/show_recycle_bin_last"
                 app:switchPadding="@dimen/medium_margin"/>
 
@@ -1337,7 +1276,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_empty_recycle_bin_size"
-                android:layout_toLeftOf="@+id/settings_empty_recycle_bin_size"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingRight="@dimen/medium_margin"
                 android:text="@string/empty_recycle_bin"/>
@@ -1347,9 +1285,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
                 android:layout_marginEnd="@dimen/small_margin"
-                android:layout_marginRight="@dimen/small_margin"
                 android:background="@null"
                 android:clickable="false"/>
 
@@ -1367,7 +1303,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginLeft="@dimen/bigger_margin"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/migrating"
             android:textAllCaps="true"
@@ -1390,7 +1325,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/export_settings"/>
 
         </RelativeLayout>
@@ -1412,7 +1346,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/import_settings"/>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_video_player.xml b/app/src/main/res/layout/activity_video_player.xml
index d7962a628..224c6425a 100644
--- a/app/src/main/res/layout/activity_video_player.xml
+++ b/app/src/main/res/layout/activity_video_player.xml
@@ -23,8 +23,7 @@
         android:id="@+id/video_volume_controller"
         android:layout_width="@dimen/media_side_slider_width"
         android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"/>
+        android:layout_alignParentEnd="true"/>
 
     <com.simplemobiletools.gallery.pro.views.MediaSideScroll
         android:id="@+id/video_brightness_controller"
diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml
index ae762ab01..2604a6a03 100644
--- a/app/src/main/res/layout/activity_widget_config.xml
+++ b/app/src/main/res/layout/activity_widget_config.xml
@@ -20,9 +20,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/medium_margin"
+            android:paddingEnd="@dimen/medium_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -43,7 +43,7 @@
             android:layout_below="@+id/folder_picker_show_folder_name_holder"
             android:layout_marginTop="@dimen/small_margin"
             android:layout_marginBottom="@dimen/normal_margin"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:text="@string/folder_on_widget"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -51,7 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/folder_picker_label"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:background="@drawable/button_background"
             android:padding="@dimen/normal_margin"
             tools:text="@string/internal"/>
@@ -100,7 +100,6 @@
         android:layout_alignTop="@+id/config_bg_color"
         android:layout_alignBottom="@+id/config_bg_color"
         android:layout_toEndOf="@+id/config_bg_color"
-        android:layout_toRightOf="@+id/config_bg_color"
         android:background="@android:color/white">
 
         <SeekBar
@@ -123,7 +122,6 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/widget_colorpicker_size"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
         android:fontFamily="sans-serif-light"
         android:paddingLeft="@dimen/activity_margin"
diff --git a/app/src/main/res/layout/bottom_editor_draw_actions.xml b/app/src/main/res/layout/bottom_editor_draw_actions.xml
index fb12e40b2..8026820e2 100644
--- a/app/src/main/res/layout/bottom_editor_draw_actions.xml
+++ b/app/src/main/res/layout/bottom_editor_draw_actions.xml
@@ -24,7 +24,7 @@
         android:id="@+id/bottom_draw_color_clickable"
         android:layout_width="@dimen/bottom_editor_color_picker_size"
         android:layout_height="@dimen/bottom_editor_color_picker_size"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/bottom_draw_undo"
@@ -34,7 +34,7 @@
         android:id="@+id/bottom_draw_color"
         android:layout_width="@dimen/bottom_editor_color_picker_size"
         android:layout_height="@dimen/bottom_editor_color_picker_size"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:clickable="false"
         android:padding="@dimen/small_margin"
         android:src="@drawable/circle_background"
@@ -46,7 +46,7 @@
         android:id="@+id/bottom_draw_undo"
         android:layout_width="@dimen/bottom_editor_color_picker_size"
         android:layout_height="@dimen/bottom_editor_color_picker_size"
-        android:layout_marginRight="@dimen/normal_margin"
+        android:layout_marginEnd="@dimen/normal_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="false"
         android:padding="@dimen/medium_margin"
diff --git a/app/src/main/res/layout/bottom_video_time_holder.xml b/app/src/main/res/layout/bottom_video_time_holder.xml
index ec34b6501..53701119c 100644
--- a/app/src/main/res/layout/bottom_video_time_holder.xml
+++ b/app/src/main/res/layout/bottom_video_time_holder.xml
@@ -50,7 +50,6 @@
         android:layout_alignTop="@+id/video_seekbar"
         android:layout_alignBottom="@+id/video_seekbar"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:gravity="center_vertical"
         android:paddingLeft="@dimen/activity_margin"
@@ -64,9 +63,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/video_toggle_play_pause"
         android:layout_toStartOf="@+id/video_duration"
-        android:layout_toLeftOf="@+id/video_duration"
         android:layout_toEndOf="@+id/video_curr_time"
-        android:layout_toRightOf="@+id/video_curr_time"
         android:paddingTop="@dimen/activity_margin"
         android:paddingBottom="@dimen/activity_margin"/>
 
@@ -78,7 +75,6 @@
         android:layout_alignTop="@+id/video_seekbar"
         android:layout_alignBottom="@+id/video_seekbar"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:gravity="center_vertical"
         android:paddingLeft="@dimen/activity_margin"
diff --git a/app/src/main/res/layout/dialog_custom_aspect_ratio.xml b/app/src/main/res/layout/dialog_custom_aspect_ratio.xml
index 3f9180ae0..7650ee275 100644
--- a/app/src/main/res/layout/dialog_custom_aspect_ratio.xml
+++ b/app/src/main/res/layout/dialog_custom_aspect_ratio.xml
@@ -33,8 +33,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/aspect_ratio_width"
         android:layout_alignBottom="@+id/aspect_ratio_width"
-        android:layout_toLeftOf="@+id/aspect_ratio_height"
-        android:layout_toRightOf="@+id/aspect_ratio_width"
+        android:layout_toStartOf="@+id/aspect_ratio_height"
+        android:layout_toEndOf="@+id/aspect_ratio_width"
         android:gravity="center"
         android:text=":"
         android:textStyle="bold"/>
@@ -44,8 +44,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
-        android:layout_marginLeft="50dp"
-        android:layout_toRightOf="@+id/aspect_ratio_width_label"
+        android:layout_toEndOf="@+id/aspect_ratio_width_label"
         android:text="@string/height"/>
 
     <com.simplemobiletools.commons.views.MyEditText
@@ -54,7 +53,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/aspect_ratio_width_label"
         android:layout_alignStart="@+id/aspect_ratio_height_label"
-        android:layout_alignLeft="@+id/aspect_ratio_height_label"
         android:inputType="number"
         android:maxLength="6"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index 5c45c16de..b41be6412 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -7,8 +7,6 @@
     android:layout_height="match_parent">
 
     <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/directories_grid_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -27,9 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:paddingStart="@dimen/normal_margin"
-            android:paddingLeft="@dimen/normal_margin">
+            android:paddingStart="@dimen/normal_margin">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -40,7 +36,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentBottom="true"
             android:paddingTop="@dimen/normal_margin">
 
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index c9b59d2d8..cc06575dc 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -19,9 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:paddingStart="@dimen/normal_margin"
-        android:paddingLeft="@dimen/normal_margin">
+        android:paddingStart="@dimen/normal_margin">
 
         <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -32,7 +30,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentBottom="true"
         android:paddingTop="@dimen/normal_margin">
 
diff --git a/app/src/main/res/layout/dialog_other_aspect_ratio.xml b/app/src/main/res/layout/dialog_other_aspect_ratio.xml
index 61487c688..661245a51 100644
--- a/app/src/main/res/layout/dialog_other_aspect_ratio.xml
+++ b/app/src/main/res/layout/dialog_other_aspect_ratio.xml
@@ -27,7 +27,7 @@
                 android:id="@+id/other_aspect_ratio_2_1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="2:1"
@@ -37,18 +37,17 @@
                 android:id="@+id/other_aspect_ratio_3_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="3:2"
                 android:textSize="@dimen/bigger_text_size"/>
 
-
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_4_3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="4:3"
@@ -58,7 +57,7 @@
                 android:id="@+id/other_aspect_ratio_5_3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="5:3"
@@ -68,7 +67,7 @@
                 android:id="@+id/other_aspect_ratio_16_9"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="16:9"
@@ -78,7 +77,7 @@
                 android:id="@+id/other_aspect_ratio_19_9"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="19:9"
@@ -88,7 +87,7 @@
                 android:id="@+id/other_aspect_ratio_custom"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="@string/custom"
@@ -107,7 +106,7 @@
                 android:id="@+id/other_aspect_ratio_1_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="1:2"
@@ -117,7 +116,7 @@
                 android:id="@+id/other_aspect_ratio_2_3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="2:3"
@@ -128,7 +127,7 @@
                 android:id="@+id/other_aspect_ratio_3_4"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="3:4"
@@ -138,7 +137,7 @@
                 android:id="@+id/other_aspect_ratio_3_5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="3:5"
@@ -148,7 +147,7 @@
                 android:id="@+id/other_aspect_ratio_9_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="9:16"
@@ -158,7 +157,7 @@
                 android:id="@+id/other_aspect_ratio_9_19"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/small_margin"
+                android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="9:19"
diff --git a/app/src/main/res/layout/dialog_resize_image.xml b/app/src/main/res/layout/dialog_resize_image.xml
index 1f1300337..97283e806 100644
--- a/app/src/main/res/layout/dialog_resize_image.xml
+++ b/app/src/main/res/layout/dialog_resize_image.xml
@@ -32,8 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
-        android:layout_marginLeft="50dp"
-        android:layout_toRightOf="@+id/image_width_label"
+        android:layout_toEndOf="@+id/image_width_label"
         android:text="@string/height"/>
 
     <com.simplemobiletools.commons.views.MyEditText
@@ -42,7 +41,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_width_label"
         android:layout_alignStart="@+id/image_height_label"
-        android:layout_alignLeft="@+id/image_height_label"
         android:inputType="number"
         android:maxLength="6"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/dialog_save_as.xml b/app/src/main/res/layout/dialog_save_as.xml
index 61033e0bc..c490a44a1 100644
--- a/app/src/main/res/layout/dialog_save_as.xml
+++ b/app/src/main/res/layout/dialog_save_as.xml
@@ -18,10 +18,10 @@
         android:id="@+id/save_as_path"
         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"/>
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/save_as_name"
diff --git a/app/src/main/res/layout/dialog_slideshow.xml b/app/src/main/res/layout/dialog_slideshow.xml
index 06b7e813d..611da4f87 100644
--- a/app/src/main/res/layout/dialog_slideshow.xml
+++ b/app/src/main/res/layout/dialog_slideshow.xml
@@ -17,7 +17,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin"
             android:text="@string/interval"/>
@@ -27,9 +26,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:ems="5"
-            android:gravity="right"
+            android:gravity="end"
             android:imeOptions="actionDone"
             android:inputType="number"
             android:maxLength="5"
@@ -43,7 +41,6 @@
             android:layout_below="@+id/interval_label"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin">
 
@@ -64,7 +61,6 @@
             android:layout_below="@+id/include_videos_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin">
 
@@ -85,7 +81,6 @@
             android:layout_below="@+id/include_gifs_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin">
 
@@ -106,7 +101,6 @@
             android:layout_below="@+id/random_order_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin"
             android:visibility="gone">
@@ -128,7 +122,6 @@
             android:layout_below="@+id/use_fade_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin">
 
@@ -149,7 +142,6 @@
             android:layout_below="@+id/move_backwards_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin">
 
diff --git a/app/src/main/res/layout/directory_item_grid.xml b/app/src/main/res/layout/directory_item_grid.xml
index 550001a4a..9f72281c9 100644
--- a/app/src/main/res/layout/directory_item_grid.xml
+++ b/app/src/main/res/layout/directory_item_grid.xml
@@ -17,10 +17,9 @@
         android:id="@+id/dir_check"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
-        android:layout_alignRight="@+id/dir_shadow_holder"
+        android:layout_alignEnd="@+id/dir_shadow_holder"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -32,7 +31,6 @@
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_black_background"
@@ -44,8 +42,8 @@
         android:id="@+id/dir_shadow_holder"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tmb_shadow_height"
-        android:layout_alignLeft="@+id/dir_bottom_holder"
-        android:layout_alignRight="@+id/dir_bottom_holder"
+        android:layout_alignStart="@+id/dir_bottom_holder"
+        android:layout_alignEnd="@+id/dir_bottom_holder"
         android:layout_alignParentBottom="true"
         android:background="@drawable/gradient_background"/>
 
@@ -53,8 +51,8 @@
         android:id="@+id/dir_bottom_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/dir_thumbnail"
-        android:layout_alignRight="@+id/dir_thumbnail"
+        android:layout_alignStart="@+id/dir_thumbnail"
+        android:layout_alignEnd="@+id/dir_thumbnail"
         android:layout_alignParentBottom="true"
         android:gravity="bottom"
         android:orientation="vertical"
@@ -69,9 +67,9 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
+            android:paddingBottom="@dimen/small_margin"
             android:shadowColor="@color/default_background_color"
             android:shadowRadius="4"
-            android:paddingBottom="@dimen/small_margin"
             android:textColor="@android:color/white"
             android:textSize="@dimen/normal_text_size"/>
 
@@ -88,11 +86,10 @@
         android:id="@+id/dir_location"
         android:layout_width="@dimen/sd_card_icon_size"
         android:layout_height="@dimen/sd_card_icon_size"
-        android:layout_alignRight="@+id/dir_bottom_holder"
+        android:layout_alignEnd="@+id/dir_bottom_holder"
         android:layout_alignParentBottom="true"
         android:alpha="0.8"
         android:paddingEnd="@dimen/small_margin"
-        android:paddingRight="@dimen/small_margin"
         android:paddingBottom="@dimen/small_margin"
         android:src="@drawable/ic_sd_card"
         android:visibility="gone"/>
diff --git a/app/src/main/res/layout/directory_item_list.xml b/app/src/main/res/layout/directory_item_list.xml
index 4a0036d7f..8534c4552 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
-    android:paddingLeft="@dimen/small_margin"
+    android:paddingStart="@dimen/small_margin"
     android:paddingTop="@dimen/small_margin">
 
     <com.simplemobiletools.gallery.pro.views.MySquareImageView
@@ -20,7 +20,6 @@
         android:layout_height="@dimen/selection_check_size"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -31,7 +30,7 @@
         android:id="@+id/dir_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/dir_thumbnail"
+        android:layout_toEndOf="@+id/dir_thumbnail"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingLeft="6dp"
@@ -44,12 +43,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/dir_name"
-        android:layout_alignLeft="@+id/dir_name"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_alignStart="@+id/dir_name"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:alpha="0.4"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:textColor="@android:color/white"
         android:textSize="@dimen/smaller_text_size"/>
 
@@ -58,7 +57,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/dir_name"
-        android:layout_toRightOf="@+id/dir_name"
+        android:layout_toEndOf="@+id/dir_name"
         android:alpha="0.4"
         android:textColor="@android:color/white"
         android:textSize="@dimen/smaller_text_size"/>
@@ -68,9 +67,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:gravity="end"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/tiny_margin">
@@ -98,7 +96,7 @@
         android:layout_height="1dp"
         android:layout_alignBottom="@+id/dir_thumbnail"
         android:layout_marginTop="2dp"
-        android:layout_toRightOf="@+id/dir_thumbnail"
+        android:layout_toEndOf="@+id/dir_thumbnail"
         android:background="@drawable/divider"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/pager_photo_item.xml b/app/src/main/res/layout/pager_photo_item.xml
index 7484532eb..2336176cb 100644
--- a/app/src/main/res/layout/pager_photo_item.xml
+++ b/app/src/main/res/layout/pager_photo_item.xml
@@ -45,7 +45,7 @@
         android:id="@+id/photo_details"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginLeft="@dimen/small_margin"
         android:layout_marginRight="@dimen/small_margin"
         android:background="@color/gradient_grey_start"
@@ -59,8 +59,7 @@
         android:id="@+id/photo_brightness_controller"
         android:layout_width="@dimen/media_side_slider_width"
         android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"/>
+        android:layout_alignParentStart="true"/>
 
     <TextView
         android:id="@+id/slide_info"
@@ -88,7 +87,6 @@
         android:id="@+id/instant_next_item"
         android:layout_width="@dimen/instant_change_bar_width"
         android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"/>
+        android:layout_alignParentEnd="true"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/pager_video_item.xml b/app/src/main/res/layout/pager_video_item.xml
index 9db21e6a4..4a18f5add 100644
--- a/app/src/main/res/layout/pager_video_item.xml
+++ b/app/src/main/res/layout/pager_video_item.xml
@@ -28,8 +28,7 @@
         android:id="@+id/video_volume_controller"
         android:layout_width="@dimen/media_side_slider_width"
         android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"/>
+        android:layout_alignParentEnd="true"/>
 
     <com.simplemobiletools.gallery.pro.views.MediaSideScroll
         android:id="@+id/video_brightness_controller"
@@ -45,8 +44,7 @@
         android:id="@+id/instant_next_item"
         android:layout_width="@dimen/instant_change_bar_width"
         android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"/>
+        android:layout_alignParentEnd="true"/>
 
     <ImageView
         android:id="@+id/video_play_outline"
@@ -69,7 +67,7 @@
         android:id="@+id/video_details"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginLeft="@dimen/small_margin"
         android:layout_marginRight="@dimen/small_margin"
         android:background="@color/gradient_grey_start"
diff --git a/app/src/main/res/layout/photo_video_item_list.xml b/app/src/main/res/layout/photo_video_item_list.xml
index aada823ec..3acf413c3 100644
--- a/app/src/main/res/layout/photo_video_item_list.xml
+++ b/app/src/main/res/layout/photo_video_item_list.xml
@@ -7,7 +7,7 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
-    android:paddingLeft="@dimen/small_margin"
+    android:paddingStart="@dimen/small_margin"
     android:paddingTop="@dimen/small_margin">
 
     <com.simplemobiletools.gallery.pro.views.MySquareImageView
@@ -21,7 +21,6 @@
         android:layout_height="@dimen/selection_check_size"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -34,12 +33,12 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/medium_thumbnail"
         android:layout_alignBottom="@+id/medium_thumbnail"
-        android:layout_toRightOf="@+id/medium_thumbnail"
+        android:layout_toEndOf="@+id/medium_thumbnail"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="3"
-        android:paddingLeft="6dp"
-        android:paddingRight="@dimen/normal_margin"
+        android:paddingStart="6dp"
+        android:paddingEnd="@dimen/normal_margin"
         android:textColor="@android:color/white"
         android:textSize="@dimen/bigger_text_size"
         tools:text="My photo"/>
@@ -48,9 +47,9 @@
         android:id="@+id/play_outline"
         android:layout_width="@dimen/play_outline_icon_size"
         android:layout_height="@dimen/play_outline_icon_size"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:paddingBottom="6dp"
         android:src="@drawable/img_play_outline_empty"
         android:visibility="gone"/>
@@ -61,7 +60,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="6dp"
-        android:layout_toLeftOf="@+id/play_outline"
+        android:layout_toStartOf="@+id/play_outline"
         android:paddingLeft="@dimen/small_margin"
         android:paddingRight="@dimen/small_margin"
         android:paddingBottom="@dimen/small_margin"
@@ -75,7 +74,7 @@
         android:layout_height="1dp"
         android:layout_alignBottom="@+id/medium_thumbnail"
         android:layout_marginTop="2dp"
-        android:layout_toRightOf="@+id/medium_thumbnail"
+        android:layout_toEndOf="@+id/medium_thumbnail"
         android:background="@drawable/divider"/>
 
 </RelativeLayout>