diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas
index f6f3b3423c..edb6cec779 100644
--- a/ide/findinfilesdlg.pas
+++ b/ide/findinfilesdlg.pas
@@ -126,7 +126,7 @@ begin
       Name:='WholeWordsOnlyCheckBox';
       Parent:=OptionsGroupBox;
       SetBounds(CaseSensitiveCheckBox.Left,
-           CaseSensitiveCheckBox.Top+CaseSensitiveCheckBox.Height+5,
+           CaseSensitiveCheckBox.Top+CaseSensitiveCheckBox.Height+2,
            CaseSensitiveCheckBox.Width,20);
       Caption:=lisFindFileWholeWordsOnly;
     end;
@@ -136,7 +136,7 @@ begin
       Name:='RegularExpressionsCheckBox';
       Parent:=OptionsGroupBox;
       SetBounds(CaseSensitiveCheckBox.Left,
-           WholeWordsOnlyCheckBox.Top+WholeWordsOnlyCheckBox.Height+5,
+           WholeWordsOnlyCheckBox.Top+WholeWordsOnlyCheckBox.Height+2,
            CaseSensitiveCheckBox.Width,20);
       Caption:=lisFindFileRegularExpressions;
     end;
@@ -267,19 +267,15 @@ begin
   end;
 
   with CaseSensitiveCheckBox do begin
-    SetBounds(8,2,OptionsGroupBox.ClientWidth-20,20);
+    Width:=OptionsGroupBox.ClientWidth;
   end;
 
   with WholeWordsOnlyCheckBox do begin
-    SetBounds(CaseSensitiveCheckBox.Left,
-         CaseSensitiveCheckBox.Top+CaseSensitiveCheckBox.Height+5,
-         CaseSensitiveCheckBox.Width,20);
+    Width:=OptionsGroupBox.ClientWidth;
   end;
 
   with RegularExpressionsCheckBox do begin
-    SetBounds(CaseSensitiveCheckBox.Left,
-         WholeWordsOnlyCheckBox.Top+WholeWordsOnlyCheckBox.Height+5,
-         CaseSensitiveCheckBox.Width,20);
+    Width:=OptionsGroupBox.ClientWidth;
   end;
 
   with WhereRadioGroup do begin
diff --git a/ide/findrenameidentifier.lfm b/ide/findrenameidentifier.lfm
index c845b8e840..d094cb2255 100644
--- a/ide/findrenameidentifier.lfm
+++ b/ide/findrenameidentifier.lfm
@@ -1,10 +1,11 @@
 object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
+  BorderStyle = bsSizeToolWin
   Caption = 'FindRenameIdentifierDialog'
   ClientHeight = 435
   ClientWidth = 452
   OnClose = FindRenameIdentifierDialogClose
   OnCreate = FindRenameIdentifierDialogCreate
-  PixelsPerInch = 112
+  PixelsPerInch = 96
   Position = poScreenCenter
   HorzScrollBar.Page = 451
   VertScrollBar.Page = 434
@@ -13,81 +14,100 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
   Top = 163
   Width = 452
   object CurrentGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.OnChange = nil
+    BorderSpacing.Around = 6
     Caption = 'CurrentGroupBox'
-    ClientHeight = 55
-    ClientWidth = 434
+    ClientHeight = 56
+    ClientWidth = 436
     ParentColor = True
     TabOrder = 0
-    Left = 8
-    Height = 72
-    Top = 8
-    Width = 438
+    Left = 6
+    Height = 74
+    Top = 6
+    Width = 440
     object CurrentListBox: TListBox
       Align = alClient
+      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       ClickOnSelChange = False
       TabOrder = 0
-      TopIndex = -1
-      Height = 55
-      Width = 434
+      Left = 6
+      Height = 44
+      Top = 6
+      Width = 424
     end
   end
   object NewGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    BorderSpacing.OnChange = nil
+    BorderSpacing.Around = 6
     Caption = 'NewGroupBox'
-    ClientHeight = 36
-    ClientWidth = 434
+    ClientHeight = 58
+    ClientWidth = 436
     ParentColor = True
     TabOrder = 1
-    Left = 8
-    Height = 53
-    Top = 91
-    Width = 438
+    Left = 6
+    Height = 76
+    Top = 86
+    Width = 440
     object NewEdit: TEdit
-      Anchors = [akTop, akLeft, akRight]
+      Align = alTop
+      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       TabOrder = 0
       Text = 'NewEdit'
       Left = 6
       Height = 23
       Top = 6
