diff --git a/ide/frmsearch.lfm b/ide/frmsearch.lfm
index 9844123755..e3d2dae6f7 100644
--- a/ide/frmsearch.lfm
+++ b/ide/frmsearch.lfm
@@ -22,61 +22,67 @@ object SearchForm: TSearchForm
     TabStop = True
     OnClick = Panel2Click
     object lblMatches: TLabel
-      Left = 96
-      Height = 17
+      Left = 121
+      Height = 19
       Top = 80
-      Width = 321
+      Width = 298
       Color = clNone
       ParentColor = False
     end
     object MatchesLabel: TLabel
+      AnchorSideTop.Control = lblMatches
+      AnchorSideTop.Side = asrCenter
       Left = 16
-      Height = 17
-      Top = 80
-      Width = 64
+      Height = 13
+      Top = 83
+      Width = 49
       Caption = 'Matches'
       Color = clNone
       ParentColor = False
     end
     object lblProgress: TLabel
-      Left = 96
-      Height = 17
+      Left = 121
+      Height = 19
       Top = 48
-      Width = 320
+      Width = 297
       Color = clNone
       ParentColor = False
     end
     object SearchingLabel: TLabel
+      AnchorSideTop.Control = lblProgress
+      AnchorSideTop.Side = asrCenter
       Left = 16
-      Height = 17
-      Top = 48
-      Width = 64
+      Height = 13
+      Top = 51
+      Width = 61
       Caption = 'Searching:'
       Color = clNone
       ParentColor = False
     end
     object SearchTextLabel: TLabel
+      AnchorSideTop.Control = lblSearchText
+      AnchorSideTop.Side = asrCenter
       Left = 16
-      Height = 17
-      Top = 16
-      Width = 80
+      Height = 13
+      Top = 20
+      Width = 71
       Caption = 'Search Text:'
       Color = clNone
       ParentColor = False
     end
     object lblSearchText: TLabel
-      Left = 96
-      Height = 17
+      Left = 121
+      Height = 20
       Top = 16
-      Width = 320
+      Width = 296
       Color = clNone
       ParentColor = False
     end
     object btnCancel: TButton
       Left = 177
-      Height = 25
+      Height = 26
       Top = 112
-      Width = 75
+      Width = 54
       AutoSize = True
       BorderSpacing.InnerBorder = 4
       Caption = 'Cancel'
