diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index 0cb256bcf..b78657e38 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -6,7 +6,6 @@ import android.widget.AdapterView
 import com.simplemobiletools.gallery.R
 import kotlinx.android.synthetic.main.activity_settings.*
 
-
 class SettingsActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index c4cfd573a..8361a4f69 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -38,24 +38,16 @@
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin">
 
-            <TextView
-                android:id="@+id/settings_same_sorting_label"
-                android:layout_width="wrap_content"
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_same_sorting"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:background="@null"
+                android:clickable="false"
                 android:paddingLeft="@dimen/settings_padding"
                 android:paddingStart="@dimen/settings_padding"
                 android:text="@string/same_sorting"/>
 
-            <android.support.v7.widget.SwitchCompat
-                android:id="@+id/settings_same_sorting"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:background="@null"
-                android:clickable="false"/>
-
         </RelativeLayout>
 
         <RelativeLayout
@@ -66,24 +58,16 @@
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin">
 
-            <TextView
-                android:id="@+id/settings_show_hidden_folders_label"
-                android:layout_width="wrap_content"
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_show_hidden_folders"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:background="@null"
+                android:clickable="false"
                 android:paddingLeft="@dimen/settings_padding"
                 android:paddingStart="@dimen/settings_padding"
                 android:text="@string/show_hidden_folders"/>
 
-            <android.support.v7.widget.SwitchCompat
-                android:id="@+id/settings_show_hidden_folders"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:background="@null"
-                android:clickable="false"/>
-
         </RelativeLayout>
 
         <RelativeLayout
@@ -94,24 +78,16 @@
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin">
 
-            <TextView
-                android:id="@+id/settings_autoplay_videos_label"
-                android:layout_width="wrap_content"
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_autoplay_videos"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:background="@null"
+                android:clickable="false"
                 android:paddingLeft="@dimen/settings_padding"
                 android:paddingStart="@dimen/settings_padding"
                 android:text="@string/autoplay_videos"/>
 
-            <android.support.v7.widget.SwitchCompat
-                android:id="@+id/settings_autoplay_videos"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:background="@null"
-                android:clickable="false"/>
-
         </RelativeLayout>
 
         <RelativeLayout
@@ -133,7 +109,7 @@
                 android:paddingStart="@dimen/settings_padding"
                 android:text="@string/show_media"/>
 
-            <android.support.v7.widget.AppCompatSpinner
+            <com.simplemobiletools.commons.views.MyAppCompatSpinner
                 android:id="@+id/settings_show_media"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"