diff --git a/app/build.gradle b/app/build.gradle
index ee66f1ee4..42ab80fc6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:48cbb592e2'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:b7ffe4848e'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
diff --git a/app/src/main/res/layout/dialog_change_grouping.xml b/app/src/main/res/layout/dialog_change_grouping.xml
index 2cb9731ef..683b30550 100644
--- a/app/src/main/res/layout/dialog_change_grouping.xml
+++ b/app/src/main/res/layout/dialog_change_grouping.xml
@@ -99,16 +99,14 @@
             android:id="@+id/grouping_dialog_show_file_count"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin"
+            android:minHeight="@dimen/min_radio_checkbox_height"
             android:text="@string/show_file_count_section_header" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/grouping_dialog_use_for_this_folder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin"
+            android:minHeight="@dimen/min_radio_checkbox_height"
             android:text="@string/use_for_this_folder" />
 
         <com.simplemobiletools.commons.views.MyTextView
diff --git a/app/src/main/res/layout/dialog_change_sorting.xml b/app/src/main/res/layout/dialog_change_sorting.xml
index 7fe427d74..a64047385 100644
--- a/app/src/main/res/layout/dialog_change_sorting.xml
+++ b/app/src/main/res/layout/dialog_change_sorting.xml
@@ -95,16 +95,14 @@
             android:id="@+id/sorting_dialog_numeric_sorting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin"
+            android:minHeight="@dimen/min_radio_checkbox_height"
             android:text="@string/sort_numeric_parts" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/sorting_dialog_use_for_this_folder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin"
+            android:minHeight="@dimen/min_radio_checkbox_height"
             android:text="@string/use_for_this_folder" />
 
         <com.simplemobiletools.commons.views.MyTextView