diff --git a/ide/frmsearch.lrs b/ide/frmsearch.lrs
index 4a0e298d36..aca638d5e5 100644
--- a/ide/frmsearch.lrs
+++ b/ide/frmsearch.lrs
@@ -8,19 +8,22 @@ LazarusResources.Add('TSearchForm','FORMDATA',[
   +'entFont'#9#8'Position'#7#17'poOwnerFormCenter'#0#6'TPanel'#6'Panel2'#6'Heig'
   +'ht'#3#149#0#5'Width'#3#172#1#5'Align'#7#8'alClient'#10'BevelInner'#7#9'bvLo'
   +'wered'#11'FullRepaint'#8#10'ParentFont'#9#8'TabOrder'#2#0#7'TabStop'#9#7'On'
-  +'Click'#7#11'Panel2Click'#0#6'TLabel'#10'lblMatches'#4'Left'#2'`'#6'Height'#2
-  +#17#3'Top'#2'P'#5'Width'#3'A'#1#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6
-  +'TLabel'#12'MatchesLabel'#4'Left'#2#16#6'Height'#2#17#3'Top'#2'P'#5'Width'#2
-  +'@'#7'Caption'#6#7'Matches'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLa'
-  +'bel'#11'lblProgress'#4'Left'#2'`'#6'Height'#2#17#3'Top'#2'0'#5'Width'#3'@'#1
-  +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'SearchingLabel'#4'L'
-  +'eft'#2#16#6'Height'#2#17#3'Top'#2'0'#5'Width'#2'@'#7'Caption'#6#10'Searchin'
-  +'g:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#15'SearchTextLabel'
-  +#4'Left'#2#16#6'Height'#2#17#3'Top'#2#16#5'Width'#2'P'#7'Caption'#6#12'Searc'
-  +'h Text:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#13'lblSearchT'
-  +'ext'#4'Left'#2'`'#6'Height'#2#17#3'Top'#2#16#5'Width'#3'@'#1#5'Color'#7#6'c'
-  +'lNone'#11'ParentColor'#8#0#0#7'TButton'#9'btnCancel'#4'Left'#3#177#0#6'Heig'
-  +'ht'#2#25#3'Top'#2'p'#5'Width'#2'K'#8'AutoSize'#9#25'BorderSpacing.InnerBord'
-  +'er'#2#4#7'Caption'#6#6'Cancel'#7'Default'#9#7'OnClick'#7#13'btnAbortCLICK'#8
-  +'TabOrder'#2#0#0#0#0#0
+  +'Click'#7#11'Panel2Click'#0#6'TLabel'#10'lblMatches'#4'Left'#2'y'#6'Height'#2
+  +#19#3'Top'#2'P'#5'Width'#3'*'#1#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6
+  +'TLabel'#12'MatchesLabel'#21'AnchorSideTop.Control'#7#10'lblMatches'#18'Anch'
+  +'orSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#13#3'Top'#2'S'#5'Wi'
+  +'dth'#2'1'#7'Caption'#6#7'Matches'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
+  +#6'TLabel'#11'lblProgress'#4'Left'#2'y'#6'Height'#2#19#3'Top'#2'0'#5'Width'#3
+  +')'#1#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'SearchingLabel'
+  +#21'AnchorSideTop.Control'#7#11'lblProgress'#18'AnchorSideTop.Side'#7#9'asrC'
+  +'enter'#4'Left'#2#16#6'Height'#2#13#3'Top'#2'3'#5'Width'#2'='#7'Caption'#6#10
+  +'Searching:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#15'SearchT'
+  +'extLabel'#21'AnchorSideTop.Control'#7#13'lblSearchText'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#13#3'Top'#2#20#5'Width'#2'G'#7
+  +'Caption'#6#12'Search Text:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TL'
+  +'abel'#13'lblSearchText'#4'Left'#2'y'#6'Height'#2#20#3'Top'#2#16#5'Width'#3
+  +'('#1#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TButton'#9'btnCancel'#4'L'
+  +'eft'#3#177#0#6'Height'#2#26#3'Top'#2'p'#5'Width'#2'6'#8'AutoSize'#9#25'Bord'
+  +'erSpacing.InnerBorder'#2#4#7'Caption'#6#6'Cancel'#7'Default'#9#7'OnClick'#7
+  +#13'btnAbortCLICK'#8'TabOrder'#2#0#0#0#0#0
 ]);
diff --git a/ide/searchresultview.lfm b/ide/searchresultview.lfm
index 3ea24a0c6d..39bd8c7293 100644
--- a/ide/searchresultview.lfm
+++ b/ide/searchresultview.lfm
@@ -1,7 +1,7 @@
 object SearchResultsView: TSearchResultsView
-  Left = 217
+  Left = 236
   Height = 229
-  Top = 482
+  Top = 483
   Width = 799
   HorzScrollBar.Page = 798
   VertScrollBar.Page = 228
@@ -14,8 +14,8 @@ object SearchResultsView: TSearchResultsView
   object ResultsNoteBook: TNotebook
     AnchorSideTop.Control = btnSearchAgain
     AnchorSideTop.Side = asrBottom
-    Height = 192
-    Top = 37
+    Height = 191
+    Top = 38
     Width = 799
     Align = alBottom
     Anchors = [akTop, akLeft]
@@ -27,9 +27,10 @@ object SearchResultsView: TSearchResultsView
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 25
+    Height = 26
     Top = 6
-    Width = 115
+    Width = 91
+    AutoSize = True
     BorderSpacing.Around = 6
     BorderSpacing.InnerBorder = 4
     Caption = 'Search Again'
@@ -39,15 +40,16 @@ object SearchResultsView: TSearchResultsView
   end
   object gbSearchPhraseInList: TGroupBox
     Left = 237
-    Height = 37
+    Height = 38
     Width = 562
     Align = alRight
+    AutoSize = True
     Caption = 'Search or Filter Phrases In List'
     TabOrder = 2
     object edSearchInList: TEdit
