diff --git a/app/src/main/res/layout/activity_conversation_details.xml b/app/src/main/res/layout/activity_conversation_details.xml
index 59f8b609..c3582f39 100644
--- a/app/src/main/res/layout/activity_conversation_details.xml
+++ b/app/src/main/res/layout/activity_conversation_details.xml
@@ -26,21 +26,21 @@
             style="@style/SettingsSectionLabelStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/notifications"
             android:visibility="gone"
-            tools:visibility="visible"
-            android:text="@string/notifications" />
+            tools:visibility="visible" />
 
         <RelativeLayout
             android:id="@+id/custom_notifications_holder"
-            style="@style/SettingsHolderCheckboxStyle"
+            style="@style/SettingsHolderSwitchStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:visibility="visible"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
-            <org.fossify.commons.views.MyAppCompatCheckbox
+            <org.fossify.commons.views.MyMaterialSwitch
                 android:id="@+id/custom_notifications"
-                style="@style/SettingsCheckboxStyle"
+                style="@style/SettingsSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/enable_custom_notifications" />
@@ -49,12 +49,12 @@
 
         <org.fossify.commons.views.MyTextView
             android:id="@+id/custom_notifications_button"
+            style="@style/SettingsHolderTextViewOneLinerStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/customize_notifications"
             android:visibility="gone"
-            tools:visibility="visible"
-            style="@style/SettingsHolderTextViewOneLinerStyle"
-            android:text="@string/customize_notifications" />
+            tools:visibility="visible" />
 
         <include
             android:id="@+id/settings_conversation_notifications_divider"
@@ -69,6 +69,7 @@
 
         <org.fossify.commons.views.MyTextView
             android:id="@+id/conversation_name"
+            style="@style/SettingsHolderTextViewOneLinerStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
@@ -78,7 +79,6 @@
             android:ellipsize="end"
             android:focusable="true"
             android:maxLines="1"
-            style="@style/SettingsHolderTextViewOneLinerStyle"
             android:textSize="@dimen/bigger_text_size"
             tools:text="Conversation name" />
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 6e4ad18c..f68179a9 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -80,13 +80,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_use_english_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_use_english"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/use_english_language" />
@@ -246,13 +246,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_show_character_counter_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_show_character_counter"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/show_character_counter" />
@@ -261,13 +261,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_use_simple_characters_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_use_simple_characters"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/use_simple_characters" />
@@ -276,13 +276,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_send_on_enter_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_send_on_enter"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/send_on_enter" />
@@ -291,13 +291,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_enable_delivery_reports_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_enable_delivery_reports"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/enable_delivery_reports" />
@@ -306,13 +306,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_send_long_message_mms_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_send_long_message_mms"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/send_long_message_mms" />
@@ -321,13 +321,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_send_group_message_mms_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_send_group_message_mms"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/group_message_mms" />
@@ -370,13 +370,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_use_recycle_bin_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_use_recycle_bin"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/move_items_into_recycle_bin" />
@@ -419,13 +419,13 @@
 
             <RelativeLayout
                 android:id="@+id/settings_app_password_protection_holder"
-                style="@style/SettingsHolderCheckboxStyle"
+                style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyMaterialSwitch
                     android:id="@+id/settings_app_password_protection"
-                    style="@style/SettingsCheckboxStyle"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/password_protect_whole_app" />
diff --git a/app/src/main/res/layout/dialog_delete_confirmation.xml b/app/src/main/res/layout/dialog_delete_confirmation.xml
index 5cf7b8fc..d4b2485f 100644
--- a/app/src/main/res/layout/dialog_delete_confirmation.xml
+++ b/app/src/main/res/layout/dialog_delete_confirmation.xml
@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/small_margin"
+        android:paddingEnd="0dp"
         android:paddingBottom="@dimen/activity_margin"
         android:text="@string/delete_whole_conversation_confirmation"
         android:textSize="@dimen/bigger_text_size" />