diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 0d25c00..9ffba81 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -39,6 +39,7 @@
     <None Remove="Resources\lock_open.png" />
     <None Remove="Resources\logo_bremen_calling.png" />
     <None Remove="Resources\nav_refresh_green.png" />
+    <None Remove="Resources\nav_undo_red.png" />
     <None Remove="Resources\ship2.png" />
     <None Remove="Resources\sign_warning.png" />
     <None Remove="Resources\trafficlight_green.png" />
@@ -96,6 +97,7 @@
     <Resource Include="Resources\lock_open.png" />
     <Resource Include="Resources\logo_bremen_calling.png" />
     <Resource Include="Resources\nav_refresh_green.png" />
+    <Resource Include="Resources\nav_undo_red.png" />
     <Resource Include="Resources\ship2.png" />
     <Resource Include="Resources\sign_warning.png" />
     <Resource Include="Resources\StringResources.de.xaml">
diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index fdfa2fd..ad03ed9 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -155,6 +155,9 @@
         <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+            <Button Width="28" x:Name="buttonClearAll" Click="buttonClearAll_Click" Margin="2" IsEnabled="False">
+                <Image Source="Resources\nav_undo_red.png"/>
+            </Button>
         </StackPanel>
 
     </Grid>
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 710e81f..dfd841d 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -65,6 +65,22 @@ namespace BreCalClient
             SetLockButton(newValue);
         }
 
+        private void buttonClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (System.Windows.MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                this.datePickerETABerth.Value = null;
+                this.datePickerETABerth_End.Value = null;
+                this.datePickerETDBerth.Value = null;
+                this.datePickerETDBerth_End.Value = null;
+                this.datePickerATA.Value = null;
+                this.datePickerATD.Value = null;
+                this.datePickerLockTime.Value = null;
+                this.datePickerZoneEntry.Value = null;
+                this.textBoxRemarks.Text = null;
+            }
+        }
+
         #endregion
 
         #region private methods
@@ -183,6 +199,7 @@ namespace BreCalClient
             this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
             this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
             this.textBoxRemarks.IsReadOnly = false;
+            this.buttonClearAll.IsEnabled = true;
 
             switch (pType)
             {
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index 86008cd..6875bca 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -115,8 +115,11 @@
         <TextBox Grid.Row="4" Grid.Column="1" Margin="2" Name="textBoxBerthRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512" />
         <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512" />
         <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False"/>
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="True"/>
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+            <Button Width="28" x:Name="buttonClearAll" Click="buttonClearAll_Click" Margin="2" IsEnabled="False">
+                <Image Source="Resources\nav_undo_red.png"/>
+            </Button>
         </StackPanel>
 
     </Grid>
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 92f8111..6071ba9 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -76,6 +76,21 @@ namespace BreCalClient
             this.comboBoxPierside.SelectedIndex = -1;
         }
 
+        private void buttonClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                this.datePickerOperationStart.Value = null;
+                this.datePickerOperationStart_End.Value = null;
+                this.datePickerOperationEnd.Value = null;
+                this.datePickerOperationEnd_End.Value = null;
+                this.comboBoxBerth.SelectedIndex = -1;
+                this.comboBoxPierside.SelectedIndex = -1;
+                this.textBoxRemarks.Text = null;
+                this.textBoxBerthRemarks.Text = null;
+            }
+        }
+
         #endregion
 
         #region private methods
@@ -151,8 +166,9 @@ namespace BreCalClient
             this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival;
             this.textBoxRemarks.IsReadOnly = false;
+            this.buttonClearAll.IsEnabled = true;
                      
-        }        
+        }
 
         #endregion
         
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 679e66a..492ef15 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -278,6 +278,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] nav_undo_red {
+            get {
+                object obj = ResourceManager.GetObject("nav_undo_red", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shifting.
         /// </summary>
@@ -469,6 +479,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clear all entries?.
+        /// </summary>
+        public static string textClearAll {
+            get {
+                return ResourceManager.GetString("textClearAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Clear assignment.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 1d95aef..a681ad9 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -505,4 +505,7 @@
   <data name="textShiftingSequence" xml:space="preserve">
     <value>Verhol. Nr.</value>
   </data>
+  <data name="textClearAll" xml:space="preserve">
+    <value>Alle Eintragungen zurücksetzen?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index a6d08f6..1cf2a78 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -178,6 +178,9 @@
   <data name="nav_refresh_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>nav_refresh_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="nav_undo_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>nav_undo_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="Shifting" xml:space="preserve">
     <value>Shifting</value>
   </data>
@@ -241,6 +244,9 @@
   <data name="textChangePassword" xml:space="preserve">
     <value>Change password</value>
   </data>
+  <data name="textClearAll" xml:space="preserve">
+    <value>Clear all entries?</value>
+  </data>
   <data name="textClearAssignment" xml:space="preserve">
     <value>Clear assignment</value>
   </data>
diff --git a/src/BreCalClient/Resources/nav_undo_red.png b/src/BreCalClient/Resources/nav_undo_red.png
new file mode 100644
index 0000000..692f6db
Binary files /dev/null and b/src/BreCalClient/Resources/nav_undo_red.png differ