diff --git a/app/build.gradle b/app/build.gradle
index 4ee084d68..603d8dcc1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.1.4'
+    implementation 'com.simplemobiletools:commons:5.2.1'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'androidx.multidex:multidex:2.0.0'
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index c62364dfd..8d7b01b6c 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -17,8 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
             android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginRight="@dimen/activity_margin"
             android:hint="@string/title"
             android:inputType="textCapSentences"
             android:maxLength="180"
@@ -45,15 +45,15 @@
 
         <ImageView
             android:id="@+id/event_show_on_map"
-            style="@style/MyBorderlessBackgroundStyle"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_alignTop="@+id/event_location"
             android:layout_alignBottom="@+id/event_location"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/event_location"
             android:layout_marginEnd="@dimen/activity_margin"
             android:layout_marginRight="@dimen/activity_margin"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:paddingLeft="@dimen/small_margin"
             android:paddingRight="@dimen/small_margin"
             android:src="@drawable/ic_place"/>
@@ -64,8 +64,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_location"
             android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
             android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginRight="@dimen/activity_margin"
             android:autoLink="all"
             android:gravity="top"
             android:hint="@string/description"
@@ -80,8 +80,8 @@
             android:layout_width="match_parent"
             android:layout_height="1px"
             android:layout_below="@+id/event_description"
-            android:layout_marginBottom="@dimen/normal_margin"
             android:layout_marginTop="@dimen/activity_margin"
+            android:layout_marginBottom="@dimen/normal_margin"
             android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
@@ -89,11 +89,11 @@
             android:id="@+id/event_time_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/event_all_day"
-            android:layout_alignTop="@+id/event_all_day"
             android:layout_below="@+id/event_description_divider"
-            android:layout_marginLeft="@dimen/normal_margin"
+            android:layout_alignTop="@+id/event_all_day"
+            android:layout_alignBottom="@+id/event_all_day"
             android:layout_marginStart="@dimen/normal_margin"
+            android:layout_marginLeft="@dimen/normal_margin"
             android:alpha="0.8"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_clock"/>
@@ -102,17 +102,17 @@
             android:id="@+id/event_all_day"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/event_description_divider"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/event_description_divider"
-            android:layout_marginEnd="@dimen/normal_margin"
-            android:layout_marginLeft="@dimen/small_margin"
-            android:layout_marginRight="@dimen/normal_margin"
             android:layout_marginStart="@dimen/small_margin"
+            android:layout_marginLeft="@dimen/small_margin"
+            android:layout_marginEnd="@dimen/normal_margin"
+            android:layout_marginRight="@dimen/normal_margin"
             android:layout_toEndOf="@+id/event_time_image"
             android:layout_toRightOf="@+id/event_time_image"
-            android:paddingBottom="@dimen/normal_margin"
             android:paddingTop="@dimen/normal_margin"
+            android:paddingBottom="@dimen/normal_margin"
             android:text="@string/all_day"
             android:textSize="@dimen/day_text_size"
             app:switchPadding="@dimen/small_margin"/>
@@ -121,14 +121,14 @@
             android:id="@+id/event_start_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_all_day"
-            android:layout_alignStart="@+id/event_all_day"
             android:layout_below="@+id/event_time_image"
+            android:layout_alignStart="@+id/event_all_day"
+            android:layout_alignLeft="@+id/event_all_day"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
+            android:paddingTop="@dimen/activity_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingRight="@dimen/activity_margin"
-            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:textSize="@dimen/day_text_size"
             tools:text="January 1 1970"/>
 
@@ -136,9 +136,9 @@
             android:id="@+id/event_start_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/event_time_image"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/event_time_image"
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin"
             android:textSize="@dimen/day_text_size"
@@ -148,14 +148,14 @@
             android:id="@+id/event_end_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_all_day"
-            android:layout_alignStart="@+id/event_all_day"
             android:layout_below="@+id/event_start_date"
+            android:layout_alignStart="@+id/event_all_day"
+            android:layout_alignLeft="@+id/event_all_day"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
+            android:paddingTop="@dimen/activity_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingRight="@dimen/activity_margin"
-            android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:textSize="@dimen/day_text_size"
             tools:text="January 1 1970"/>
 