-      Height = 20
+      Height = 21
       Hint = 'Enter one or more phrases that you want'#10'to Search or Filter in the list,'#10'seperated by space ( '' '' ), or comma ( , )'
-      Width = 263
+      Width = 306
       Align = alClient
       OnChange = edSearchInListChange
       OnKeyDown = edSearchInListKeyDown
@@ -56,30 +58,33 @@ object SearchResultsView: TSearchResultsView
       TabOrder = 0
     end
     object bnForwardSearch: TButton
-      Left = 338
-      Height = 20
-      Width = 100
+      Left = 348
+      Height = 21
+      Width = 104
       Align = alRight
+      AutoSize = True
       BorderSpacing.InnerBorder = 4
       Caption = 'Forward Search'
       OnClick = bnForwardSearchClick
       TabOrder = 1
     end
     object bnResetResults: TButton
-      Left = 438
-      Height = 20
-      Width = 120
+      Left = 452
+      Height = 21
+      Width = 106
       Align = alRight
+      AutoSize = True
       BorderSpacing.InnerBorder = 4
       Caption = 'Reset Result List'
       OnClick = bnResetResultsClick
       TabOrder = 2
     end
     object bnFilter: TButton
-      Left = 263
-      Height = 20
-      Width = 75
+      Left = 306
+      Height = 21
+      Width = 42
       Align = alRight
+      AutoSize = True
       BorderSpacing.InnerBorder = 4
       Caption = 'Filter'
       OnClick = bnFilterClick
diff --git a/ide/searchresultview.lrs b/ide/searchresultview.lrs
index eaa720b807..e592a62c76 100644
--- a/ide/searchresultview.lrs
+++ b/ide/searchresultview.lrs
@@ -1,35 +1,36 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TSearchResultsView','FORMDATA',[
-  'TPF0'#18'TSearchResultsView'#17'SearchResultsView'#4'Left'#3#217#0#6'Height'
-  +#3#229#0#3'Top'#3#226#1#5'Width'#3#31#3#18'HorzScrollBar.Page'#3#30#3#18'Ver'
+  'TPF0'#18'TSearchResultsView'#17'SearchResultsView'#4'Left'#3#236#0#6'Height'
+  +#3#229#0#3'Top'#3#227#1#5'Width'#3#31#3#18'HorzScrollBar.Page'#3#30#3#18'Ver'
   +'tScrollBar.Page'#3#228#0#13'ActiveControl'#7#14'btnSearchAgain'#7'Caption'#6
   +#17'SearchResultsView'#8'OnCreate'#7#11'Form1Create'#9'OnDestroy'#7#24'Searc'
   +'hResultsViewDestroy'#9'OnKeyDown'#7#14'ListBoxKeyDown'#8'Position'#7#14'poS'
   +'creenCenter'#0#9'TNotebook'#15'ResultsNoteBook'#21'AnchorSideTop.Control'#7
-  +#14'btnSearchAgain'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#192#0#3
-  +'Top'#2'%'#5'Width'#3#31#3#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'a'
+  +#14'btnSearchAgain'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#191#0#3
+  +'Top'#2'&'#5'Width'#3#31#3#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'a'
   +'kLeft'#0#17'OnCloseTabClicked'#7#30'ResultsNoteBookClosetabclicked'#13'OnPa'
   +'geChanged'#7#26'ResultsNoteBookPageChanged'#7'Options'#11#19'nboShowCloseBu'
   +'ttons'#12'nboMultiLine'#0#0#0#7'TButton'#14'btnSearchAgain'#22'AnchorSideLe'
   +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'H'
