diff --git a/Changelog.txt b/Changelog.txt
index 81ac264d0..261374bea 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,24 @@
 Subtitle Edit Changelog
 
+
+3.5.6 (xth March 2018) BETA
+* NEW:
+   * Some support for SMPTE time code (drop frame) in video player
+   * Swap text up/down - thx Leon
+* IMPROVED:
+   * Update Bulgarian translation - thx KalinM
+   * Update Hungarian translation - thx ZityiSoft Team
+   * Update Korean translation - thx domddol
+   * Waveform insert sub now works not just at end - thx Leon
+   * Allow larger "margin" in SSA/ASSA styles - thx von Suppé
+* FIXED:
+   * Fix Ctrl+v of time code in "Time code control" (regr. from 3.5.5) - thx Mohammed
+   * Fix for format "TTML draft 2006-10" - thx thehulk
+   * Fix issue regarding "Binary image compare OCR ext. matches" - thx SimplyTheBOSS
+   * Fix issue regarding "Bridge gaps"/selected line - thx btsix
+   * Fix new-line char in "Replace -> Replace with" text box - thx Leon
+
+
 3.5.5 (26th January 2018)
 * NEW:
    * Add new subtitle format - thx Karim
diff --git a/src/Forms/ReplaceDialog.cs b/src/Forms/ReplaceDialog.cs
index c4e837f25..88880bdc2 100644
--- a/src/Forms/ReplaceDialog.cs
+++ b/src/Forms/ReplaceDialog.cs
@@ -68,7 +68,7 @@ namespace Nikse.SubtitleEdit.Forms
             textBoxFind.Text = selectedText;
             //if we are searching for the same thing, then keep the replace text the same.
             if (selectedText == findHelper.FindText)
-            { 
+            {
                 textBoxReplace.Text = findHelper.ReplaceText.Replace(Environment.NewLine, "\\n");
             }
             textBoxFind.SelectAll();
@@ -159,8 +159,7 @@ namespace Nikse.SubtitleEdit.Forms
         {
             if (bitmap != null)
             {
-                IntPtr Hicon = bitmap.GetHicon();
-                this.Icon = Icon.FromHandle(Hicon);
+                Icon = Icon.FromHandle(bitmap.GetHicon());
             }
         }