@@ -163,9 +163,9 @@
             android:id="@+id/event_end_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/event_start_time"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/event_start_time"
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin"
             android:textSize="@dimen/day_text_size"
@@ -176,8 +176,8 @@
             android:layout_width="match_parent"
             android:layout_height="1px"
             android:layout_below="@+id/event_end_date"
-            android:layout_marginBottom="@dimen/medium_margin"
             android:layout_marginTop="@dimen/medium_margin"
+            android:layout_marginBottom="@dimen/medium_margin"
             android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
@@ -185,11 +185,11 @@
             android:id="@+id/event_reminder_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/event_reminder_1"
-            android:layout_alignTop="@+id/event_reminder_1"
             android:layout_below="@+id/event_date_time_divider"
-            android:layout_marginLeft="@dimen/normal_margin"
+            android:layout_alignTop="@+id/event_reminder_1"
+            android:layout_alignBottom="@+id/event_reminder_1"
             android:layout_marginStart="@dimen/normal_margin"
+            android:layout_marginLeft="@dimen/normal_margin"
             android:alpha="0.8"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_bell"/>
@@ -199,26 +199,26 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_date_time_divider"
-            android:layout_marginLeft="@dimen/small_margin"
             android:layout_marginStart="@dimen/small_margin"
+            android:layout_marginLeft="@dimen/small_margin"
             android:layout_toEndOf="@+id/event_reminder_image"
             android:layout_toRightOf="@+id/event_reminder_image"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:textSize="@dimen/day_text_size"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_reminder_2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_reminder_1"
-            android:layout_alignStart="@+id/event_reminder_1"
             android:layout_below="@+id/event_reminder_1"
+            android:layout_alignStart="@+id/event_reminder_1"
+            android:layout_alignLeft="@+id/event_reminder_1"
             android:alpha="0.4"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/add_another_reminder"
             android:textSize="@dimen/day_text_size"
             android:visibility="gone"/>
@@ -227,13 +227,13 @@
             android:id="@+id/event_reminder_3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_reminder_1"
-            android:layout_alignStart="@+id/event_reminder_1"
             android:layout_below="@+id/event_reminder_2"
+            android:layout_alignStart="@+id/event_reminder_1"
+            android:layout_alignLeft="@+id/event_reminder_1"
             android:alpha="0.4"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"
+            android:paddingBottom="@dimen/activity_margin"
             android:text="@string/add_another_reminder"
             android:textSize="@dimen/day_text_size"
             android:visibility="gone"/>
@@ -243,8 +243,8 @@
             android:layout_width="match_parent"
             android:layout_height="1px"
             android:layout_below="@+id/event_reminder_3"
-            android:layout_marginBottom="@dimen/medium_margin"
             android:layout_marginTop="@dimen/medium_margin"
+            android:layout_marginBottom="@dimen/medium_margin"
             android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
@@ -252,11 +252,11 @@
             android:id="@+id/event_repetition_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/event_repetition"
-            android:layout_alignTop="@+id/event_repetition"
             android:layout_below="@+id/event_date_time_divider"
-            android:layout_marginLeft="@dimen/normal_margin"
+            android:layout_alignTop="@+id/event_repetition"
+            android:layout_alignBottom="@+id/event_repetition"
             android:layout_marginStart="@dimen/normal_margin"
+            android:layout_marginLeft="@dimen/normal_margin"
             android:alpha="0.8"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_repeat"/>
@@ -266,22 +266,22 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_reminder_divider"
-            android:layout_marginLeft="@dimen/small_margin"
             android:layout_marginStart="@dimen/small_margin"
+            android:layout_marginLeft="@dimen/small_margin"
             android:layout_toEndOf="@+id/event_repetition_image"
             android:layout_toRightOf="@+id/event_repetition_image"
             android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/normal_margin"
             android:paddingTop="@dimen/normal_margin"