-  +'eight'#2#25#3'Top'#2#6#5'Width'#2's'#20'BorderSpacing.Around'#2#6#25'Border'
-  +'Spacing.InnerBorder'#2#4#7'Caption'#6#12'Search Again'#7'OnClick'#7#19'btnS'
-  +'earchAgainClick'#9'OnKeyDown'#7#14'ListBoxKeyDown'#8'TabOrder'#2#1#0#0#9'TG'
-  +'roupBox'#20'gbSearchPhraseInList'#4'Left'#3#237#0#6'Height'#2'%'#5'Width'#3
-  +'2'#2#5'Align'#7#7'alRight'#7'Caption'#6' Search or Filter Phrases In List'#8
-  +'TabOrder'#2#2#0#5'TEdit'#14'edSearchInList'#6'Height'#2#20#4'Hint'#6'sEnter'
-  +' one or more phrases that you want'#10'to Search or Filter in the list,'#10
-  +'seperated by space ( '' '' ), or comma ( , )'#5'Width'#3#7#1#5'Align'#7#8'a'
-  +'lClient'#8'OnChange'#7#20'edSearchInListChange'#9'OnKeyDown'#7#21'edSearchI'
-  +'nListKeyDown'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#0#0#7'TBut'
-  +'ton'#15'bnForwardSearch'#4'Left'#3'R'#1#6'Height'#2#20#5'Width'#2'd'#5'Alig'
-  +'n'#7#7'alRight'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#14'Forward S'
-  +'earch'#7'OnClick'#7#20'bnForwardSearchClick'#8'TabOrder'#2#1#0#0#7'TButton'
-  +#14'bnResetResults'#4'Left'#3#182#1#6'Height'#2#20#5'Width'#2'x'#5'Align'#7#7
-  +'alRight'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#17'Reset Result Lis'
-  +'t'#7'OnClick'#7#19'bnResetResultsClick'#8'TabOrder'#2#2#0#0#7'TButton'#8'bn'
-  +'Filter'#4'Left'#3#7#1#6'Height'#2#20#5'Width'#2'K'#5'Align'#7#7'alRight'#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#6'Filter'#7'OnClick'#7#13'bnFil'
-  +'terClick'#8'TabOrder'#2#3#0#0#0#0
+  +'eight'#2#26#3'Top'#2#6#5'Width'#2'['#8'AutoSize'#9#20'BorderSpacing.Around'
+  +#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#12'Search Again'#7'OnCli'
+  +'ck'#7#19'btnSearchAgainClick'#9'OnKeyDown'#7#14'ListBoxKeyDown'#8'TabOrder'
+  +#2#1#0#0#9'TGroupBox'#20'gbSearchPhraseInList'#4'Left'#3#237#0#6'Height'#2'&'
+  +#5'Width'#3'2'#2#5'Align'#7#7'alRight'#8'AutoSize'#9#7'Caption'#6' Search or'
+  +' Filter Phrases In List'#8'TabOrder'#2#2#0#5'TEdit'#14'edSearchInList'#6'He'
+  +'ight'#2#21#4'Hint'#6'sEnter one or more phrases that you want'#10'to Search'
+  +' or Filter in the list,'#10'seperated by space ( '' '' ), or comma ( , )'#5
+  +'Width'#3'2'#1#5'Align'#7#8'alClient'#8'OnChange'#7#20'edSearchInListChange'
+  +#9'OnKeyDown'#7#21'edSearchInListKeyDown'#14'ParentShowHint'#8#8'ShowHint'#9
+  +#8'TabOrder'#2#0#0#0#7'TButton'#15'bnForwardSearch'#4'Left'#3'\'#1#6'Height'
+  +#2#21#5'Width'#2'h'#5'Align'#7#7'alRight'#8'AutoSize'#9#25'BorderSpacing.Inn'
+  +'erBorder'#2#4#7'Caption'#6#14'Forward Search'#7'OnClick'#7#20'bnForwardSear'
+  +'chClick'#8'TabOrder'#2#1#0#0#7'TButton'#14'bnResetResults'#4'Left'#3#196#1#6
+  +'Height'#2#21#5'Width'#2'j'#5'Align'#7#7'alRight'#8'AutoSize'#9#25'BorderSpa'
+  +'cing.InnerBorder'#2#4#7'Caption'#6#17'Reset Result List'#7'OnClick'#7#19'bn'
+  +'ResetResultsClick'#8'TabOrder'#2#2#0#0#7'TButton'#8'bnFilter'#4'Left'#3'2'#1
+  +#6'Height'#2#21#5'Width'#2'*'#5'Align'#7#7'alRight'#8'AutoSize'#9#25'BorderS'
+  +'pacing.InnerBorder'#2#4#7'Caption'#6#6'Filter'#7'OnClick'#7#13'bnFilterClic'
+  +'k'#8'TabOrder'#2#3#0#0#0#0
 ]);