diff --git a/ide/diffdialog.lfm b/ide/diffdialog.lfm
index e064012e4d..f0f712ae1e 100644
--- a/ide/diffdialog.lfm
+++ b/ide/diffdialog.lfm
@@ -9,12 +9,12 @@ object DiffDlg: TDiffDlg
   ClientHeight = 522
   ClientWidth = 598
   Position = poScreenCenter
-  LCLVersion = '1.3'
+  LCLVersion = '1.5'
   object Text1GroupBox: TGroupBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 57
+    Height = 49
     Top = 6
     Width = 586
     Align = alTop
@@ -22,7 +22,7 @@ object DiffDlg: TDiffDlg
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Text1GroupBox'
-    ClientHeight = 38
+    ClientHeight = 31
     ClientWidth = 582
     TabOrder = 0
     object Text1Combobox: TComboBox
@@ -30,14 +30,14 @@ object DiffDlg: TDiffDlg
       AnchorSideTop.Control = Text1GroupBox
       AnchorSideRight.Control = Text1FileOpenButton
       Left = 6
-      Height = 25
+      Height = 21
       Top = 6
-      Width = 320
+      Width = 362
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BorderSpacing.Right = 6
-      ItemHeight = 0
+      ItemHeight = 13
       OnChange = Text1ComboboxChange
       TabOrder = 0
       Text = 'Text1Combobox'
@@ -47,10 +47,10 @@ object DiffDlg: TDiffDlg
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = Text1GroupBox
       AnchorSideRight.Side = asrBottom
-      Left = 376
-      Height = 21
+      Left = 418
+      Height = 17
       Top = 8
-      Width = 200
+      Width = 158
       Anchors = [akTop, akRight]
       BorderSpacing.Top = 6
       BorderSpacing.Right = 6
@@ -64,8 +64,8 @@ object DiffDlg: TDiffDlg
       AnchorSideRight.Control = Text1OnlySelectionCheckBox
       AnchorSideBottom.Control = Text1Combobox
       AnchorSideBottom.Side = asrBottom
-      Left = 332
-      Height = 25
+      Left = 374
+      Height = 21
       Top = 6
       Width = 32
       Anchors = [akTop, akRight, akBottom]
@@ -78,14 +78,14 @@ object DiffDlg: TDiffDlg
   object Text2GroupBox: TGroupBox
     AnchorSideTop.Control = Text1GroupBox
     Left = 6
-    Height = 57
-    Top = 69
+    Height = 49
+    Top = 61
     Width = 586
     Align = alTop
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Text2GroupBox'
-    ClientHeight = 38
+    ClientHeight = 31
     ClientWidth = 582
     TabOrder = 1
     object Text2Combobox: TComboBox
@@ -93,14 +93,14 @@ object DiffDlg: TDiffDlg
       AnchorSideTop.Control = Text2GroupBox
       AnchorSideRight.Control = Text2FileOpenButton
       Left = 6
-      Height = 25
+      Height = 21
       Top = 6
-      Width = 320
+      Width = 362
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BorderSpacing.Right = 6
-      ItemHeight = 0
+      ItemHeight = 13
       OnChange = Text2ComboboxChange
       TabOrder = 0
       Text = 'Text2Combobox'
@@ -110,10 +110,10 @@ object DiffDlg: TDiffDlg
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = Text2GroupBox
       AnchorSideRight.Side = asrBottom
-      Left = 376
-      Height = 21
+      Left = 418
+      Height = 17
       Top = 8
-      Width = 200
+      Width = 158
       Anchors = [akTop, akRight]
       BorderSpacing.Top = 6
       BorderSpacing.Right = 6
@@ -127,8 +127,8 @@ object DiffDlg: TDiffDlg
       AnchorSideRight.Control = Text2OnlySelectionCheckBox
       AnchorSideBottom.Control = Text2Combobox
       AnchorSideBottom.Side = asrBottom
-      Left = 332
-      Height = 25
+      Left = 374
+      Height = 21
       Top = 6
       Width = 32
       Anchors = [akTop, akRight, akBottom]
@@ -147,7 +147,7 @@ object DiffDlg: TDiffDlg
     AnchorSideBottom.Control = ProgressBar1
     Left = 6
     Height = 109
-    Top = 344
+    Top = 345
     Width = 586
     Anchors = [akLeft, akRight, akBottom]
     AutoFill = True
@@ -170,8 +170,8 @@ object DiffDlg: TDiffDlg
     AnchorSideRight.Control = Owner
     AnchorSideBottom.Control = OptionsGroupBox
     Left = 6
-    Height = 206
-    Top = 132
+    Height = 223
+    Top = 116
     Width = 586
     Align = alTop
     BorderSpacing.Around = 6
@@ -186,7 +186,7 @@ object DiffDlg: TDiffDlg
     TabOrder = 3
     BookMarkOptions.Xoffset = -18
     Gutter.Visible = False
-    Gutter.Width = 55
+    Gutter.Width = 59
     Gutter.MouseActions = <    
       item
         ClickCount = ccAny
@@ -634,7 +634,7 @@ object DiffDlg: TDiffDlg
         MouseActions = <>
       end
       object TSynGutterLineNumber
-        Width = 15
+        Width = 19
         MouseActions = <>
         MarkupInfo.Background = clBtnFace
         MarkupInfo.Foreground = clNone
@@ -715,10 +715,10 @@ object DiffDlg: TDiffDlg
     AnchorSideRight.Control = CloseButton
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 373
-    Height = 26
-    Top = 490
-    Width = 137
+    Left = 392
+    Height = 23
+    Top = 493
+    Width = 122
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -731,10 +731,10 @@ object DiffDlg: TDiffDlg
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 516
-    Height = 27
-    Top = 489
-    Width = 76
+    Left = 520
+    Height = 26
+    Top = 490
+    Width = 72
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -749,9 +749,9 @@ object DiffDlg: TDiffDlg
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 33
-    Top = 483
-    Width = 76
+    Height = 26
+    Top = 490
+    Width = 67
     Anchors = [akLeft, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -767,8 +767,8 @@ object DiffDlg: TDiffDlg
     AnchorSideBottom.Control = CloseButton
     Left = 6
     Height = 24
-    Top = 459
-    Width = 462
+    Top = 460
+    Width = 476
     Anchors = [akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     Step = 0
@@ -779,10 +779,10 @@ object DiffDlg: TDiffDlg
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 474
-    Height = 26
-    Top = 458
-    Width = 118
+    Left = 488
+    Height = 23
+    Top = 461
+    Width = 104
     Anchors = [akTop, akRight]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -790,6 +790,7 @@ object DiffDlg: TDiffDlg
     Enabled = False
     OnClick = CancelScanningButtonClick
     TabOrder = 8
+    Visible = False
   end
   object dlgOpen: TOpenDialog
     DefaultExt = '.pas'