-      Width = 262
+      Width = 424
     end
     object RenameCheckBox: TCheckBox
+      Align = alTop
       AllowGrayed = True
       Anchors = [akTop, akRight]
+      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'RenameCheckBox'
       OnChange = RenameCheckBoxChange
       TabOrder = 1
       UseOnChange = True
-      Left = 276
-      Height = 23
-      Top = 6
-      Width = 151
+      Left = 6
+      Height = 13
+      Top = 35
+      Width = 424
     end
   end
   object ScopeGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    BorderSpacing.OnChange = nil
+    BorderSpacing.Around = 6
     Caption = 'ScopeGroupBox'
-    ClientHeight = 211
-    ClientWidth = 435
+    ClientHeight = 206
+    ClientWidth = 436
     ParentColor = True
     TabOrder = 2
-    Left = 8
-    Height = 228
-    Top = 156
-    Width = 439
+    Left = 6
+    Height = 224
+    Top = 168
+    Width = 440
     object ScopeCommentsCheckBox: TCheckBox
+      Align = alTop
       AllowGrayed = True
-      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'ScopeCommentsCheckBox'
       TabOrder = 0
       Left = 6
-      Height = 24
-      Top = 181
-      Width = 419
+      Height = 13
+      Top = 184
+      Width = 424
     end
     object ScopeRadioGroup: TRadioGroup
