diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5fda2a812..84912ef58 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,8 +17,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:paddingLeft="@dimen/big_margin"
-            android:paddingRight="@dimen/big_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingRight="@dimen/big_margin"
             android:text="@string/no_media_with_filters"
             android:textSize="@dimen/bigger_text_size"
             android:visibility="gone"/>
@@ -49,8 +49,8 @@
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:paddingLeft="@dimen/normal_margin"
             android:paddingStart="@dimen/normal_margin"
+            android:paddingLeft="@dimen/normal_margin"
             android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
@@ -61,9 +61,9 @@
             android:id="@+id/directories_horizontal_fastscroller"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
             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_manage_folders.xml b/app/src/main/res/layout/activity_manage_folders.xml
index b1256ecc8..e4526f204 100644
--- a/app/src/main/res/layout/activity_manage_folders.xml
+++ b/app/src/main/res/layout/activity_manage_folders.xml
@@ -20,8 +20,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingLeft="@dimen/big_margin"
-        android:paddingRight="@dimen/big_margin"
         android:paddingTop="@dimen/activity_margin"
+        android:paddingRight="@dimen/big_margin"
         android:text="@string/excluded_activity_placeholder"
         android:visibility="gone"/>
 
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index fe95394c1..222ca5826 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -17,8 +17,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:paddingLeft="@dimen/big_margin"
-            android:paddingRight="@dimen/big_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingRight="@dimen/big_margin"
             android:text="@string/no_media_with_filters"
             android:textSize="@dimen/bigger_text_size"
             android:visibility="gone"/>
@@ -49,8 +49,8 @@
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:paddingLeft="@dimen/normal_margin"
             android:paddingStart="@dimen/normal_margin"
+            android:paddingLeft="@dimen/normal_margin"
             android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
@@ -61,9 +61,9 @@
             android:id="@+id/media_horizontal_fastscroller"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
             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 4592d8838..199fb8d8f 100644
--- a/app/src/main/res/layout/activity_panorama_photo.xml
+++ b/app/src/main/res/layout/activity_panorama_photo.xml
@@ -4,7 +4,7 @@
     android:id="@+id/panorama_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FF000000">
+    android:background="@color/md_grey_black">
 
     <com.google.vr.sdk.widgets.pano.VrPanoramaView
         android:id="@+id/panorama_view"
diff --git a/app/src/main/res/layout/activity_panorama_video.xml b/app/src/main/res/layout/activity_panorama_video.xml
index c384f958e..7b7919887 100644
--- a/app/src/main/res/layout/activity_panorama_video.xml
+++ b/app/src/main/res/layout/activity_panorama_video.xml
@@ -4,7 +4,7 @@
     android:id="@+id/vr_video_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FF000000">
+    android:background="@color/md_grey_black">
 
     <com.google.vr.sdk.widgets.video.VrVideoView
         android:id="@+id/vr_video_view"
diff --git a/app/src/main/res/layout/dialog_change_grouping.xml b/app/src/main/res/layout/dialog_change_grouping.xml
index 21292ec5d..d4e6fc02f 100644
--- a/app/src/main/res/layout/dialog_change_grouping.xml
+++ b/app/src/main/res/layout/dialog_change_grouping.xml
@@ -11,8 +11,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:paddingTop="@dimen/activity_margin">
+        android:paddingTop="@dimen/activity_margin"
+        android:paddingRight="@dimen/activity_margin">
 
         <RadioGroup
             android:id="@+id/grouping_dialog_radio_grouping"
@@ -24,48 +24,48 @@
                 android:id="@+id/grouping_dialog_radio_none"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/do_not_group_files"/>
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_last_modified"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/by_last_modified"/>
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_date_taken"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/by_date_taken"/>
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_file_type"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/by_file_type"/>
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_extension"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/by_extension"/>
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_folder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/by_folder"/>
 
         </RadioGroup>
@@ -84,16 +84,16 @@
                 android:id="@+id/grouping_dialog_radio_ascending"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/ascending"/>
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_descending"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/medium_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
                 android:text="@string/descending"/>
         </RadioGroup>
 
@@ -105,8 +105,8 @@
             android:id="@+id/grouping_dialog_use_for_this_folder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/use_for_this_folder"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_delete_with_remember.xml b/app/src/main/res/layout/dialog_delete_with_remember.xml
