diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt
index 36b1089be..b968b0f9b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt
@@ -33,6 +33,8 @@ class PickDirectoryDialog(
             spanCount = if (isGridViewType) activity.config.dirColumnCnt else 1
         }
 
+        view.directories_fastscroller.updateColors(activity.getAdjustedPrimaryColor())
+
         val builder = AlertDialog.Builder(activity)
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
@@ -124,27 +126,9 @@ class PickDirectoryDialog(
         }
 
         val scrollHorizontally = activity.config.scrollHorizontally && isGridViewType
-        val sorting = activity.config.directorySorting
-        val dateFormat = activity.config.dateFormat
-        val timeFormat = activity.getTimeFormat()
         view.apply {
             directories_grid.adapter = adapter
-
-            /*directories_vertical_fastscroller.isHorizontal = false
-            directories_vertical_fastscroller.beGoneIf(scrollHorizontally)
-
-            directories_horizontal_fastscroller.isHorizontal = true
-            directories_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
-
-            if (scrollHorizontally) {
-                directories_horizontal_fastscroller.setViews(directories_grid) {
-                    directories_horizontal_fastscroller.updateBubbleText(dirs[it].getBubbleText(sorting, activity, dateFormat, timeFormat))
-                }
-            } else {
-                directories_vertical_fastscroller.setViews(directories_grid) {
-                    directories_vertical_fastscroller.updateBubbleText(dirs[it].getBubbleText(sorting, activity, dateFormat, timeFormat))
-                }
-            }*/
+            directories_fastscroller.setScrollVertically(!scrollHorizontally)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt
index 9d16dd0fc..b32912b10 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt
@@ -3,7 +3,7 @@ package com.simplemobiletools.gallery.pro.dialogs
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.getTimeFormat
+import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
 import com.simplemobiletools.commons.views.MyGridLayoutManager
@@ -30,6 +30,8 @@ class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val c
             spanCount = if (isGridViewType) activity.config.mediaColumnCnt else 1
         }
 
+        view.media_fastscroller.updateColors(activity.getAdjustedPrimaryColor())
+
         dialog = AlertDialog.Builder(activity)
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
@@ -72,29 +74,9 @@ class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val c
         }
 
         val scrollHorizontally = activity.config.scrollHorizontally && isGridViewType
-        val sorting = activity.config.getFolderSorting(if (path.isEmpty()) SHOW_ALL else path)
-        val dateFormat = activity.config.dateFormat
-        val timeFormat = activity.getTimeFormat()
         view.apply {
             media_grid.adapter = adapter
-
-            /*media_vertical_fastscroller.isHorizontal = false
-            media_vertical_fastscroller.beGoneIf(scrollHorizontally)
-
-            media_horizontal_fastscroller.isHorizontal = true
-            media_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
-
-            if (scrollHorizontally) {
-                media_horizontal_fastscroller.setViews(media_grid) {
-                    val medium = (media[it] as? Medium)
-                    media_horizontal_fastscroller.updateBubbleText(medium?.getBubbleText(sorting, activity, dateFormat, timeFormat) ?: "")
-                }
-            } else {
-                media_vertical_fastscroller.setViews(media_grid) {
-                    val medium = (media[it] as? Medium)
-                    media_vertical_fastscroller.updateBubbleText(medium?.getBubbleText(sorting, activity, dateFormat, timeFormat) ?: "")
-                }
-            }*/
+            media_fastscroller.setScrollVertically(!scrollHorizontally)
         }
     }
 }
diff --git a/app/src/main/res/layout/dialog_change_grouping.xml b/app/src/main/res/layout/dialog_change_grouping.xml
index c64aad625..7fce02f3f 100644
--- a/app/src/main/res/layout/dialog_change_grouping.xml
+++ b/app/src/main/res/layout/dialog_change_grouping.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/grouping_dialog_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -26,7 +25,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/do_not_group_files"/>
+                android:text="@string/do_not_group_files" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_last_modified_daily"
@@ -34,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_last_modified_daily"/>
+                android:text="@string/by_last_modified_daily" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_last_modified_monthly"
@@ -42,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_last_modified_monthly"/>
+                android:text="@string/by_last_modified_monthly" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_date_taken_daily"
@@ -50,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_date_taken_daily"/>
+                android:text="@string/by_date_taken_daily" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_date_taken_monthly"
@@ -58,7 +57,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_date_taken_monthly"/>
+                android:text="@string/by_date_taken_monthly" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_file_type"
@@ -66,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_file_type"/>
+                android:text="@string/by_file_type" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_extension"
@@ -74,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_extension"/>
+                android:text="@string/by_extension" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_folder"
@@ -82,12 +81,11 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/by_folder"/>
+                android:text="@string/by_folder" />
 
         </RadioGroup>
 
