diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml
index 2814699f0..837742300 100644
--- a/app/src/main/res/layout/meeting_edit_fragment.xml
+++ b/app/src/main/res/layout/meeting_edit_fragment.xml
@@ -109,96 +109,101 @@
                         app:layout_constraintTop_toBottomOf="@id/subject"
                         android:background="?attr/color_main2_200" />
 
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/default_text_style_700"
+                        android:id="@+id/from_date"
+                        android:onClick="@{pickStartDateClickListener}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="16dp"
+                        android:text="@{viewModel.fromDate, default=`Tue. October 10th, 2023`}"
+                        android:textSize="14sp"
+                        android:textColor="?attr/color_main2_600"
+                        android:drawableStart="@drawable/clock"
+                        android:drawablePadding="8dp"
+                        android:drawableTint="?attr/color_main2_600"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/separator" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/default_text_style_700"
+                        android:id="@+id/to_date"
+                        android:onClick="@{pickEndDateClickListener}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="48dp"
+                        android:layout_marginTop="10dp"
+                        android:text="@{viewModel.toDate, default=`Fri. October 11th, 2023`}"
+                        android:textSize="14sp"
+                        android:textColor="?attr/color_main2_600"
+                        android:visibility="@{viewModel.allDayMeeting ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/from_date" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/default_text_style_700"
+                        android:id="@+id/from_time"
+                        android:onClick="@{pickStartTimeClickListener}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="32dp"
+                        android:layout_marginTop="10dp"
+                        android:text="@{viewModel.fromTime, default=`17:00`}"
+                        android:textSize="14sp"
+                        android:textColor="?attr/color_main2_600"
+                        android:visibility="@{viewModel.allDayMeeting ? View.INVISIBLE : View.VISIBLE}"
+                        app:layout_constraintStart_toStartOf="@id/from_date"
+                        app:layout_constraintTop_toBottomOf="@id/from_date" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/default_text_style_700"
+                        android:id="@+id/to_time"
+                        android:onClick="@{pickEndTimeClickListener}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="45dp"
+                        android:text="@{viewModel.toTime, default=`18:00`}"
+                        android:textSize="14sp"
+                        android:textColor="?attr/color_main2_600"
+                        android:visibility="@{viewModel.allDayMeeting ? View.INVISIBLE : View.VISIBLE}"
+                        app:layout_constraintStart_toEndOf="@id/from_time"
+                        app:layout_constraintTop_toTopOf="@id/from_time" />
+
                     <com.google.android.material.materialswitch.MaterialSwitch
                         style="@style/material_switch_style"
                         android:id="@+id/all_day_switch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginTop="16dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginEnd="10dp"
                         android:checked="@={viewModel.allDayMeeting}"
-                        app:layout_constraintStart_toEndOf="@id/all_day"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/separator"/>
+                        app:layout_constraintEnd_toStartOf="@id/all_day"
+                        app:layout_constraintTop_toTopOf="@id/to_time"
+                        app:layout_constraintBottom_toBottomOf="@id/to_time"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/default_text_style_700"
+                        style="@style/default_text_style_500"
                         android:id="@+id/all_day"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp"
                         android:text="@string/meeting_schedule_date_all_day_title"
                         android:textColor="?attr/color_main2_600"
                         android:textSize="14sp"
-                        android:drawableStart="@drawable/clock"
-                        android:drawablePadding="8dp"
-                        android:drawableTint="?attr/color_main2_600"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/all_day_switch"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="@id/all_day_switch"
                         app:layout_constraintBottom_toBottomOf="@id/all_day_switch"/>
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/default_text_style"
-                        android:id="@+id/from_date"
-                        android:onClick="@{pickStartDateClickListener}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="32dp"
-                        android:layout_marginTop="16dp"
-                        android:text="@{viewModel.fromDate, default=`Tue. October 10th, 2023`}"
-                        android:textSize="14sp"
-                        android:textColor="?attr/color_main2_600"
-                        app:layout_constraintStart_toStartOf="@id/all_day"
-                        app:layout_constraintTop_toBottomOf="@id/all_day_switch" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/default_text_style"
-                        android:id="@+id/from_time"
-                        android:onClick="@{pickStartTimeClickListener}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{viewModel.fromTime, default=`17:00`}"
-                        android:textSize="14sp"
-                        android:textColor="?attr/color_main2_600"
-                        android:visibility="@{viewModel.allDayMeeting ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintEnd_toEndOf="@id/all_day_switch"
-                        app:layout_constraintTop_toTopOf="@id/from_date" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/default_text_style"
-                        android:id="@+id/to_date"
-                        android:onClick="@{pickEndDateClickListener}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:text="@{viewModel.toDate, default=`Tue. October 10th, 2023`}"
-                        android:textSize="14sp"
-                        android:textColor="?attr/color_main2_600"
-                        android:visibility="@{viewModel.allDayMeeting ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintStart_toStartOf="@id/from_date"
-                        app:layout_constraintTop_toBottomOf="@id/from_date" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/default_text_style"
-                        android:id="@+id/to_time"
-                        android:onClick="@{pickEndTimeClickListener}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{viewModel.toTime, default=`17:00`}"
-                        android:textSize="14sp"
-                        android:textColor="?attr/color_main2_600"
-                        android:visibility="@{viewModel.allDayMeeting ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintEnd_toEndOf="@id/all_day_switch"
-                        app:layout_constraintTop_toTopOf="@id/to_date" />
-
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/default_text_style_700"
                         android:id="@+id/timezone_label"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="26dp"
+                        android:layout_marginTop="16dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
                         android:text="@string/meeting_schedule_timezone_title"
@@ -211,7 +216,7 @@
                         android:drawableTint="?attr/color_main2_600"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/to_date" />
+                        app:layout_constraintTop_toBottomOf="@id/all_day_switch" />
 
                     <androidx.appcompat.widget.AppCompatSpinner
                         style="@style/default_text_style"
@@ -259,6 +264,7 @@
                         android:drawableStart="@drawable/arrow_clockwise"
                         android:drawablePadding="8dp"
                         android:drawableTint="?attr/color_main2_600"
+                        android:visibility="gone"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/timezone_picker" />
diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml
index 6d7586cf2..ab3ee190a 100644
--- a/app/src/main/res/layout/meeting_schedule_fragment.xml
+++ b/app/src/main/res/layout/meeting_schedule_fragment.xml
@@ -403,6 +403,7 @@
                         android:drawableStart="@drawable/arrow_clockwise"
                         android:drawablePadding="8dp"
                         android:drawableTint="?attr/color_main2_600"
+                        android:visibility="gone"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/timezone_picker" />