diff --git a/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml
index 5c0b8716d..8e14dbc1e 100644
--- a/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml
+++ b/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/dialog_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,15 +9,13 @@
         android:id="@+id/dialog_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/normal_margin">
+        android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/dialog_file_style_spacing_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
+            android:background="@drawable/ripple_top_corners"
             android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
             android:paddingEnd="@dimen/normal_margin"
@@ -40,89 +38,74 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/medium_margin"
+                android:layout_marginEnd="@dimen/normal_margin"
                 android:background="@null"
-                android:clickable="false" />
+                android:clickable="false"
+                tools:text="1x" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/dialog_file_style_rounded_corners_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/normal_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/dialog_file_style_rounded_corners"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/rounded_corners"
-                app:switchPadding="@dimen/medium_margin" />
+                android:text="@string/rounded_corners" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/dialog_file_style_animate_gifs_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/normal_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/dialog_file_style_animate_gifs"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/animate_gifs"
-                app:switchPadding="@dimen/medium_margin" />
+                android:text="@string/animate_gifs" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/dialog_file_style_show_thumbnail_video_duration_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/normal_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/dialog_file_style_show_thumbnail_video_duration"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/show_thumbnail_video_duration"
-                app:switchPadding="@dimen/medium_margin" />
+                android:text="@string/show_thumbnail_video_duration" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/dialog_file_style_show_thumbnail_file_types_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/normal_margin">
+            android:background="?attr/selectableItemBackground">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/dialog_file_style_show_thumbnail_file_types"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/show_image_file_types"
-                app:switchPadding="@dimen/medium_margin" />
+                android:text="@string/show_image_file_types" />
 
         </RelativeLayout>
     </LinearLayout>