diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj b/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
index 63a7288c7b..a5e324eeb7 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
@@ -156,16 +156,17 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Windows">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Private>False</Private>
+    <Reference Include="Windows"> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd')">C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd')">C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd</HintPath> 
+    </Reference> 
+    <Reference Include="Windows.Foundation.FoundationContract"> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath> 
+    </Reference> 
+    <Reference Include="Windows.Foundation.UniversalApiContract"> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.UniversalApiContract\10.0.0.0\Windows.Foundation.UniversalApiContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.UniversalApiContract\10.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
index 5c654eeb35..061bb9a9a2 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
@@ -198,41 +198,77 @@
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="21*" />
-                        <ColumnDefinition Width="17*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="17*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="80"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock Style="{DynamicResource Toggl.BodyText}" Margin="0 0 0 8" Text="Duration" />
-                    <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="1" Grid.Column="0"
-                                           Margin="0 0 12 0"
-                                           Style="{StaticResource {x:Type TextBox}}"
-                                           LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
-                                           KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>
+
+                    <!-- Row 0: Start -->
+                    <TextBlock Style="{DynamicResource Toggl.BodyText}"
+                               Grid.Row="0" Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Margin="0 0 10 8"
+                               Text="Start" />
+
+                    <DatePicker Name="startDatePicker" x:FieldModifier="private"
+                                Style="{StaticResource EditViewDatePickerStyle}"
+                                Grid.Row="0" Grid.Column="1"
+                                Margin="0 0 0 8"
+                                Height="32"
+                                LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
+                        <i:Interaction.Behaviors>
+                            <behaviors:DatePickerKeyboardHandlingBehavior />
+                        </i:Interaction.Behaviors>
+                    </DatePicker>
+
                     <toggl:ExtendedTextBox x:Name="startTimeTextBox" x:FieldModifier="private"
-                                           Grid.Row="1" Grid.Column="1"
+                                           Grid.Row="0" Grid.Column="2"
+                                           Margin="8 0 0 8"
+                                           Height="32"
                                            Style="{StaticResource {x:Type TextBox}}"
                                            LostKeyboardFocus="startTimeTextBox_OnLostKeyboardFocus"
                                            KeyDown="startTimeTextBox_OnKeyDown">12:45</toggl:ExtendedTextBox>
-                    <ContentControl Focusable="False"
-                                    Margin="6 0"
-                                    Grid.Row="1" Grid.Column="2"
-                                    Content="{StaticResource Toggl.ArrowIcon}" />
-                    <toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
-                                           Grid.Row="1" Grid.Column="3"
-                                           Style="{StaticResource {x:Type TextBox}}"
-                                           LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
-                                           KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>
-                    <DatePicker Name="startDatePicker" x:FieldModifier="private" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4"
+
+                    <!-- Row 1: End -->
+                    <TextBlock Style="{DynamicResource Toggl.BodyText}"
+                               Grid.Row="1" Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Margin="0 0 10 8"
+                               Text="End"/>
+
+                    <DatePicker Name="endDatePicker" x:FieldModifier="private"
                                 Style="{StaticResource EditViewDatePickerStyle}"
-                                Margin="0 8 0 0"
+                                Grid.Row="1" Grid.Column="1"
+                                Margin="0 0 0 8"
                                 Height="32"
-                                SelectedDate="05.01.2015"
-                                LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
+                                LostKeyboardFocus="endDatePicker_LostKeyboardFocus">
                         <i:Interaction.Behaviors>
                             <behaviors:DatePickerKeyboardHandlingBehavior />
                         </i:Interaction.Behaviors>
                     </DatePicker>
+
+                    <toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
+                                           Grid.Row="1" Grid.Column="2"
+                                           Margin="8 0 0 8"
+                                           Height="32"
+                                           Style="{StaticResource {x:Type TextBox}}"
+                                           LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
+                                           KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>
+
+                    <!-- Row 2: Duration -->
+                    <TextBlock Style="{DynamicResource Toggl.BodyText}"
+                               Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+                               VerticalAlignment="Center"
+                               Margin="0 0 10 10"
+                               Text="Duration" />
+                    
+                    <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
+                                           Margin="8 0 0 8"
+                                           Height="32"
+                                           Style="{StaticResource {x:Type TextBox}}"
+                                           HorizontalAlignment="Right"
+                                           LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
+                                           KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>
                 </Grid>
 
                 <TextBlock Margin="0 14 0 0" LineHeight="20" FontSize="{DynamicResource NormalFontSize}">
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
index bdbbeb7677..8533e36fd8 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
@@ -29,7 +29,7 @@ public partial class EditView
         private ulong selectedClientId;
         private string selectedClientName;
         private bool isCreatingProject;
