diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 328573932..93478b89c 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.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/settings_scrollview"
     android:layout_width="match_parent"
@@ -29,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/customize_colors"/>
+                android:text="@string/customize_colors" />
 
         </RelativeLayout>
 
@@ -50,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/manage_event_types"/>
+                android:text="@string/manage_event_types" />
 
         </RelativeLayout>
 
@@ -72,7 +71,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/use_english_language"/>
+                android:text="@string/use_english_language" />
 
         </RelativeLayout>
 
@@ -94,7 +93,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/use_24_hour_time_format"/>
+                android:text="@string/use_24_hour_time_format" />
 
         </RelativeLayout>
 
@@ -116,7 +115,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/sunday_first"/>
+                android:text="@string/sunday_first" />
 
         </RelativeLayout>
 
@@ -125,10 +124,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/event_reminders"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_vibrate_holder"
@@ -148,7 +147,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/vibrate"/>
+                android:text="@string/vibrate" />
 
         </RelativeLayout>
 
@@ -170,7 +169,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/loop_reminders"/>
+                android:text="@string/loop_reminders" />
 
         </RelativeLayout>
 
@@ -193,7 +192,7 @@
                 android:layout_toStartOf="@+id/settings_reminder_sound"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/reminder_sound"/>
+                android:text="@string/reminder_sound" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_reminder_sound"
@@ -202,7 +201,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -224,7 +223,7 @@
                 android:layout_toStartOf="@+id/settings_reminder_audio_stream"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/reminder_stream"/>
+                android:text="@string/reminder_stream" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_reminder_audio_stream"
@@ -233,7 +232,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -255,7 +254,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/use_same_snooze"/>
+                android:text="@string/use_same_snooze" />
 
         </RelativeLayout>
 
@@ -278,7 +277,7 @@
                 android:layout_toStartOf="@+id/settings_snooze_time"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/snooze_time"/>
+                android:text="@string/snooze_time" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_snooze_time"
@@ -287,7 +286,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -296,10 +295,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/caldav"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_caldav_sync_holder"
@@ -319,7 +318,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/caldav_sync"/>
+                android:text="@string/caldav_sync" />
 
         </RelativeLayout>
 
@@ -341,7 +340,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/enable_pull_to_refresh"/>
+                android:text="@string/enable_pull_to_refresh" />
 
         </RelativeLayout>
 
@@ -363,7 +362,7 @@
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/manage_synced_calendars"/>
+                android:text="@string/manage_synced_calendars" />
 
         </RelativeLayout>
 
@@ -372,19 +371,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/new_events"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_default_start_time_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -393,9 +392,9 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_default_start_time"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/default_start_time"/>
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
+                android:text="@string/default_start_time" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_default_start_time"
@@ -405,7 +404,7 @@
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
                 android:clickable="false"
-                tools:text="@string/next_full_hour"/>
+                tools:text="@string/next_full_hour" />
 
         </RelativeLayout>
 
@@ -414,9 +413,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -425,9 +424,9 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_default_duration"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/default_duration"/>
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
+                android:text="@string/default_duration" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_default_duration"
@@ -437,7 +436,7 @@
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
                 android:clickable="false"
-                tools:text="0 minutes"/>
+                tools:text="0 minutes" />
 
         </RelativeLayout>
 
@@ -446,9 +445,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -457,9 +456,9 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_default_event_type"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/default_event_type"/>
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
+                android:text="@string/default_event_type" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_default_event_type"
@@ -469,7 +468,7 @@
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
                 android:clickable="false"
-                tools:text="@string/last_used_one"/>
+                tools:text="@string/last_used_one" />
 
         </RelativeLayout>
 
@@ -491,7 +490,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/use_last_event_reminders"/>
+                android:text="@string/use_last_event_reminders" />
 
         </RelativeLayout>
 
@@ -514,7 +513,7 @@
                 android:layout_toStartOf="@+id/settings_default_reminder_1"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/default_reminder_1"/>
+                android:text="@string/default_reminder_1" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_default_reminder_1"
@@ -523,7 +522,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -546,7 +545,7 @@
                 android:layout_toStartOf="@+id/settings_default_reminder_2"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/default_reminder_2"/>
+                android:text="@string/default_reminder_2" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_default_reminder_2"
@@ -555,7 +554,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -578,7 +577,7 @@
                 android:layout_toStartOf="@+id/settings_default_reminder_3"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/default_reminder_3"/>
+                android:text="@string/default_reminder_3" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_default_reminder_3"
@@ -587,7 +586,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -596,10 +595,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/weekly_view"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_start_weekly_at_holder"
@@ -620,7 +619,7 @@
                 android:layout_toStartOf="@+id/settings_start_weekly_at"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/start_day_at"/>
+                android:text="@string/start_day_at" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_start_weekly_at"
@@ -629,7 +628,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -638,10 +637,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/monthly_view"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_week_numbers_holder"
@@ -661,7 +660,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/week_numbers"/>
+                android:text="@string/week_numbers" />
 
         </RelativeLayout>
 
@@ -682,7 +681,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/show_a_grid"/>
+                android:text="@string/show_a_grid" />
 
         </RelativeLayout>
 
@@ -691,10 +690,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/event_lists"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_replace_description_holder"
@@ -714,7 +713,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/replace_description_with_location"/>
+                android:text="@string/replace_description_with_location" />
 
         </RelativeLayout>
 
@@ -736,7 +735,7 @@
                 android:layout_toStartOf="@+id/settings_display_past_events"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/display_past_events"/>
+                android:text="@string/display_past_events" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_display_past_events"
@@ -745,7 +744,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -754,10 +753,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/widgets"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_font_size_holder"
@@ -777,7 +776,7 @@
                 android:layout_toStartOf="@+id/settings_font_size"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/font_size"/>
+                android:text="@string/font_size" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_font_size"
@@ -786,7 +785,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -808,7 +807,7 @@
                 android:layout_toStartOf="@+id/settings_list_widget_view_to_open"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/view_to_open_from_widget"/>
+                android:text="@string/view_to_open_from_widget" />
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_list_widget_view_to_open"
@@ -817,7 +816,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/small_margin"
                 android:background="@null"
-                android:clickable="false"/>
+                android:clickable="false" />
 
         </RelativeLayout>
 
@@ -837,7 +836,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/customize_widget_colors"/>
+                android:text="@string/customize_widget_colors" />
 
         </RelativeLayout>
 
@@ -846,10 +845,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/events"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_dim_past_events_holder"
@@ -869,7 +868,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/dim_past_events"/>
+                android:text="@string/dim_past_events" />
 
         </RelativeLayout>
 
@@ -890,7 +889,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/allow_changing_time_zones"/>
+                android:text="@string/allow_changing_time_zones" />
 
         </RelativeLayout>
 
@@ -911,7 +910,7 @@
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingEnd="@dimen/medium_margin"
-                android:text="@string/delete_all_events"/>
+                android:text="@string/delete_all_events" />
 
         </RelativeLayout>
 
@@ -920,10 +919,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/bigger_margin"
-            android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginTop="@dimen/section_margin"
             android:text="@string/migrating"
             android:textAllCaps="true"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size" />
 
         <RelativeLayout
             android:id="@+id/settings_export_holder"
@@ -931,9 +930,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -942,7 +941,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/export_settings"/>
+                android:text="@string/export_settings" />
 
         </RelativeLayout>
 
@@ -952,9 +951,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -963,7 +962,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/import_settings"/>
+                android:text="@string/import_settings" />
 
         </RelativeLayout>
     </LinearLayout>