+            android:paddingBottom="@dimen/normal_margin"
             android:textSize="@dimen/day_text_size"/>
 
         <RelativeLayout
             android:id="@+id/event_repetition_rule_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_repetition"
-            android:layout_alignStart="@+id/event_repetition"
             android:layout_below="@+id/event_repetition"
+            android:layout_alignStart="@+id/event_repetition"
+            android:layout_alignLeft="@+id/event_repetition"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone">
 
@@ -290,8 +290,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:clickable="false"
-                android:paddingBottom="@dimen/activity_margin"
                 android:paddingTop="@dimen/activity_margin"
+                android:paddingBottom="@dimen/activity_margin"
                 android:text="@string/repeat_on"
                 android:textSize="@dimen/day_text_size"/>
 
@@ -314,9 +314,9 @@
             android:id="@+id/event_repetition_limit_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_repetition"
-            android:layout_alignStart="@+id/event_repetition"
             android:layout_below="@+id/event_repetition_rule_holder"
+            android:layout_alignStart="@+id/event_repetition"
+            android:layout_alignLeft="@+id/event_repetition"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone">
 
@@ -324,11 +324,11 @@
                 android:id="@+id/event_repetition_limit_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_toLeftOf="@+id/event_repetition_limit"
                 android:layout_toStartOf="@+id/event_repetition_limit"
+                android:layout_toLeftOf="@+id/event_repetition_limit"
                 android:clickable="false"
-                android:paddingBottom="@dimen/activity_margin"
                 android:paddingTop="@dimen/activity_margin"
+                android:paddingBottom="@dimen/activity_margin"
                 android:text="@string/repeat_till"
                 android:textSize="@dimen/day_text_size"/>
 
@@ -357,11 +357,11 @@
             android:id="@+id/event_caldav_calendar_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/event_caldav_calendar_holder"
-            android:layout_alignTop="@+id/event_caldav_calendar_holder"
             android:layout_below="@+id/event_repetition_divider"
-            android:layout_marginLeft="@dimen/normal_margin"
+            android:layout_alignTop="@+id/event_caldav_calendar_holder"
+            android:layout_alignBottom="@+id/event_caldav_calendar_holder"
             android:layout_marginStart="@dimen/normal_margin"
+            android:layout_marginLeft="@dimen/normal_margin"
             android:alpha="0.8"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_calendar"
@@ -381,12 +381,12 @@
                 android:id="@+id/event_caldav_calendar_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/small_margin"
                 android:layout_marginStart="@dimen/small_margin"
+                android:layout_marginLeft="@dimen/small_margin"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:paddingBottom="@dimen/tiny_margin"
                 android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/tiny_margin"
                 android:textSize="@dimen/day_text_size"
                 tools:text="My calendar"/>
 
@@ -395,8 +395,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/event_caldav_calendar_name"
-                android:layout_marginLeft="@dimen/small_margin"
                 android:layout_marginStart="@dimen/small_margin"
+                android:layout_marginLeft="@dimen/small_margin"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingBottom="@dimen/medium_margin"
@@ -418,11 +418,11 @@
             android:id="@+id/event_type_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/event_type_holder"
-            android:layout_alignTop="@+id/event_type_holder"
             android:layout_below="@+id/event_caldav_calendar_divider"
-            android:layout_marginLeft="@dimen/normal_margin"
+            android:layout_alignTop="@+id/event_type_holder"
+            android:layout_alignBottom="@+id/event_type_holder"
             android:layout_marginStart="@dimen/normal_margin"
+            android:layout_marginLeft="@dimen/normal_margin"
             android:alpha="0.8"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_color"/>
@@ -441,12 +441,12 @@
                 android:id="@+id/event_type"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/small_margin"
                 android:layout_marginLeft="@dimen/small_margin"
                 android:layout_marginRight="@dimen/medium_margin"
-                android:layout_marginStart="@dimen/small_margin"
                 android:layout_toLeftOf="@+id/event_type_color"
-                android:paddingBottom="@dimen/normal_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingBottom="@dimen/normal_margin"
                 android:textSize="@dimen/day_text_size"/>
 
             <ImageView