-        private bool dateSet = false;
+        private bool startDateSet = false;
         public EditView()
         {
             this.DataContext = this;
@@ -75,7 +75,7 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
 
             using (Performance.Measure("filling edit view from OnTimeEntryEditor"))
             {
-                this.dateSet = false;
+                this.startDateSet = false;
                 if (timeEntry.Locked)
                 {
                     open = true;
@@ -110,17 +110,27 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
 
                 this.endTimeTextBox.IsEnabled = !isCurrentlyRunning;
                 this.startDatePicker.IsEnabled = !isCurrentlyRunning;
+                this.endDatePicker.IsEnabled = !isCurrentlyRunning;
 
                 var startDateTime = Toggl.DateTimeFromUnix(timeEntry.Started);
                 var endDateTime = Toggl.DateTimeFromUnix(timeEntry.Ended);
 
                 setText(this.descriptionTextBox, timeEntry.Description, open);
-                setTime(this.durationTextBox, timeEntry.Duration, open);
+
+                // Start:
                 setTime(this.startTimeTextBox, timeEntry.StartTimeString, open);
                 this.startTimeTextBox.ToolTip = startDateTime.ToString("T", CultureInfo.CurrentCulture);
+                this.startDatePicker.SelectedDate = startDateTime;
+
+                // End:
                 setTime(this.endTimeTextBox, timeEntry.EndTimeString, open);
                 this.endTimeTextBox.ToolTip = endDateTime.ToString("T", CultureInfo.CurrentCulture);
-                this.startDatePicker.SelectedDate = startDateTime;
+                this.endDatePicker.SelectedDate = endDateTime;
+
+                // Duration:
+                setTime(this.durationTextBox, timeEntry.Duration, open);
+                
+
                 if (isDifferentTimeEntry)
                 {
                     this.clearUndoHistory();
@@ -128,6 +138,7 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
 
                 if (isCurrentlyRunning)
                 {
+                    this.endDatePicker.SelectedDate = DateTime.Now;
                     this.endTimeTextBox.Text = "";
                 }
 
@@ -165,7 +176,7 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
                             ? "Create a new project"
                             : string.Empty;
                 }
-                this.dateSet = true;
+                this.startDateSet = true;
             }
         }
 
@@ -187,6 +198,10 @@ private static void setText(ExtendedTextBox textBox, string text, bool evenIfFoc
             }
         }
 