-      Anchors = [akTop, akLeft, akRight]
+      Align = alTop
+      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'ScopeRadioGroup'
       Items.Strings = (
         'in current unit'
@@ -98,46 +118,53 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
       ParentColor = True
       Left = 6
       Height = 112
-      Top = 5
-      Width = 419
+      Top = 6
+      Width = 424
     end
     object ExtraFilesGroupBox: TGroupBox
-      Anchors = [akTop, akLeft, akRight]
+      Align = alTop
+      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'ExtraFilesGroupBox'
-      ClientHeight = 27
-      ClientWidth = 415
+      ClientHeight = 36
+      ClientWidth = 420
       ParentColor = True
       TabOrder = 2
       Left = 6
-      Height = 44
-      Top = 125
-      Width = 419
+      Height = 54
+      Top = 124
+      Width = 424
       object ExtraFilesEdit: TEdit
-        Anchors = [akTop, akLeft, akRight]
+        Align = alTop
+        BorderSpacing.OnChange = nil
+        BorderSpacing.Around = 6
         TabOrder = 0
         Text = 'ExtraFilesEdit'
         Left = 6
         Height = 23
-        Width = 406
+        Top = 6
+        Width = 408
       end
     end
   end
   object FindOrRenameButton: TButton
-    Anchors = [akTop, akRight]
+    Anchors = [akRight, akBottom]
+    BorderSpacing.OnChange = nil
     Caption = 'FindOrRenameButton'
     OnClick = FindOrRenameButtonClick
     TabOrder = 3
-    Left = 90
+    Left = 120
     Height = 25
     Top = 400
     Width = 233
   end
   object CancelButton: TButton
-    Anchors = [akTop, akRight]
+    Anchors = [akRight, akBottom]
+    BorderSpacing.OnChange = nil
     Caption = 'CancelButton'
     ModalResult = 2
     TabOrder = 4
-    Left = 338
+    Left = 357
     Height = 25
     Top = 400
     Width = 89
diff --git a/ide/findrenameidentifier.lrs b/ide/findrenameidentifier.lrs
index be67875a31..aed2e4fede 100644
--- a/ide/findrenameidentifier.lrs
+++ b/ide/findrenameidentifier.lrs
@@ -1,46 +1,54 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TFindRenameIdentifierDialog','FORMDATA',[
-  'TPF0'#27'TFindRenameIdentifierDialog'#26'FindRenameIdentifierDialog'#7'Capti'
-  +'on'#6#26'FindRenameIdentifierDialog'#12'ClientHeight'#3#179#1#11'ClientWidt'
-  +'h'#3#196#1#7'OnClose'#7#31'FindRenameIdentifierDialogClose'#8'OnCreate'#7' '
-  +'FindRenameIdentifierDialogCreate'#13'PixelsPerInch'#2'p'#8'Position'#7#14'p'
-  +'oScreenCenter'#18'HorzScrollBar.Page'#3#195#1#18'VertScrollBar.Page'#3#178#1
-  +#4'Left'#3'#'#1#6'Height'#3#179#1#3'Top'#3#163#0#5'Width'#3#196#1#0#9'TGroup'
-  +'Box'#15'CurrentGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Ca'
-  +'ption'#6#15'CurrentGroupBox'#12'ClientHeight'#2'7'#11'ClientWidth'#3#178#1
-  +#11'ParentColor'#9#8'TabOrder'#2#0#4'Left'#2#8#6'Height'#2'H'#3'Top'#2#8#5'W'
-  +'idth'#3#182#1#0#8'TListBox'#14'CurrentListBox'#5'Align'#7#8'alClient'#16'Cl'
-  +'ickOnSelChange'#8#8'TabOrder'#2#0#8'TopIndex'#2#255#6'Height'#2'7'#5'Width'
-  +#3#178#1#0#0#0#9'TGroupBox'#11'NewGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#0#7'Caption'#6#11'NewGroupBox'#12'ClientHeight'#2'$'#11'ClientWi'
-  +'dth'#3#178#1#11'ParentColor'#9#8'TabOrder'#2#1#4'Left'#2#8#6'Height'#2'5'#3
-  +'Top'#2'['#5'Width'#3#182#1#0#5'TEdit'#7'NewEdit'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#0#8'TabOrder'#2#0#4'Text'#6#7'NewEdit'#4'Left'#2#6#6'Heig'
-  +'ht'#2#23#3'Top'#2#6#5'Width'#3#6#1#0#0#9'TCheckBox'#14'RenameCheckBox'#11'A'
-  +'llowGrayed'#9#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#14'RenameChe'
-  +'ckBox'#8'OnChange'#7#20'RenameCheckBoxChange'#8'TabOrder'#2#1#11'UseOnChang'
-  +'e'#9#4'Left'#3#20#1#6'Height'#2#23#3'Top'#2#6#5'Width'#3#151#0#0#0#0#9'TGro'
-  +'upBox'#13'ScopeGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Ca'
-  +'ption'#6#13'ScopeGroupBox'#12'ClientHeight'#3#211#0#11'ClientWidth'#3#179#1
-  +#11'ParentColor'#9#8'TabOrder'#2#2#4'Left'#2#8#6'Height'#3#228#0#3'Top'#3#156
-  +#0#5'Width'#3#183#1#0#9'TCheckBox'#21'ScopeCommentsCheckBox'#11'AllowGrayed'
-  +#9#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#21'ScopeCommen'
-  +'tsCheckBox'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#24#3'Top'#3#181#0#5'Wid'
-  +'th'#3#163#1#0#0#11'TRadioGroup'#15'ScopeRadioGroup'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#7'Caption'#6#15'ScopeRadioGroup'#13'Items.Strings'#1#6
-  +#15'in current unit'#6#15'in main project'#6#30'in project/package owning fi'
-  +'le'#6'!in all open projects and packages'#0#11'ParentColor'#9#4'Left'#2#6#6
-  +'Height'#2'p'#3'Top'#2#5#5'Width'#3#163#1#0#0#9'TGroupBox'#18'ExtraFilesGrou'
-  +'pBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#18'ExtraFi'
-  +'lesGroupBox'#12'ClientHeight'#2#27#11'ClientWidth'#3#159#1#11'ParentColor'#9
-  +#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2','#3'Top'#2'}'#5'Width'#3#163#1#0#5
-  +'TEdit'#14'ExtraFilesEdit'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'T'
-  +'abOrder'#2#0#4'Text'#6#14'ExtraFilesEdit'#4'Left'#2#6#6'Height'#2#23#5'Widt'
-  +'h'#3#150#1#0#0#0#0#7'TButton'#18'FindOrRenameButton'#7'Anchors'#11#5'akTop'
-  +#7'akRight'#0#7'Caption'#6#18'FindOrRenameButton'#7'OnClick'#7#23'FindOrRena'
-  +'meButtonClick'#8'TabOrder'#2#3#4'Left'#2'Z'#6'Height'#2#25#3'Top'#3#144#1#5
-  +'Width'#3#233#0#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#5'akTop'#7'akR'
-  +'ight'#0#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#8'TabOrder'#2#4#4
-  +'Left'#3'R'#1#6'Height'#2#25#3'Top'#3#144#1#5'Width'#2'Y'#0#0#0
+  'TPF0'#27'TFindRenameIdentifierDialog'#26'FindRenameIdentifierDialog'#11'Bord'
+  +'erStyle'#7#13'bsSizeToolWin'#7'Caption'#6#26'FindRenameIdentifierDialog'#12
+  +'ClientHeight'#3#179#1#11'ClientWidth'#3#196#1#7'OnClose'#7#31'FindRenameIde'
+  +'ntifierDialogClose'#8'OnCreate'#7' FindRenameIdentifierDialogCreate'#13'Pix'
+  +'elsPerInch'#2'`'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3
+  +#195#1#18'VertScrollBar.Page'#3#178#1#4'Left'#3'#'#1#6'Height'#3#179#1#3'Top'
+  +#3#163#0#5'Width'#3#196#1#0#9'TGroupBox'#15'CurrentGroupBox'#5'Align'#7#5'al'
+  +'Top'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpa'
+  +'cing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'CurrentGroup'
+  +'Box'#12'ClientHeight'#2'8'#11'ClientWidth'#3#180#1#11'ParentColor'#9#8'TabO'
+  +'rder'#2#0#4'Left'#2#6#6'Height'#2'J'#3'Top'#2#6#5'Width'#3#184#1#0#8'TListB'
+  +'ox'#14'CurrentListBox'#5'Align'#7#8'alClient'#22'BorderSpacing.OnChange'#13
+  +#20'BorderSpacing.Around'#2#6#16'ClickOnSelChange'#8#8'TabOrder'#2#0#4'Left'
+  +#2#6#6'Height'#2','#3'Top'#2#6#5'Width'#3#168#1#0#0#0#9'TGroupBox'#11'NewGro'
+  +'upBox'#5'Align'#7#5'alTop'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.A'
+  +'round'#2#6#7'Caption'#6#11'NewGroupBox'#12'ClientHeight'#2':'#11'ClientWidt'
+  +'h'#3#180#1#11'ParentColor'#9#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2'L'#3'T'
+  +'op'#2'V'#5'Width'#3#184#1#0#5'TEdit'#7'NewEdit'#5'Align'#7#5'alTop'#22'Bord'
+  +'erSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'
+  +#6#7'NewEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#168#1#0#0#9'T'
+  +'CheckBox'#14'RenameCheckBox'#5'Align'#7#5'alTop'#11'AllowGrayed'#9#7'Anchor'
+  +'s'#11#5'akTop'#7'akRight'#0#22'BorderSpacing.OnChange'#13#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6#14'RenameCheckBox'#8'OnChange'#7#20'RenameCheckBox'
+  +'Change'#8'TabOrder'#2#1#11'UseOnChange'#9#4'Left'#2#6#6'Height'#2#13#3'Top'
+  +#2'#'#5'Width'#3#168#1#0#0#0#9'TGroupBox'#13'ScopeGroupBox'#5'Align'#7#5'alT'
+  +'op'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#13'ScopeGroupBox'#12'ClientHeight'#3#206#0#11'ClientWidth'#3#180#1#11'Paren'
+  +'tColor'#9#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#3#224#0#3'Top'#3#168#0#5'Wi'
+  +'dth'#3#184#1#0#9'TCheckBox'#21'ScopeCommentsCheckBox'#5'Align'#7#5'alTop'#11
+  +'AllowGrayed'#9#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#21'ScopeCommentsCheckBox'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2
+  +#13#3'Top'#3#184#0#5'Width'#3#168#1#0#0#11'TRadioGroup'#15'ScopeRadioGroup'#5
+  +'Align'#7#5'alTop'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#15'ScopeRadioGroup'#13'Items.Strings'#1#6#15'in current unit'#6
+  +#15'in main project'#6#30'in project/package owning file'#6'!in all open pro'
+  +'jects and packages'#0#11'ParentColor'#9#4'Left'#2#6#6'Height'#2'p'#3'Top'#2
+  +#6#5'Width'#3#168#1#0#0#9'TGroupBox'#18'ExtraFilesGroupBox'#5'Align'#7#5'alT'
+  +'op'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#18'ExtraFilesGroupBox'#12'ClientHeight'#2'$'#11'ClientWidth'#3#164#1#11'Par'
+  +'entColor'#9#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2'6'#3'Top'#2'|'#5'Width'
+  +#3#168#1#0#5'TEdit'#14'ExtraFilesEdit'#5'Align'#7#5'alTop'#22'BorderSpacing.'
+  +'OnChange'#13#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#14'Extr'
+  +'aFilesEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#152#1#0#0#0#0#7
+  +'TButton'#18'FindOrRenameButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#22'B'
+  +'orderSpacing.OnChange'#13#7'Caption'#6#18'FindOrRenameButton'#7'OnClick'#7
+  +#23'FindOrRenameButtonClick'#8'TabOrder'#2#3#4'Left'#2'x'#6'Height'#2#25#3'T'
+  +'op'#3#144#1#5'Width'#3#233#0#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#7
+  +'akRight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#12'Cancel'
+  +'Button'#11'ModalResult'#2#2#8'TabOrder'#2#4#4'Left'#3'e'#1#6'Height'#2#25#3
+  +'Top'#3#144#1#5'Width'#2'Y'#0#0#0
 ]);
diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm
index d3f963f5c0..e19e006725 100644
--- a/packager/installpkgsetdlg.lfm
+++ b/packager/installpkgsetdlg.lfm
@@ -1,107 +1,117 @@
 object InstallPkgSetDialog: TInstallPkgSetDialog
+  BorderStyle = bsSizeToolWin
   Caption = 'InstallPkgSetDialog'
-  ClientHeight = 371
+  ClientHeight = 373
   ClientWidth = 529
   OnCreate = InstallPkgSetDialogCreate
   OnDestroy = InstallPkgSetDialogDestroy
   OnResize = InstallPkgSetDialogResize
   PixelsPerInch = 96
   HorzScrollBar.Page = 528
-  VertScrollBar.Page = 370
+  VertScrollBar.Page = 372
   Left = 319
-  Height = 371
+  Height = 373
   Top = 178
   Width = 529
   object InstallPkgGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akBottom]
     BorderSpacing.OnChange = nil
+    BorderSpacing.Around = 6
     Caption = 'InstallPkgGroupBox'
-    ClientHeight = 285
-    ClientWidth = 236
+    ClientHeight = 307
+    ClientWidth = 251
     ParentColor = True
     TabOrder = 0
-    Left = 16
-    Height = 303
-    Top = 16
-    Width = 240
+    Left = 6
+    Height = 325
+    Top = 6
+    Width = 255
     object InstallListBox: TListBox