-        <include
-            layout="@layout/divider"/>
+        <include layout="@layout/divider" />
 
         <RadioGroup
             android:id="@+id/grouping_dialog_radio_order"
@@ -102,7 +100,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/ascending"/>
+                android:text="@string/ascending" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/grouping_dialog_radio_descending"
@@ -110,12 +108,12 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/descending"/>
+                android:text="@string/descending" />
         </RadioGroup>
 
         <include
             android:id="@+id/use_for_this_folder_divider"
-            layout="@layout/divider"/>
+            layout="@layout/divider" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/grouping_dialog_use_for_this_folder"
@@ -123,7 +121,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin"
-            android:text="@string/use_for_this_folder"/>
+            android:text="@string/use_for_this_folder" />
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/grouping_dialog_bottom_note"
@@ -132,7 +130,7 @@
             android:paddingStart="@dimen/small_margin"
             android:paddingEnd="@dimen/medium_margin"
             android:text="@string/grouping_and_sorting"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_change_view_type.xml b/app/src/main/res/layout/dialog_change_view_type.xml
index b6e1f342c..df69116a8 100644
--- a/app/src/main/res/layout/dialog_change_view_type.xml
+++ b/app/src/main/res/layout/dialog_change_view_type.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/change_view_type_dialog_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -26,7 +25,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/grid"/>
+                android:text="@string/grid" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/change_view_type_dialog_radio_list"
@@ -34,13 +33,13 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/list"/>
+                android:text="@string/list" />
 
         </RadioGroup>
 
         <include
             android:id="@+id/group_direct_subfolders_divider"
-            layout="@layout/divider"/>
+            layout="@layout/divider" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/change_view_type_dialog_group_direct_subfolders"
@@ -48,7 +47,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin"
-            android:text="@string/group_direct_subfolders"/>
+            android:text="@string/group_direct_subfolders" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/change_view_type_dialog_use_for_this_folder"
@@ -56,7 +55,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin"
-            android:text="@string/use_for_this_folder"/>
+            android:text="@string/use_for_this_folder" />
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_confirm_delete_folder.xml b/app/src/main/res/layout/dialog_confirm_delete_folder.xml
index 220c36f09..495254160 100644
--- a/app/src/main/res/layout/dialog_confirm_delete_folder.xml
+++ b/app/src/main/res/layout/dialog_confirm_delete_folder.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialog_confirm_delete_folder_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -12,7 +11,7 @@
         android:paddingLeft="@dimen/big_margin"
         android:paddingTop="@dimen/big_margin"
         android:paddingRight="@dimen/big_margin"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
     <TextView
         android:id="@+id/message_warning"
@@ -24,6 +23,6 @@
         android:paddingRight="@dimen/big_margin"
         android:paddingBottom="@dimen/activity_margin"
         android:textColor="@color/md_red_700"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
 </RelativeLayout>
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 7650ee275..c60a61a17 100644
--- a/app/src/main/res/layout/dialog_custom_aspect_ratio.xml
+++ b/app/src/main/res/layout/dialog_custom_aspect_ratio.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/aspect_ratio_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,7 +12,7 @@
         android:id="@+id/aspect_ratio_width_label"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
-        android:text="@string/width"/>
+        android:text="@string/width" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/aspect_ratio_width"
@@ -25,7 +24,7 @@
         android:maxLength="6"
         android:maxLines="1"
         android:textCursorDrawable="@null"
-        android:textSize="@dimen/normal_text_size"/>
+        android:textSize="@dimen/normal_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/aspect_ratio_colon_label"
@@ -37,7 +36,7 @@
         android:layout_toEndOf="@+id/aspect_ratio_width"
         android:gravity="center"
         android:text=":"
-        android:textStyle="bold"/>
+        android:textStyle="bold" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/aspect_ratio_height_label"
@@ -45,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_toEndOf="@+id/aspect_ratio_width_label"
-        android:text="@string/height"/>
+        android:text="@string/height" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/aspect_ratio_height"
@@ -57,6 +56,6 @@
         android:maxLength="6"
         android:maxLines="1"
         android:textCursorDrawable="@null"
-        android:textSize="@dimen/normal_text_size"/>
+        android:textSize="@dimen/normal_text_size" />
 
 </RelativeLayout>
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 2f9fc47d5..ffb6890a2 100644
--- a/app/src/main/res/layout/dialog_delete_with_remember.xml
+++ b/app/src/main/res/layout/dialog_delete_with_remember.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/delete_remember_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -12,15 +11,16 @@
         android:id="@+id/delete_remember_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/small_margin"
         android:paddingBottom="@dimen/activity_margin"
         android:text="@string/proceed_with_deletion"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/delete_remember_checkbox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/delete_remember_title"