+        /// <summary>
+        /// When <paramref name="textBox"/> is not focused, or has an empty <see cref="FrameworkElement.Tag"/> property value, or when <paramref name="evenIfFocused"/> is <see langword="true"/>, this method stores <paramref name="time"/> into <paramref name="textBox"/>'s <see cref="FrameworkElement.Tag"/> property.<br/>
+        /// Otherwise, this method does nothing.
+        /// </summary>
         private static void setTime(ExtendedTextBox textBox, string time, bool evenIfFocused)
         {
             if (evenIfFocused
@@ -205,9 +220,9 @@ private static void setTime(ExtendedTextBox textBox, string time, bool evenIfFoc
 
         #region duration auto update
 
-        private void durationUpdateTimerTick(object sender, string s)
+        private void durationUpdateTimerTick(object sender, string durationText)
         {
-            if (this.TryBeginInvoke(durationUpdateTimerTick, sender, s))
+            if (this.TryBeginInvoke(durationUpdateTimerTick, sender, durationText))
                 return;
 
             if (!this.hasTimeEntry() || this.timeEntry.DurationInSeconds >= 0)
@@ -222,8 +237,8 @@ private void durationUpdateTimerTick(object sender, string s)
 
             var caret = this.durationTextBox.CaretIndex;
 
-            this.durationTextBox.SetText(s);
-            this.durationTextBox.Tag = s;
+            this.durationTextBox.SetText(durationText);
+            this.durationTextBox.Tag = durationText;
 
             this.durationTextBox.CaretIndex = caret;
         }
@@ -351,14 +366,13 @@ private void saveStartTimeIfChanged()
         }
         private void saveEndTimeIfChanged()
         {
-            this.setTimeEntryTimeIfChanged(this.endTimeTextBox, Toggl.SetTimeEntryEnd, "end time");
+            this.setTimeEntryEndTimestampIfChanged();
         }
         private void saveDurationIfChanged()
         {
             this.setTimeEntryTimeIfChanged(this.durationTextBox, Toggl.SetTimeEntryDuration, "duration");
         }
 
-
         private void setTimeEntryTimeIfChanged(TextBox textBox, Func<string, string, bool> apiCall, string timeType)
         {
             if (!this.hasTimeEntry())
@@ -367,8 +381,8 @@ private void setTimeEntryTimeIfChanged(TextBox textBox, Func<string, string, boo
                 return;
             }
 
-            var before = textBox.Tag as string;
-            var now = textBox.Text;
+            var before = textBox.Tag as string; // e.g. "06:00" or "6:00 AM" etc
+            var now = textBox.Text; // e.g. "06:01" or "6:01 AM" etc
             if (before == now)
                 return;
 
@@ -377,41 +391,104 @@ private void setTimeEntryTimeIfChanged(TextBox textBox, Func<string, string, boo
             apiCall(this.timeEntry.GUID, now);
         }
 
-        #region datepicker
-
-        private void saveDate()
+        private void setTimeEntryEndTimestampIfChanged()
         {
             if (!this.hasTimeEntry())
             {
-                Console.WriteLine("Cannot apply date change: No time entry.");
+                Console.WriteLine("Cannot apply change: No time entry.");
                 return;
             }
-            if (!this.startDatePicker.SelectedDate.HasValue)
+
+            if (!this.endDatePicker.SelectedDate.HasValue)
             {
-                this.startDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Started);
-                return;
+               Console.WriteLine("Cannot apply change: No end date value.");
+               return;
             }
 
-            DateTime currentDate = Toggl.DateTimeFromUnix(timeEntry.Started);
+            DateTime nowEnd;
+            DateTime previousEnd;
+            {
+                DateTime nowEndDate      = this.endDatePicker.SelectedDate.Value.Date;
+                DateTime previousEndDate = ( this.endDatePicker.Tag as DateTime? ?? DateTime.MinValue ).Date;
+            
+                TimeSpan nowEndTimeOfDay;
+                TimeSpan previousEndTimeOfDay;
+                {
+                    if (!DateTime.TryParseExact(this.endTimeTextBox.Text, format: "t", CultureInfo.CurrentCulture, DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AssumeLocal, out DateTime nowEndTimeOfDayAsDate))
+                    {
+                        Console.WriteLine("Cannot apply change: Invalid end time textbox value.");
+                        return;
+                    }
 
-            if (!currentDate.Equals(this.startDatePicker.SelectedDate.Value))
+                    if (!DateTime.TryParseExact(this.endTimeTextBox.Tag as string, format: "t", CultureInfo.CurrentCulture, DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AssumeLocal, out DateTime previousEndTimeOfDayAsDate))
+                    {
+                        previousEndTimeOfDayAsDate = DateTime.MinValue;
+                    }
+
+                    nowEndTimeOfDay      = nowEndTimeOfDayAsDate.TimeOfDay;
+                    previousEndTimeOfDay = previousEndTimeOfDayAsDate.TimeOfDay;
+                }
+
+                nowEnd      = nowEndDate     .Add(nowEndTimeOfDay);
+                previousEnd = previousEndDate.Add(previousEndTimeOfDay);
+            }
+
+            long nowEndUnix      = Toggl.UnixFromDateTime(nowEnd);
+            long previousEndUnix = Toggl.UnixFromDateTime(previousEnd);
+            if( nowEndUnix == previousEndUnix )
             {
-                currentDate = this.startDatePicker.SelectedDate.Value;
-                Toggl.SetTimeEntryDate(this.timeEntry.GUID, currentDate);
+                Console.WriteLine("Cannot apply change: No change detected.");
+                return;
             }
+
+            this.endTimeTextBox.Tag = null;
+
+            Toggl.SetTimeEntryEndTimeStamp(this.timeEntry.GUID, nowEndUnix);
         }
 
+        #region datepicker
+
+        private void saveDate() 
+        { 
+            if (!this.hasTimeEntry()) 
+            { 
+                Console.WriteLine("Cannot apply date change: No time entry."); 
+                return; 
+            } 
+            if (!this.startDatePicker.SelectedDate.HasValue) 
+            { 
+                this.startDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Started); 
+                return; 
+            } 
+ 
+            DateTime currentDate = Toggl.DateTimeFromUnix(timeEntry.Started); 
+ 
+            if (!currentDate.Equals(this.startDatePicker.SelectedDate.Value)) 
+            { 
+                currentDate = this.startDatePicker.SelectedDate.Value; 
+                Toggl.SetTimeEntryDate(this.timeEntry.GUID, currentDate); 
+            } 
+        } 
+
         private void startDatePicker_LostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
             if (!startDatePicker.IsKeyboardFocusWithin)
             {
-                if (this.dateSet)
+                if (this.startDateSet)
                 {
                     this.saveDate();
                 }
             }
         }
 
+        private void endDatePicker_LostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+        {
+            if (!endDatePicker.IsKeyboardFocusWithin)
+            {
+                this.setTimeEntryEndTimestampIfChanged();
+            }
+        }
+
         #endregion
 
         #endregion
@@ -831,7 +908,7 @@ private void billableCheckBox_OnClick(object sender, RoutedEventArgs e)
 
         public void SetTimer(Timer timer)
         {
-            timer.ViewModel.WhenValueChanged(x => x.DurationText).Subscribe(x => durationUpdateTimerTick(this, x));
+            timer.ViewModel.WhenValueChanged(x => x.DurationText).Subscribe(durationText => this.durationUpdateTimerTick(this, durationText));
         }
 
         public void FocusField(string focusedFieldName)