-      Align = alTop
-      Anchors = [akTop, akLeft, akRight, akBottom]
+      Align = alClient
       BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       ClickOnSelChange = False
       MultiSelect = True
       OnSelectionChange = InstallListBoxSelectionChange
       TabOrder = 0
-      Height = 184
-      Width = 236
+      Left = 6
+      Height = 202
+      Top = 6
+      Width = 239
     end
     object UninstallButton: TButton
-      Anchors = [akLeft, akRight, akBottom]
+      Align = alBottom
       BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'UninstallButton'
       OnClick = UninstallButtonClick
       TabOrder = 1
       Left = 6
       Height = 25
-      Top = 192
-      Width = 224
+      Top = 214
+      Width = 239
     end
     object ImportButton: TButton
-      Anchors = [akLeft, akRight, akBottom]
+      Align = alBottom
       BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'ImportButton'
       OnClick = ImportButtonClick
       TabOrder = 2
       Left = 6
       Height = 25
-      Top = 224
-      Width = 224
+      Top = 245
+      Width = 239
     end
     object ExportButton: TButton
-      Anchors = [akLeft, akRight, akBottom]
+      Align = alBottom
       BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'ExportButton'
       OnClick = ExportButtonClick
       TabOrder = 3
       Left = 6
       Height = 25
-      Top = 256
-      Width = 224
+      Top = 276
+      Width = 239
     end
   end
   object AvailablePkgGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akBottom]
     BorderSpacing.OnChange = nil
+    BorderSpacing.Around = 6
     Caption = 'AvailablePkgGroupBox'
-    ClientHeight = 285
-    ClientWidth = 236
+    ClientHeight = 307
+    ClientWidth = 251
     ParentColor = True
     TabOrder = 1
-    Left = 272
-    Height = 303
-    Top = 16
-    Width = 240
+    Left = 267
+    Height = 325
+    Top = 6
+    Width = 255
     object AvailableListBox: TListBox
-      Align = alTop
-      Anchors = [akTop, akLeft, akRight, akBottom]
+      Align = alClient
       BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       ClickOnSelChange = False
       MultiSelect = True
       OnSelectionChange = AvailableListBoxSelectionChange
       TabOrder = 0
-      Height = 249
-      Width = 236
+      Left = 6
+      Height = 264
+      Top = 6
+      Width = 239
     end
     object AddToInstallButton: TButton