-        android:text="@string/do_not_ask_again"/>
+        android:text="@string/do_not_ask_again" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_exclude_folder.xml b/app/src/main/res/layout/dialog_exclude_folder.xml
index 8cc0d5886..bb97e3f49 100644
--- a/app/src/main/res/layout/dialog_exclude_folder.xml
+++ b/app/src/main/res/layout/dialog_exclude_folder.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/exclude_folder_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -17,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/exclude_folder_description"
-            android:textSize="@dimen/bigger_text_size"/>
+            android:textSize="@dimen/bigger_text_size" />
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/exclude_folder_parent"
@@ -25,7 +24,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_margin"
             android:text="@string/exclude_folder_parent"
-            android:textSize="@dimen/normal_text_size"/>
+            android:textSize="@dimen/normal_text_size" />
 
         <RadioGroup
             android:id="@+id/exclude_folder_radio_group"
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index 7af877f6f..5e9a02d1c 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -6,7 +6,7 @@
     android:paddingTop="@dimen/activity_margin">
 
     <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-        android:id="@+id/directories_fastscroller"
+        android:id="@+id/media_fastscroller"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
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 661245a51..2a0643443 100644
--- a/app/src/main/res/layout/dialog_other_aspect_ratio.xml
+++ b/app/src/main/res/layout/dialog_other_aspect_ratio.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/other_aspect_ratio_dialog_scrollview"
     android:layout_width="match_parent"
@@ -31,7 +30,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="2:1"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_3_2"
@@ -41,7 +40,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="3:2"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_4_3"
@@ -51,7 +50,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="4:3"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_5_3"
@@ -61,7 +60,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="5:3"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_16_9"
@@ -71,7 +70,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="16:9"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_19_9"
@@ -81,7 +80,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="19:9"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_custom"
@@ -91,7 +90,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="@string/custom"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
         </RadioGroup>
 
@@ -110,7 +109,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="1:2"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_2_3"
@@ -120,7 +119,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="2:3"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
@@ -131,7 +130,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="3:4"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_3_5"
@@ -141,7 +140,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="3:5"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_9_16"
@@ -151,7 +150,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="9:16"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/other_aspect_ratio_9_19"
@@ -161,7 +160,7 @@
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:text="9:19"
-                android:textSize="@dimen/bigger_text_size"/>
+                android:textSize="@dimen/bigger_text_size" />
 
         </RadioGroup>
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_resize_image.xml b/app/src/main/res/layout/dialog_resize_image.xml
index 97283e806..767ad91c9 100644
--- a/app/src/main/res/layout/dialog_resize_image.xml
+++ b/app/src/main/res/layout/dialog_resize_image.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/resize_image_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,7 +12,8 @@
         android:id="@+id/image_width_label"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
-        android:text="@string/width"/>
+        android:paddingStart="@dimen/tiny_margin"
+        android:text="@string/width" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/image_width"
@@ -25,7 +25,7 @@
         android:maxLength="6"
         android:maxLines="1"
         android:textCursorDrawable="@null"
-        android:textSize="@dimen/normal_text_size"/>
+        android:textSize="@dimen/normal_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/image_height_label"
@@ -33,7 +33,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_toEndOf="@+id/image_width_label"
-        android:text="@string/height"/>
+        android:paddingStart="@dimen/tiny_margin"
+        android:text="@string/height" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/image_height"
@@ -45,7 +46,7 @@
         android:maxLength="6"
         android:maxLines="1"
         android:textCursorDrawable="@null"
-        android:textSize="@dimen/normal_text_size"/>
+        android:textSize="@dimen/normal_text_size" />
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/keep_aspect_ratio"
@@ -56,6 +57,6 @@
         android:checked="true"
         android:paddingTop="@dimen/activity_margin"
         android:paddingBottom="@dimen/activity_margin"
-        android:text="@string/keep_aspect_ratio"/>
+        android:text="@string/keep_aspect_ratio" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_resize_image_with_path.xml b/app/src/main/res/layout/dialog_resize_image_with_path.xml
index c1defcff2..3a78b2ec3 100644
--- a/app/src/main/res/layout/dialog_resize_image_with_path.xml
+++ b/app/src/main/res/layout/dialog_resize_image_with_path.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/resize_image_with_path_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,6 +13,7 @@
         android:id="@+id/image_width_label"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/tiny_margin"
         android:text="@string/width"
         android:textSize="@dimen/normal_text_size" />
 
@@ -32,6 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_toEndOf="@+id/image_width_label"
+        android:paddingStart="@dimen/tiny_margin"
         android:text="@string/height"
         android:textSize="@dimen/normal_text_size" />
 