index df4ea5519..2f9fc47d5 100644
--- a/app/src/main/res/layout/dialog_delete_with_remember.xml
+++ b/app/src/main/res/layout/dialog_delete_with_remember.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="@dimen/big_margin"
-    android:paddingRight="@dimen/big_margin"
-    android:paddingTop="@dimen/big_margin">
+    android:paddingTop="@dimen/big_margin"
+    android:paddingRight="@dimen/big_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/delete_remember_title"
diff --git a/app/src/main/res/layout/dialog_filter_media.xml b/app/src/main/res/layout/dialog_filter_media.xml
index f2ccc2559..b90fc9aeb 100644
--- a/app/src/main/res/layout/dialog_filter_media.xml
+++ b/app/src/main/res/layout/dialog_filter_media.xml
@@ -6,47 +6,47 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingLeft="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"
-    android:paddingTop="@dimen/activity_margin">
+    android:paddingTop="@dimen/activity_margin"
+    android:paddingRight="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/filter_media_images"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
+        android:paddingBottom="@dimen/activity_margin"
         android:text="@string/images"/>
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/filter_media_videos"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
+        android:paddingBottom="@dimen/activity_margin"
         android:text="@string/videos"/>
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/filter_media_gifs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
+        android:paddingBottom="@dimen/activity_margin"
         android:text="@string/gifs"/>
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/filter_media_raws"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
+        android:paddingBottom="@dimen/activity_margin"
         android:text="@string/raw_images"/>
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/filter_media_svgs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
+        android:paddingBottom="@dimen/activity_margin"
         android:text="@string/svgs"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_manage_bottom_actions.xml b/app/src/main/res/layout/dialog_manage_bottom_actions.xml
index 6e58322e4..3e5f7f790 100644
--- a/app/src/main/res/layout/dialog_manage_bottom_actions.xml
+++ b/app/src/main/res/layout/dialog_manage_bottom_actions.xml
@@ -11,103 +11,103 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:paddingTop="@dimen/medium_margin">
+        android:paddingTop="@dimen/medium_margin"
+        android:paddingRight="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_toggle_favorite"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/toggle_favorite"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/edit"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_share"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/share"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_delete"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/delete"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_rotate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/rotate"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_properties"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/properties"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_change_orientation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/change_orientation"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_slideshow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/slideshow"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_show_on_map"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/show_on_map"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_toggle_visibility"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/toggle_file_visibility"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_rename"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/rename"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_bottom_actions_set_as"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/set_as"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_manage_extended_details.xml b/app/src/main/res/layout/dialog_manage_extended_details.xml
index 129adf95e..4b42ab9b2 100644
--- a/app/src/main/res/layout/dialog_manage_extended_details.xml
+++ b/app/src/main/res/layout/dialog_manage_extended_details.xml
@@ -11,71 +11,71 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:paddingTop="@dimen/medium_margin">
+        android:paddingTop="@dimen/medium_margin"
+        android:paddingRight="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/filename"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_path"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/path"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_size"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/size"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_resolution"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/resolution"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_last_modified"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/last_modified"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_date_taken"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/date_taken"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_camera"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/camera"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_exif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/exif"/>
 
         <ImageView
@@ -89,24 +89,24 @@
             android:id="@+id/manage_extended_details_duration"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/duration"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_artist"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/artist"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/manage_extended_details_album"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/album"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index 087ca553c..c9b59d2d8 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -20,8 +20,8 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:paddingLeft="@dimen/normal_margin"
-        android:paddingStart="@dimen/normal_margin">
+        android:paddingStart="@dimen/normal_margin"
+        android:paddingLeft="@dimen/normal_margin">
 
         <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -31,9 +31,9 @@
         android:id="@+id/media_horizontal_fastscroller"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
         android:paddingTop="@dimen/normal_margin">
 
         <include layout="@layout/fastscroller_handle_horizontal"/>
diff --git a/app/src/main/res/layout/dialog_save_as.xml b/app/src/main/res/layout/dialog_save_as.xml
index 7fa48abe4..61033e0bc 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_marginBottom="@dimen/activity_margin"
         android:layout_marginLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/small_margin"
-        android:paddingTop="@dimen/small_margin"/>
+        android:layout_marginBottom="@dimen/activity_margin"
+        android:paddingTop="@dimen/small_margin"
+        android:paddingRight="@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 331b62ad4..48da05572 100644
--- a/app/src/main/res/layout/dialog_slideshow.xml
+++ b/app/src/main/res/layout/dialog_slideshow.xml
@@ -16,10 +16,10 @@
             android:id="@+id/interval_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
+            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/interval"/>
 
         <com.simplemobiletools.commons.views.MyEditText
@@ -42,10 +42,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/interval_label"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin">
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/include_photos"
@@ -63,10 +63,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_photos_holder"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin">
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/include_videos"
@@ -84,10 +84,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_videos_holder"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin">
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/include_gifs"
@@ -105,10 +105,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_gifs_holder"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin">
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/random_order"
@@ -126,10 +126,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/random_order_holder"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
+            android:paddingLeft="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:visibility="gone">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -148,10 +148,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/use_fade_holder"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin">
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/move_backwards"
@@ -169,10 +169,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/move_backwards_holder"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingLeft="@dimen/medium_margin"
             android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin">
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/loop_slideshow"
diff --git a/app/src/main/res/layout/directory_item_grid.xml b/app/src/main/res/layout/directory_item_grid.xml
index 5853323c5..4eab84e66 100644
--- a/app/src/main/res/layout/directory_item_grid.xml
+++ b/app/src/main/res/layout/directory_item_grid.xml
@@ -17,10 +17,10 @@
         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_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignRight="@+id/dir_shadow_holder"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -31,8 +31,8 @@
         android:id="@+id/dir_pin"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_black_background"