-      Anchors = [akLeft, akRight, akBottom]
+      Align = alBottom
       BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       Caption = 'AddToInstallButton'
       OnClick = AddToInstallButtonClick
       TabOrder = 1
       Left = 6
       Height = 25
-      Top = 256
-      Width = 224
+      Top = 276
+      Width = 239
     end
   end
   object CancelButton: TButton
@@ -112,33 +122,33 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
     Caption = 'CancelButton'
     ModalResult = 2
     TabOrder = 2
-    Left = 16
-    Height = 22
-    Top = 336
-    Width = 81
+    Left = 6
+    Height = 25
+    Top = 338
+    Width = 84
   end
   object SaveAndRebuildButton: TButton
-    Anchors = [akLeft, akBottom]
+    Anchors = [akBottom]
     AutoSize = True
     BorderSpacing.OnChange = nil
     Caption = 'SaveAndRebuildButton'
     OnClick = InstallButtonClick
     TabOrder = 3
-    Left = 183
-    Height = 22
-    Top = 336
-    Width = 73
+    Left = 199
+    Height = 25
+    Top = 338
+    Width = 130
   end
   object SaveAndExitButton: TButton
-    Anchors = [akLeft, akBottom]
+    Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.OnChange = nil
     Caption = 'SaveAndExitButton'
     OnClick = SaveAndExitButtonClick
     TabOrder = 4
-    Left = 328
-    Height = 22
-    Top = 336
+    Left = 409
+    Height = 25
+    Top = 338
     Width = 113
   end
 end
