diff --git a/ide/findinfilesdlg.lfm b/ide/findinfilesdlg.lfm
index 4590f8ecaa..92060a1700 100644
--- a/ide/findinfilesdlg.lfm
+++ b/ide/findinfilesdlg.lfm
@@ -1,42 +1,18 @@
 object LazFindInFilesDialog: TLazFindInFilesDialog
   Left = 379
-  Height = 521
+  Height = 402
   Top = 155
-  Width = 456
-  ActiveControl = TextToFindComboBox
+  Width = 516
+  AutoSize = True
   Caption = 'Find in files'
-  ClientHeight = 521
-  ClientWidth = 456
+  ClientHeight = 402
+  ClientWidth = 516
   Constraints.MinHeight = 400
   Constraints.MinWidth = 260
   OnClose = FormClose
   OnCreate = FormCreate
   Position = poScreenCenter
   LCLVersion = '0.9.29'
-  object TextToFindLabel: TLabel
-    AnchorSideTop.Control = TextToFindComboBox
-    AnchorSideTop.Side = asrCenter
-    Left = 6
-    Height = 18
-    Top = 11
-    Width = 76
-    Caption = 'Text To Find:'
-    ParentColor = False
-  end
-  object TextToFindComboBox: TComboBox
-    AnchorSideLeft.Control = TextToFindLabel
-    AnchorSideLeft.Side = asrBottom
-    Left = 88
-    Height = 29
-    Top = 6
-    Width = 362
-    Anchors = [akTop, akLeft, akRight]
-    AutoComplete = True
-    AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
-    BorderSpacing.Left = 6
-    ItemHeight = 0
-    TabOrder = 0
-  end
   object OptionsCheckGroupBox: TCheckGroup
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ReplaceTextComboBox
@@ -44,9 +20,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 137
-    Top = 72
-    Width = 444
+    Height = 70
+    Top = 56
+    Width = 504
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
     AutoSize = True
@@ -61,7 +37,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     ChildSizing.ShrinkHorizontal = crsScaleChilds
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
-    ChildSizing.ControlsPerLine = 1
+    ChildSizing.ControlsPerLine = 2
+    Columns = 2
     Items.Strings = (
       'Case sensitive'
       'Whole words only'
@@ -74,16 +51,15 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     }
   end
   object WhereRadioGroup: TRadioGroup
-    AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = OptionsCheckGroupBox
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 109
-    Top = 215
-    Width = 444
-    Anchors = [akTop, akLeft, akRight]
+    Height = 93
+    Top = 132
+    Width = 504
+    Align = alBottom
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
     AutoSize = True
     BorderSpacing.Around = 6
@@ -98,8 +74,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 90
-    ClientWidth = 440
+    ClientHeight = 75
+    ClientWidth = 500
     ItemIndex = 1
     Items.Strings = (
       'search all files in project'
@@ -108,59 +84,76 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     )
     OnClick = WhereRadioGroupClick
     TabOrder = 2
-    TabStop = True
   end
   object DirectoryOptionsGroupBox: TGroupBox
-    AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = WhereRadioGroup
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = ButtonPanel1
     Left = 6
-    Height = 147
-    Top = 330
-    Width = 444
-    Anchors = [akTop, akLeft, akRight, akBottom]
+    Height = 133
+    Top = 231
+    Width = 504
+    Align = alBottom
+    AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Directory Options'
-    ClientHeight = 128
-    ClientWidth = 440
+    ClientHeight = 115
+    ClientWidth = 500
     Enabled = False
     TabOrder = 3
     object DirectoryLabel: TLabel
+      AnchorSideLeft.Control = DirectoryOptionsGroupBox
+      AnchorSideTop.Control = DirectoryComboBox
+      AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 18
-      Top = 8
-      Width = 62
+      Height = 14
+      Top = 9
+      Width = 49
+      BorderSpacing.Left = 6
       Caption = 'Directory:'
       ParentColor = False
     end
     object FileMaskLabel: TLabel
+      AnchorSideLeft.Control = DirectoryOptionsGroupBox
+      AnchorSideTop.Control = DirectoryComboBox
+      AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 18
-      Top = 38
-      Width = 152
+      Height = 14
+      Top = 39
+      Width = 121
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 12
       Caption = 'File mask (*;*.*;*.bak?):'
       ParentColor = False
     end
     object DirectoryComboBox: TComboBox
       AnchorSideLeft.Control = DirectoryLabel
       AnchorSideLeft.Side = asrBottom