@@ -52,6 +55,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_height"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:layout_marginTop="@dimen/activity_margin"
         android:text="@string/path"
         android:textSize="@dimen/normal_text_size" />
@@ -61,11 +65,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_path_label"
-        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:layout_marginBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/small_margin"
         android:paddingEnd="@dimen/small_margin"
-        android:textSize="@dimen/normal_text_size" />
+        android:textSize="@dimen/normal_text_size"
+        tools:text="@string/internal" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/image_name"
@@ -82,6 +87,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_name"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:text="@string/extension"
         android:textSize="@dimen/normal_text_size" />
 
diff --git a/app/src/main/res/layout/dialog_save_as.xml b/app/src/main/res/layout/dialog_save_as.xml
index c490a44a1..49cf31e6c 100644
--- a/app/src/main/res/layout/dialog_save_as.xml
+++ b/app/src/main/res/layout/dialog_save_as.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/save_as_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,17 +11,19 @@
         android:id="@+id/save_as_path_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:text="@string/path"
-        android:textSize="@dimen/smaller_text_size"/>
+        android:textSize="@dimen/smaller_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/save_as_path"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:layout_marginBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/small_margin"
-        android:paddingEnd="@dimen/small_margin"/>
+        android:paddingEnd="@dimen/small_margin"
+        tools:text="@string/internal" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/save_as_name"
@@ -30,13 +32,14 @@
         android:layout_marginBottom="@dimen/activity_margin"
         android:singleLine="true"
         android:textCursorDrawable="@null"
-        android:textSize="@dimen/normal_text_size"/>
+        android:textSize="@dimen/normal_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/save_as_extension_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/extension"/>
+        android:layout_marginStart="@dimen/tiny_margin"
+        android:text="@string/extension" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/save_as_extension"
@@ -45,6 +48,6 @@
         android:layout_marginBottom="@dimen/activity_margin"
         android:singleLine="true"
         android:textCursorDrawable="@null"
-        android:textSize="@dimen/normal_text_size"/>
+        android:textSize="@dimen/normal_text_size" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_slideshow.xml b/app/src/main/res/layout/dialog_slideshow.xml
index 86120da2c..42505f478 100644
--- a/app/src/main/res/layout/dialog_slideshow.xml
+++ b/app/src/main/res/layout/dialog_slideshow.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/slideshow_scrollview"
     android:layout_width="match_parent"
@@ -10,30 +9,32 @@
         android:id="@+id/slideshow_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_margin">
+        android:orientation="vertical">
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/interval_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:paddingStart="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin"
             android:paddingBottom="@dimen/activity_margin"
-            android:text="@string/interval"/>
+            android:text="@string/interval" />
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/interval_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/normal_margin"
+            android:layout_marginEnd="@dimen/bigger_margin"
             android:ems="5"
             android:gravity="end"
             android:imeOptions="actionDone"
             android:inputType="number"
             android:maxLength="5"
             android:textCursorDrawable="@null"
-            android:textSize="@dimen/normal_text_size"/>
+            android:textSize="@dimen/normal_text_size" />
 
         <RelativeLayout
             android:id="@+id/animation_holder"
@@ -42,7 +43,9 @@
             android:layout_below="@+id/interval_label"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
+            android:paddingStart="@dimen/medium_margin"
             android:paddingTop="@dimen/bigger_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -53,7 +56,7 @@
                 android:layout_toStartOf="@+id/animation_value"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingRight="@dimen/medium_margin"
-                android:text="@string/animation"/>
+                android:text="@string/animation" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/animation_value"
@@ -63,107 +66,92 @@
                 android:layout_marginEnd="@dimen/medium_margin"
                 android:background="@null"
                 android:clickable="false"
-                tools:text="@string/slide"/>
+                tools:text="@string/slide" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/include_videos_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/animation_holder"
-            android:background="?attr/selectableItemBackground"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/include_videos"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:text="@string/include_videos"/>
+                android:text="@string/include_videos" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/include_gifs_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_videos_holder"
-            android:background="?attr/selectableItemBackground"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/include_gifs"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:text="@string/include_gifs"/>
+                android:text="@string/include_gifs" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/random_order_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_gifs_holder"
-            android:background="?attr/selectableItemBackground"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/random_order"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:text="@string/random_order"/>
+                android:text="@string/random_order" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/move_backwards_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/random_order_holder"
-            android:background="?attr/selectableItemBackground"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/move_backwards"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:text="@string/move_backwards"/>
+                android:text="@string/move_backwards" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/loop_slideshow_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/move_backwards_holder"
-            android:background="?attr/selectableItemBackground"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/loop_slideshow"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:text="@string/loop_slideshow"/>
+                android:text="@string/loop_slideshow" />
 
         </RelativeLayout>
     </RelativeLayout>