diff --git a/packager/installpkgsetdlg.lrs b/packager/installpkgsetdlg.lrs
index 6d044d61f9..12a7b3725a 100644
--- a/packager/installpkgsetdlg.lrs
+++ b/packager/installpkgsetdlg.lrs
@@ -1,50 +1,50 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TInstallPkgSetDialog','FORMDATA',[
-  'TPF0'#20'TInstallPkgSetDialog'#19'InstallPkgSetDialog'#7'Caption'#6#19'Insta'
-  +'llPkgSetDialog'#12'ClientHeight'#3's'#1#11'ClientWidth'#3#17#2#8'OnCreate'#7
-  +#25'InstallPkgSetDialogCreate'#9'OnDestroy'#7#26'InstallPkgSetDialogDestroy'
-  +#8'OnResize'#7#25'InstallPkgSetDialogResize'#13'PixelsPerInch'#2'`'#18'HorzS'
-  +'crollBar.Page'#3#16#2#18'VertScrollBar.Page'#3'r'#1#4'Left'#3'?'#1#6'Height'
-  +#3's'#1#3'Top'#3#178#0#5'Width'#3#17#2#0#9'TGroupBox'#18'InstallPkgGroupBox'
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#22'BorderSpacing.OnChange'#13
-  +#7'Caption'#6#18'InstallPkgGroupBox'#12'ClientHeight'#3#29#1#11'ClientWidth'
-  +#3#236#0#11'ParentColor'#9#8'TabOrder'#2#0#4'Left'#2#16#6'Height'#3'/'#1#3'T'
-  +'op'#2#16#5'Width'#3#240#0#0#8'TListBox'#14'InstallListBox'#5'Align'#7#5'alT'
-  +'op'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpac'
-  +'ing.OnChange'#13#16'ClickOnSelChange'#8#11'MultiSelect'#9#17'OnSelectionCha'
-  +'nge'#7#29'InstallListBoxSelectionChange'#8'TabOrder'#2#0#6'Height'#3#184#0#5
-  +'Width'#3#236#0#0#0#7'TButton'#15'UninstallButton'#7'Anchors'#11#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#15'Uninst'
-  +'allButton'#7'OnClick'#7#20'UninstallButtonClick'#8'TabOrder'#2#1#4'Left'#2#6
-  +#6'Height'#2#25#3'Top'#3#192#0#5'Width'#3#224#0#0#0#7'TButton'#12'ImportButt'
-  +'on'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpacing.OnCha'
-  +'nge'#13#7'Caption'#6#12'ImportButton'#7'OnClick'#7#17'ImportButtonClick'#8
-  +'TabOrder'#2#2#4'Left'#2#6#6'Height'#2#25#3'Top'#3#224#0#5'Width'#3#224#0#0#0
-  +#7'TButton'#12'ExportButton'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0
-  +#22'BorderSpacing.OnChange'#13#7'Caption'#6#12'ExportButton'#7'OnClick'#7#17
-  +'ExportButtonClick'#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2#25#3'Top'#3#0#1#5
-  +'Width'#3#224#0#0#0#0#9'TGroupBox'#20'AvailablePkgGroupBox'#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#20
-  +'AvailablePkgGroupBox'#12'ClientHeight'#3#29#1#11'ClientWidth'#3#236#0#11'Pa'
-  +'rentColor'#9#8'TabOrder'#2#1#4'Left'#3#16#1#6'Height'#3'/'#1#3'Top'#2#16#5
-  +'Width'#3#240#0#0#8'TListBox'#16'AvailableListBox'#5'Align'#7#5'alTop'#7'Anc'
-  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpacing.OnCha'
-  +'nge'#13#16'ClickOnSelChange'#8#11'MultiSelect'#9#17'OnSelectionChange'#7#31
-  +'AvailableListBoxSelectionChange'#8'TabOrder'#2#0#6'Height'#3#249#0#5'Width'
-  +#3#236#0#0#0#7'TButton'#18'AddToInstallButton'#7'Anchors'#11#6'akLeft'#7'akR'
-  +'ight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#18'AddToInst'
-  +'allButton'#7'OnClick'#7#23'AddToInstallButtonClick'#8'TabOrder'#2#1#4'Left'
-  +#2#6#6'Height'#2#25#3'Top'#3#0#1#5'Width'#3#224#0#0#0#0#7'TButton'#12'Cancel'
-  +'Button'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacin'
-  +'g.OnChange'#13#6'Cancel'#9#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2
-  +#8'TabOrder'#2#2#4'Left'#2#16#6'Height'#2#22#3'Top'#3'P'#1#5'Width'#2'Q'#0#0
-  +#7'TButton'#20'SaveAndRebuildButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
-  +'AutoSize'#9#22'BorderSpacing.OnChange'#13#7'Caption'#6#20'SaveAndRebuildBut'
-  +'ton'#7'OnClick'#7#18'InstallButtonClick'#8'TabOrder'#2#3#4'Left'#3#183#0#6
-  +'Height'#2#22#3'Top'#3'P'#1#5'Width'#2'I'#0#0#7'TButton'#17'SaveAndExitButto'
-  +'n'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacing.OnC'
-  +'hange'#13#7'Caption'#6#17'SaveAndExitButton'#7'OnClick'#7#22'SaveAndExitBut'
-  +'tonClick'#8'TabOrder'#2#4#4'Left'#3'H'#1#6'Height'#2#22#3'Top'#3'P'#1#5'Wid'
-  +'th'#2'q'#0#0#0
+  'TPF0'#20'TInstallPkgSetDialog'#19'InstallPkgSetDialog'#11'BorderStyle'#7#13
+  +'bsSizeToolWin'#7'Caption'#6#19'InstallPkgSetDialog'#12'ClientHeight'#3'u'#1
+  +#11'ClientWidth'#3#17#2#8'OnCreate'#7#25'InstallPkgSetDialogCreate'#9'OnDest'
+  +'roy'#7#26'InstallPkgSetDialogDestroy'#8'OnResize'#7#25'InstallPkgSetDialogR'
+  +'esize'#13'PixelsPerInch'#2'`'#18'HorzScrollBar.Page'#3#16#2#18'VertScrollBa'
+  +'r.Page'#3't'#1#4'Left'#3'?'#1#6'Height'#3'u'#1#3'Top'#3#178#0#5'Width'#3#17
+  +#2#0#9'TGroupBox'#18'InstallPkgGroupBox'#22'BorderSpacing.OnChange'#13#20'Bo'
+  +'rderSpacing.Around'#2#6#7'Caption'#6#18'InstallPkgGroupBox'#12'ClientHeight'
+  +#3'3'#1#11'ClientWidth'#3#251#0#11'ParentColor'#9#8'TabOrder'#2#0#4'Left'#2#6
+  +#6'Height'#3'E'#1#3'Top'#2#6#5'Width'#3#255#0#0#8'TListBox'#14'InstallListBo'
+  +'x'#5'Align'#7#8'alClient'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Ar'
+  +'ound'#2#6#16'ClickOnSelChange'#8#11'MultiSelect'#9#17'OnSelectionChange'#7
+  +#29'InstallListBoxSelectionChange'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#3
+  +#202#0#3'Top'#2#6#5'Width'#3#239#0#0#0#7'TButton'#15'UninstallButton'#5'Alig'
+  +'n'#7#8'alBottom'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#15'UninstallButton'#7'OnClick'#7#20'UninstallButtonClick'#8'Ta'
+  +'bOrder'#2#1#4'Left'#2#6#6'Height'#2#25#3'Top'#3#214#0#5'Width'#3#239#0#0#0#7
+  +'TButton'#12'ImportButton'#5'Align'#7#8'alBottom'#22'BorderSpacing.OnChange'
+  +#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'ImportButton'#7'OnClick'#7
+  +#17'ImportButtonClick'#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2#25#3'Top'#3
+  +#245#0#5'Width'#3#239#0#0#0#7'TButton'#12'ExportButton'#5'Align'#7#8'alBotto'
+  +'m'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#12'ExportButton'#7'OnClick'#7#17'ExportButtonClick'#8'TabOrder'#2#3#4'Left'
+  +#2#6#6'Height'#2#25#3'Top'#3#20#1#5'Width'#3#239#0#0#0#0#9'TGroupBox'#20'Ava'
+  +'ilablePkgGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#22'Border'
+  +'Spacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'Available'
+  +'PkgGroupBox'#12'ClientHeight'#3'3'#1#11'ClientWidth'#3#251#0#11'ParentColor'
+  +#9#8'TabOrder'#2#1#4'Left'#3#11#1#6'Height'#3'E'#1#3'Top'#2#6#5'Width'#3#255
+  +#0#0#8'TListBox'#16'AvailableListBox'#5'Align'#7#8'alClient'#22'BorderSpacin'
+  +'g.OnChange'#13#20'BorderSpacing.Around'#2#6#16'ClickOnSelChange'#8#11'Multi'
+  +'Select'#9#17'OnSelectionChange'#7#31'AvailableListBoxSelectionChange'#8'Tab'
+  +'Order'#2#0#4'Left'#2#6#6'Height'#3#8#1#3'Top'#2#6#5'Width'#3#239#0#0#0#7'TB'
+  +'utton'#18'AddToInstallButton'#5'Align'#7#8'alBottom'#22'BorderSpacing.OnCha'
+  +'nge'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'AddToInstallButton'#7
+  +'OnClick'#7#23'AddToInstallButtonClick'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'
+  +#2#25#3'Top'#3#20#1#5'Width'#3#239#0#0#0#0#7'TButton'#12'CancelButton'#7'Anc'
+  +'hors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacing.OnChange'#13
+  +#6'Cancel'#9#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#8'TabOrder'#2
+  +#2#4'Left'#2#6#6'Height'#2#25#3'Top'#3'R'#1#5'Width'#2'T'#0#0#7'TButton'#20
+  +'SaveAndRebuildButton'#7'Anchors'#11#8'akBottom'#0#8'AutoSize'#9#22'BorderSp'
+  +'acing.OnChange'#13#7'Caption'#6#20'SaveAndRebuildButton'#7'OnClick'#7#18'In'
+  +'stallButtonClick'#8'TabOrder'#2#3#4'Left'#3#199#0#6'Height'#2#25#3'Top'#3'R'
+  +#1#5'Width'#3#130#0#0#0#7'TButton'#17'SaveAndExitButton'#7'Anchors'#11#7'akR'
+  +'ight'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacing.OnChange'#13#7'Caption'#6
+  +#17'SaveAndExitButton'#7'OnClick'#7#22'SaveAndExitButtonClick'#8'TabOrder'#2
+  +#4#4'Left'#3#153#1#6'Height'#2#25#3'Top'#3'R'#1#5'Width'#2'q'#0#0#0
 ]);
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index 4f4036b361..935aab9591 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -292,15 +292,15 @@ end;
 
 procedure TInstallPkgSetDialog.InstallPkgSetDialogResize(Sender: TObject);
 var
-  x: Integer;
   w: Integer;
+  x: Integer;
 begin
-  x:=10;
-  w:=(ClientWidth-3*x) div 2;
-  with InstallPkgGroupBox do
-    SetBounds(x,Top,w,Height);
-  with AvailablePkgGroupBox do
-    SetBounds(x+w+x,Top,w,Height);
+  x := 6;
+  w := (ClientWidth - 3 * x) div 2;
+  InstallPkgGroupBox.SetBounds(x, x, w, Height - 48);
+  AvailablePkgGroupBox.SetBounds(2 * x + w, x, w, Height - 48);
+
+  SaveAndRebuildButton.Left := (Width - SaveAndRebuildButton.Width) div 2 ;
 end;
 
 procedure TInstallPkgSetDialog.SaveAndExitButtonClick(Sender: TObject);