diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index 80d672832..aecbaa905 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -233,6 +233,10 @@ class EventActivity : SimpleActivity() {
             jumpDrawablesToCurrentState()
         }
 
+        event_all_day_holder.setOnClickListener {
+            event_all_day.toggle()
+        }
+
         updateTextColors(event_scrollview)
         updateIconColors()
         event_time_zone_image.beVisibleIf(config.allowChangingTimeZones)
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index fc5fe56ab..c2e140750 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -1,6 +1,5 @@
 <?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/event_scrollview"
     android:layout_width="match_parent"
@@ -86,33 +85,43 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_below="@+id/event_description_divider"
-            android:layout_alignTop="@+id/event_all_day"
-            android:layout_alignBottom="@+id/event_all_day"
+            android:layout_alignTop="@+id/event_all_day_holder"
+            android:layout_alignBottom="@+id/event_all_day_holder"
             android:layout_marginStart="@dimen/normal_margin"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_clock_vector" />
 
-        <com.simplemobiletools.commons.views.MySwitchCompat
-            android:id="@+id/event_all_day"
+        <RelativeLayout
+            android:id="@+id/event_all_day_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_description_divider"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="@dimen/small_margin"
-            android:layout_marginEnd="@dimen/normal_margin"
             android:layout_toEndOf="@+id/event_time_image"
+            android:background="?attr/selectableItemBackground"
             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" />
+            android:paddingEnd="@dimen/normal_margin"
+            android:paddingBottom="@dimen/normal_margin">
+
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                android:id="@+id/event_all_day"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:layoutDirection="rtl"
+                android:text="@string/all_day"
+                android:textSize="@dimen/day_text_size" />
+
+        </RelativeLayout>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_start_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_time_image"
-            android:layout_alignStart="@+id/event_all_day"
+            android:layout_alignStart="@+id/event_all_day_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingTop="@dimen/activity_margin"
             android:paddingEnd="@dimen/activity_margin"
@@ -136,7 +145,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_start_date"
-            android:layout_alignStart="@+id/event_all_day"
+            android:layout_alignStart="@+id/event_all_day_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingTop="@dimen/activity_margin"
             android:paddingEnd="@dimen/activity_margin"