-      Left = 68
-      Height = 29
+      AnchorSideTop.Control = DirectoryOptionsGroupBox
+      AnchorSideRight.Control = DirectoryBrowse
+      Left = 61
+      Height = 21
       Top = 6
-      Width = 308
+      Width = 389
       Anchors = [akTop, akLeft, akRight]
-      ItemHeight = 0
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Right = 6
+      ItemHeight = 13
       TabOrder = 0
     end
     object DirectoryBrowse: TBitBtn
-      Left = 382
-      Height = 25
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = DirectoryComboBox
+      AnchorSideRight.Control = DirectoryOptionsGroupBox
+      AnchorSideRight.Side = asrBottom
+      Left = 456
+      Height = 23
       Top = 6
-      Width = 25
+      Width = 38
       Anchors = [akTop, akRight]
+      AutoSize = True
+      BorderSpacing.Right = 6
       Caption = '...'
       Layout = blGlyphTop
       NumGlyphs = 0
@@ -168,62 +161,112 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       TabOrder = 1
     end
     object FileMaskComboBox: TComboBox
+      AnchorSideLeft.Control = DirectoryOptionsGroupBox
+      AnchorSideTop.Control = FileMaskLabel
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = DirectoryComboBox
+      AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 29
-      Top = 56
-      Width = 370
+      Height = 21
+      Top = 59
+      Width = 444
       Anchors = [akTop, akLeft, akRight]
-      ItemHeight = 0
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      ItemHeight = 13
       TabOrder = 2
       Text = '*.pas;*.pp;*.inc'
     end
     object IncludeSubDirsCheckBox: TCheckBox
+      AnchorSideLeft.Control = DirectoryOptionsGroupBox
+      AnchorSideTop.Control = FileMaskComboBox
+      AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
+      Height = 17
       Top = 92
-      Width = 167
+      Width = 126
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 12
+      BorderSpacing.Bottom = 6
       Caption = 'Include sub directories'
       TabOrder = 3
     end
   end
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 370
+    Width = 504
+    TabOrder = 6
+    ShowButtons = [pbOK, pbCancel, pbHelp]
+    ShowBevel = False
+  end
   object ReplaceTextComboBox: TComboBox
     AnchorSideLeft.Control = ReplaceCheckBox
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = TextToFindComboBox
     AnchorSideTop.Side = asrBottom
-    Left = 84
-    Height = 29
-    Top = 37
-    Width = 366
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 68
+    Height = 21
+    Top = 29
+    Width = 442
     Anchors = [akTop, akLeft, akRight]
     AutoComplete = True
     AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
     BorderSpacing.Left = 6
     BorderSpacing.Top = 2
+    BorderSpacing.Right = 6
+    BorderSpacing.Bottom = 6
     Enabled = False
-    ItemHeight = 0
-    TabOrder = 4
+    ItemHeight = 13
+    TabOrder = 5
   end
   object ReplaceCheckBox: TCheckBox
+    AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ReplaceTextComboBox
     AnchorSideTop.Side = asrCenter
-    Left = 5
-    Height = 22
-    Top = 40
-    Width = 73
+    Left = 6
+    Height = 17
+    Top = 31
+    Width = 56
+    BorderSpacing.Left = 6
     Caption = 'Replace'
     Enabled = False
     OnChange = ReplaceCheckBoxChange
-    TabOrder = 5
+    TabOrder = 4
   end
-  object ButtonPanel1: TButtonPanel
+  object TextToFindLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = TextToFindComboBox
+    AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 32
-    Top = 483
-    Width = 444
-    TabOrder = 6
-    ShowButtons = [pbOK, pbCancel, pbHelp]
-    ShowBevel = False
+    Height = 14
+    Top = 9
+    Width = 65
+    BorderSpacing.Left = 6
+    Caption = 'Text To Find:'
+    ParentColor = False
+  end
+  object TextToFindComboBox: TComboBox
+    AnchorSideLeft.Control = TextToFindLabel
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 77
+    Height = 21
+    Top = 6
+    Width = 433
+    Anchors = [akTop, akLeft, akRight]
+    AutoComplete = True
+    AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    ItemHeight = 13
+    TabOrder = 0
   end
   object SelectDirectoryDialog: TSelectDirectoryDialog
     FilterIndex = 0