@@ -45,8 +45,8 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/tmb_shadow_height"
         android:layout_alignLeft="@+id/dir_bottom_holder"
-        android:layout_alignParentBottom="true"
         android:layout_alignRight="@+id/dir_bottom_holder"
+        android:layout_alignParentBottom="true"
         android:background="@drawable/gradient_background"/>
 
     <LinearLayout
@@ -54,14 +54,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/dir_thumbnail"
-        android:layout_alignParentBottom="true"
         android:layout_alignRight="@+id/dir_thumbnail"
+        android:layout_alignParentBottom="true"
         android:gravity="bottom"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/small_margin"
         android:paddingLeft="@dimen/medium_margin"
+        android:paddingTop="@dimen/small_margin"
         android:paddingRight="@dimen/medium_margin"
-        android:paddingTop="@dimen/small_margin">
+        android:paddingBottom="@dimen/small_margin">
 
         <TextView
             android:id="@+id/dir_name"
@@ -86,12 +86,12 @@
         android:id="@+id/dir_location"
         android:layout_width="@dimen/sd_card_icon_size"
         android:layout_height="@dimen/sd_card_icon_size"
-        android:layout_alignParentBottom="true"
         android:layout_alignRight="@+id/dir_bottom_holder"
+        android:layout_alignParentBottom="true"
         android:alpha="0.8"
-        android:paddingBottom="@dimen/small_margin"
         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 a22820f5b..4a0036d7f 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -18,9 +18,9 @@
         android:id="@+id/dir_check"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
+        android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -43,8 +43,8 @@
         android:id="@+id/dir_path"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/dir_name"
         android:layout_below="@+id/dir_name"
+        android:layout_alignLeft="@+id/dir_name"
         android:layout_marginRight="@dimen/activity_margin"
         android:alpha="0.4"
         android:ellipsize="end"
@@ -67,9 +67,9 @@
         android:id="@+id/dir_icon_holder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/small_margin"
         android:gravity="end"
         android:orientation="horizontal"
diff --git a/app/src/main/res/layout/photo_video_item_grid.xml b/app/src/main/res/layout/photo_video_item_grid.xml
index 20db8c048..14c85348d 100644
--- a/app/src/main/res/layout/photo_video_item_grid.xml
+++ b/app/src/main/res/layout/photo_video_item_grid.xml
@@ -17,10 +17,10 @@
         android:id="@+id/medium_check"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
+        android:layout_alignRight="@+id/medium_name"
+        android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignRight="@+id/medium_name"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -31,8 +31,8 @@
         android:id="@+id/play_outline"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:src="@drawable/img_play_outline"
@@ -42,15 +42,15 @@
         android:id="@+id/video_duration"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         android:background="@drawable/gradient_background"
         android:ellipsize="end"
         android:gravity="right"
         android:maxLines="1"
-        android:paddingBottom="@dimen/small_margin"
         android:paddingLeft="@dimen/small_margin"
         android:paddingRight="@dimen/small_margin"
+        android:paddingBottom="@dimen/small_margin"
         android:textColor="@android:color/white"
         android:textSize="@dimen/normal_text_size"
         android:visibility="gone"/>
@@ -60,15 +60,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/medium_thumbnail"
-        android:layout_alignParentBottom="true"
         android:layout_alignRight="@+id/medium_thumbnail"
+        android:layout_alignParentBottom="true"
         android:background="@drawable/gradient_background"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="3"
-        android:paddingBottom="@dimen/small_margin"
         android:paddingLeft="@dimen/small_margin"
         android:paddingRight="@dimen/small_margin"
+        android:paddingBottom="@dimen/small_margin"
         android:textColor="@android:color/white"
         android:textSize="@dimen/smaller_text_size"/>
 
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 749a292bc..425107e83 100644
--- a/app/src/main/res/layout/photo_video_item_list.xml
+++ b/app/src/main/res/layout/photo_video_item_list.xml
@@ -18,9 +18,9 @@
         android:id="@+id/medium_check"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
+        android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
@@ -31,8 +31,8 @@
         android:id="@+id/medium_name"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/medium_thumbnail"
         android:layout_alignTop="@+id/medium_thumbnail"
+        android:layout_alignBottom="@+id/medium_thumbnail"
         android:layout_toRightOf="@+id/medium_thumbnail"
         android:ellipsize="end"
         android:gravity="center_vertical"
@@ -46,8 +46,8 @@
         android:id="@+id/play_outline"
         android:layout_width="@dimen/play_outline_icon_size"
         android:layout_height="@dimen/play_outline_icon_size"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/small_margin"
         android:paddingBottom="6dp"
         android:src="@drawable/img_play_outline_empty"