diff --git a/ide/buildlazdialog.lfm b/ide/buildlazdialog.lfm
index 386a94293c..574404f3fd 100644
--- a/ide/buildlazdialog.lfm
+++ b/ide/buildlazdialog.lfm
@@ -3,51 +3,60 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
   BorderIcons = [biSystemMenu, biMinimize]
   BorderStyle = bsToolWindow
   Caption = 'ConfigureBuildLazarusDlg'
-  ClientHeight = 478
-  ClientWidth = 479
+  ClientHeight = 476
+  ClientWidth = 501
+  OnClose = FormClose
   OnCreate = FormCreate
   PixelsPerInch = 112
   Position = poScreenCenter
-  HorzScrollBar.Page = 478
-  VertScrollBar.Page = 477
+  HorzScrollBar.Page = 500
+  VertScrollBar.Page = 475
   Left = 459
-  Height = 478
+  Height = 476
   Top = 300
-  Width = 479
+  Width = 501
   object OptionsLabel: TLabel
     Caption = 'Options:'
     Color = clNone
     ParentColor = False
+    AnchorSideTop.Control = OptionsEdit
+    AnchorSideTop.Side = asrCenter
     Left = 10
     Height = 13
-    Top = 282
+    Top = 291
     Width = 47
   end
   object TargetOSLabel: TLabel
     Caption = 'Target OS:'
     Color = clNone
     ParentColor = False
+    AnchorSideTop.Control = TargetOSEdit
+    AnchorSideTop.Side = asrCenter
     Left = 10
     Height = 13
-    Top = 311
+    Top = 321
     Width = 61
   end
   object TargetDirectoryLabel: TLabel
     Caption = 'Target Directory:'
     Color = clNone
     ParentColor = False
+    AnchorSideTop.Control = TargetDirectoryComboBox
+    AnchorSideTop.Side = asrCenter
     Left = 10
     Height = 13
-    Top = 341
+    Top = 351
     Width = 94
   end
   object TargetCPULabel: TLabel
     Caption = 'Target CPU'
     Color = clNone
     ParentColor = False
+    AnchorSideTop.Control = TargetCPUComboBox
+    AnchorSideTop.Side = asrCenter
     Left = 10
     Height = 13
-    Top = 373
+    Top = 382
     Width = 65
   end
   object BuildAllButton: TButton
@@ -64,50 +73,51 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
     Caption = 'Clean All'
     TabOrder = 1
     AnchorSideLeft.Control = LCLInterfaceRadioGroup
-    Left = 317
+    Left = 339
     Height = 24
     Top = 12
     Width = 79
   end
   object OptionsEdit: TEdit
-    Anchors = [akTop, akLeft, akRight]
+    Anchors = [akLeft, akRight, akBottom]
     TabOrder = 5
     Left = 156
     Height = 23
-    Top = 282
-    Width = 310
+    Top = 286
+    Width = 332
   end
   object TargetOSEdit: TEdit
-    Anchors = [akTop, akLeft, akRight]
+    Anchors = [akLeft, akRight, akBottom]
     TabOrder = 6
     Left = 156
-    Height = 23
-    Top = 311
-    Width = 310
+    Height = 24
+    Top = 315
+    Width = 332
   end
   object TargetDirectoryComboBox: TComboBox
-    Anchors = [akTop, akLeft, akRight]
+    Anchors = [akLeft, akRight, akBottom]
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
     MaxLength = 0
     TabOrder = 7
+    AnchorSideTop.Side = asrBottom
     Left = 156
-    Height = 25
-    Top = 341
-    Width = 286
+    Height = 24
+    Top = 345
+    Width = 308
   end
   object TargetDirectoryButton: TButton
-    Anchors = [akTop, akRight]
+    Anchors = [akRight, akBottom]
     BorderSpacing.InnerBorder = 2
     Caption = '...'
     OnClick = TargetDirectoryButtonClick
     TabOrder = 8
-    Left = 444
-    Height = 25
-    Top = 341
+    Left = 466
+    Height = 19
+    Top = 345
     Width = 22
   end
   object LCLInterfaceRadioGroup: TRadioGroup
-    Anchors = [akTop, akRight]
+    Anchors = [akTop, akRight, akBottom]
     AutoFill = True
     Caption = 'LCLInterfaceRadioGroup'
     ChildSizing.LeftRightSpacing = 6
@@ -119,62 +129,65 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
     TabOrder = 3
-    Left = 317
-    Height = 206
+    Left = 339
+    Height = 204
     Top = 42
     Width = 149
   end
   object WithStaticPackagesCheckBox: TCheckBox
+    Anchors = [akLeft, akBottom]
     Caption = 'WithStaticPackagesCheckBox'
     TabOrder = 4
     AnchorSideLeft.Control = LCLInterfaceRadioGroup
-    Left = 317
+    Left = 339
     Height = 24
-    Top = 252
+    Top = 253
     Width = 194
   end
   object RestartAfterBuildCheckBox: TCheckBox
+    Anchors = [akLeft, akBottom]
     Caption = 'RestartAfterBuildCheckBox'
     TabOrder = 10
     Left = 10
     Height = 24
-    Top = 408
+    Top = 411
     Width = 176
   end
   object ConfirmBuildCheckBox: TCheckBox
+    Anchors = [akLeft, akBottom]
     Caption = 'ConfirmBuildCheckBox'
     TabOrder = 11
     Left = 10
     Height = 24
-    Top = 434
+    Top = 437
     Width = 154
   end
   object OKButton: TButton
-    Anchors = [akTop, akRight]
+    Anchors = [akRight, akBottom]
     BorderSpacing.InnerBorder = 2
     Caption = 'OK'
     Default = True
     OnClick = OKButtonClick
     TabOrder = 12
-    Left = 282
-    Height = 25
-    Top = 433
+    Left = 304
+    Height = 24
+    Top = 437
     Width = 75
   end
   object CancelButton: TButton
-    Anchors = [akTop, akRight]
+    Anchors = [akRight, akBottom]
     BorderSpacing.InnerBorder = 2
     Cancel = True
     Caption = 'Cancel'
     OnClick = CancelButtonClick
     TabOrder = 13
-    Left = 391
-    Height = 25
-    Top = 433
+    Left = 413
+    Height = 24
+    Top = 437
     Width = 75
   end
   object ItemsListBox: TListBox
-    Anchors = [akTop, akLeft, akRight]
+    Anchors = [akTop, akLeft, akRight, akBottom]
     ItemHeight = 25
     OnDrawItem = ItemsListBoxDrawItem
     OnMouseDown = ItemsListBoxMouseDown
@@ -182,19 +195,19 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
     TabOrder = 2
     TopIndex = -1
     Left = 10
-    Height = 234
+    Height = 230
     Top = 42
-    Width = 294
+    Width = 320
   end
   object TargetCPUComboBox: TComboBox
-    Anchors = [akTop, akLeft, akRight]
+    Anchors = [akLeft, akRight, akBottom]
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
     MaxLength = 0
     TabOrder = 9
     Left = 156
-    Height = 25
-    Top = 373
-    Width = 286
+    Height = 22
+    Top = 377
+    Width = 308
   end
   object ImageList: TImageList
     Height = 20
diff --git a/ide/buildlazdialog.lrs b/ide/buildlazdialog.lrs
index f8e71190d7..989481357d 100644
--- a/ide/buildlazdialog.lrs
+++ b/ide/buildlazdialog.lrs
@@ -4,92 +4,100 @@ LazarusResources.Add('TConfigureBuildLazarusDlg','FORMDATA',[
   'TPF0'#25'TConfigureBuildLazarusDlg'#24'ConfigureBuildLazarusDlg'#13'ActiveCo'
   +'ntrol'#7#14'BuildAllButton'#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimi'
   +'ze'#0#11'BorderStyle'#7#12'bsToolWindow'#7'Caption'#6#24'ConfigureBuildLaza'
-  +'rusDlg'#12'ClientHeight'#3#222#1#11'ClientWidth'#3#223#1#8'OnCreate'#7#10'F'
-  +'ormCreate'#13'PixelsPerInch'#2'p'#8'Position'#7#14'poScreenCenter'#18'HorzS'
-  +'crollBar.Page'#3#222#1#18'VertScrollBar.Page'#3#221#1#4'Left'#3#203#1#6'Hei'
-  +'ght'#3#222#1#3'Top'#3','#1#5'Width'#3#223#1#0#6'TLabel'#12'OptionsLabel'#7
-  +'Caption'#6#8'Options:'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#10#6
-  +'Height'#2#13#3'Top'#3#26#1#5'Width'#2'/'#0#0#6'TLabel'#13'TargetOSLabel'#7
-  +'Caption'#6#10'Target OS:'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2
-  +#10#6'Height'#2#13#3'Top'#3'7'#1#5'Width'#2'='#0#0#6'TLabel'#20'TargetDirect'
-  +'oryLabel'#7'Caption'#6#17'Target Directory:'#5'Color'#7#6'clNone'#11'Parent'
-  +'Color'#8#4'Left'#2#10#6'Height'#2#13#3'Top'#3'U'#1#5'Width'#2'^'#0#0#6'TLab'
-  +'el'#14'TargetCPULabel'#7'Caption'#6#10'Target CPU'#5'Color'#7#6'clNone'#11
-  +'ParentColor'#8#4'Left'#2#10#6'Height'#2#13#3'Top'#3'u'#1#5'Width'#2'A'#0#0#7
-  +'TButton'#14'BuildAllButton'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6
-  +#18'Set to "Build All"'#7'OnClick'#7#19'BuildAllButtonClick'#8'TabOrder'#2#0
-  +#4'Left'#2#10#6'Height'#2#25#3'Top'#2#12#5'Width'#3#194#0#0#0#9'TCheckBox'#16
-  +'CleanAllCheckBox'#7'Caption'#6#9'Clean All'#8'TabOrder'#2#1#22'AnchorSideLe'
-  +'ft.Control'#7#22'LCLInterfaceRadioGroup'#4'Left'#3'='#1#6'Height'#2#24#3'To'
-  +'p'#2#12#5'Width'#2'O'#0#0#5'TEdit'#11'OptionsEdit'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'TabOrder'#2#5#4'Left'#3#156#0#6'Height'#2#23#3'Top'#3
-  +#26#1#5'Width'#3'6'#1#0#0#5'TEdit'#12'TargetOSEdit'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'TabOrder'#2#6#4'Left'#3#156#0#6'Height'#2#23#3'Top'#3
-  +'7'#1#5'Width'#3'6'#1#0#0#9'TComboBox'#23'TargetDirectoryComboBox'#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLin'
-  +'eComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#7#4'Le'
-  +'ft'#3#156#0#6'Height'#2#25#3'Top'#3'U'#1#5'Width'#3#30#1#0#0#7'TButton'#21
-  +'TargetDirectoryButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing'
-  +'.InnerBorder'#2#2#7'Caption'#6#3'...'#7'OnClick'#7#26'TargetDirectoryButton'
-  +'Click'#8'TabOrder'#2#8#4'Left'#3#188#1#6'Height'#2#25#3'Top'#3'U'#1#5'Width'
-  +#2#22#0#0#11'TRadioGroup'#22'LCLInterfaceRadioGroup'#7'Anchors'#11#5'akTop'#7
-  +'akRight'#0#8'AutoFill'#9#7'Caption'#6#22'LCLInterfaceRadioGroup'#28'ChildSi'
-  +'zing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSiz'
-  +'ing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enlarg'
-  +'eVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
-  +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
-  +'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr'
-  +'olsPerLine'#2#1#8'TabOrder'#2#3#4'Left'#3'='#1#6'Height'#3#206#0#3'Top'#2'*'
-  +#5'Width'#3#149#0#0#0#9'TCheckBox'#26'WithStaticPackagesCheckBox'#7'Caption'
-  +#6#26'WithStaticPackagesCheckBox'#8'TabOrder'#2#4#22'AnchorSideLeft.Control'
-  +#7#22'LCLInterfaceRadioGroup'#4'Left'#3'='#1#6'Height'#2#24#3'Top'#3#252#0#5
-  +'Width'#3#194#0#0#0#9'TCheckBox'#25'RestartAfterBuildCheckBox'#7'Caption'#6
-  +#25'RestartAfterBuildCheckBox'#8'TabOrder'#2#10#4'Left'#2#10#6'Height'#2#24#3
-  +'Top'#3#152#1#5'Width'#3#176#0#0#0#9'TCheckBox'#20'ConfirmBuildCheckBox'#7'C'
-  +'aption'#6#20'ConfirmBuildCheckBox'#8'TabOrder'#2#11#4'Left'#2#10#6'Height'#2
-  +#24#3'Top'#3#178#1#5'Width'#3#154#0#0#0#7'TButton'#8'OKButton'#7'Anchors'#11
-  +#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'OK'#7
-  +'Default'#9#7'OnClick'#7#13'OKButtonClick'#8'TabOrder'#2#12#4'Left'#3#26#1#6
-  +'Height'#2#25#3'Top'#3#177#1#5'Width'#2'K'#0#0#7'TButton'#12'CancelButton'#7
-  +'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#6'Cance'
-  +'l'#9#7'Caption'#6#6'Cancel'#7'OnClick'#7#17'CancelButtonClick'#8'TabOrder'#2
-  +#13#4'Left'#3#135#1#6'Height'#2#25#3'Top'#3#177#1#5'Width'#2'K'#0#0#8'TListB'
-  +'ox'#12'ItemsListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'ItemH'
-  +'eight'#2#25#10'OnDrawItem'#7#20'ItemsListBoxDrawItem'#11'OnMouseDown'#7#21
-  +'ItemsListBoxMouseDown'#5'Style'#7#16'lbOwnerDrawFixed'#8'TabOrder'#2#2#8'To'
-  +'pIndex'#2#255#4'Left'#2#10#6'Height'#3#234#0#3'Top'#2'*'#5'Width'#3'&'#1#0#0
-  +#9'TComboBox'#17'TargetCPUComboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
-  +'ht'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAsce'
-  +'nding'#0#9'MaxLength'#2#0#8'TabOrder'#2#9#4'Left'#3#156#0#6'Height'#2#25#3
-  +'Top'#3'u'#1#5'Width'#3#30#1#0#0#10'TImageList'#9'ImageList'#6'Height'#2#20#5
-  +'Width'#2#20#4'left'#2#12#3'top'#3#216#0#6'Bitmap'#10'{'#6#0#0'li'#3#0#0#0#20
-  +#0#0#0#20#0#0#0#198#1#0#0'/* XPM */'#10'static char * menu_stepover_xpm[] = '
-  +'{'#10'"16 16 5 1",'#10'" '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #00'
-  ,'0083",'#10'"@'#9'c #FFFFFF",'#10'"#'#9'c #838583",'#10'"     .  .       ",'
-  +#10'"  .        .    ",'#10'"                ",'#10'".            .  ",'#10
-  +'"                ",'#10'"           .....",'#10'"            ... ",'#10'"  '
-  +'           .  ",'#10'"    +++++++     ",'#10'"    +@@@@@+#    ",'#10'"    +'
-  +'@@@@@+#    ",'#10'"    +@@@@@+#    ",'#10'"    +@@@@@+#    ",'#10'"    +@@@'
-  +'@@+#    ",'#10'"    +++++++#    ",'#10'"     #######    "};'#10't'#2#0#0'/*'
-  +' XPM */'#10'static char * thread_xpm[] = {'#10'"16 16 17 1",'#10'" '#9'c No'
-  +'ne",'#10'".'#9'c #FF80FF",'#10'"+'#9'c #848400",'#10'"@'#9'c #848484",'#10
-  +'"#'#9'c #C6C6C6",'#10'"$'#9'c #FFFF00",'#10'"%'#9'c #FFFFFF",'#10'"&'#9'c #'
-  +'FFFFFF",'#10'"*'#9'c #FFFFFF",'#10'"='#9'c #FFFFFF",'#10'"-'#9'c #FFFFFF",'
-  +#10'";'#9'c #FFFFFF",'#10'">'#9'c #FFFFFF",'#10'",'#9'c #FFFFFF",'#10'"'''#9
-  +'c #FFFFFF",'#10'")'#9'c #FFFFFF",'#10'"!'#9'c #000000",'#10'"              '
-  +'  ",'#10'"                ",'#10'"                ",'#10'"     ++++       "'
-  +','#10'"   ++!$!+!!     ",'#10'"   +$$$$$+!     ",'#10'"  ++$+!+$!!!    ",'
-  +#10'"  +$$!@!$$+!    ",'#10'"  ++$+!+$!!!    ",'#10'"  @+$$$$$+!!    ",'#10
-  +'"   @+!$!+!!     ",'#10'"    @!!!!       ",'#10'"                ",'#10'"  '
-  +'              ",'#10'"                ",'#10'"                "};'#10''''#2
-  +#0#0'/* XPM */'#10'static char * all_xpm[] = {'#10'"16 16 12 1",'#10'" '#9'c'
-  +' None",'#10'".'#9'c #5A3900",'#10'"+'#9'c #634A18",'#10'"@'#9'c #000000",'
-  +#10'"#'#9'c #FFBD4A",'#10'"$'#9'c #FFAD00",'#10'"%'#9'c #B57300",'#10'"&'#9
-  +'c #946300",'#10'"*'#9'c #6B4A00",'#10'"='#9'c #848484",'#10'"-'#9'c #FFD68C'
-  +'",'#10'";'#9'c #DE9400",'#10'"   ...+         ",'#10'" ..@#@.@@       ",'#10
-  +'" .#$$$$%@       ",'#10'"+.$&@&...+      ",'#10'".#$@..@#@.@@    ",'#10'".%'
-  +'$&.#$$$$%@    ",'#10'"*%$+.$&@&...+   ",'#10'" *%.#$@..@#@.@@ ",'#10'"  *.%'
-  +'$&.#$$$$%@ ",'#10'"   *%$+.$&@&$@@@",'#10'"    *%.#$@=@-;%@",'#10'"     *.%'
-  +'$&@-;@@@",'#10'"      *%$$-;;%@@",'#10'"       *%@;@%@@ ",'#10'"        *@@'
-  +'@@   ",'#10'"                "};'#10#10#0#0#0
+  +'rusDlg'#12'ClientHeight'#3#220#1#11'ClientWidth'#3#245#1#7'OnClose'#7#9'For'
+  +'mClose'#8'OnCreate'#7#10'FormCreate'#13'PixelsPerInch'#2'p'#8'Position'#7#14
+  +'poScreenCenter'#18'HorzScrollBar.Page'#3#244#1#18'VertScrollBar.Page'#3#219
+  +#1#4'Left'#3#203#1#6'Height'#3#220#1#3'Top'#3','#1#5'Width'#3#245#1#0#6'TLab'
+  +'el'#12'OptionsLabel'#7'Caption'#6#8'Options:'#5'Color'#7#6'clNone'#11'Paren'
+  +'tColor'#8#21'AnchorSideTop.Control'#7#11'OptionsEdit'#18'AnchorSideTop.Side'
+  +#7#9'asrCenter'#4'Left'#2#10#6'Height'#2#13#3'Top'#3'#'#1#5'Width'#2'/'#0#0#6
+  +'TLabel'#13'TargetOSLabel'#7'Caption'#6#10'Target OS:'#5'Color'#7#6'clNone'
+  +#11'ParentColor'#8#21'AnchorSideTop.Control'#7#12'TargetOSEdit'#18'AnchorSid'
+  +'eTop.Side'#7#9'asrCenter'#4'Left'#2#10#6'Height'#2#13#3'Top'#3'A'#1#5'Width'
+  +#2'='#0#0#6'TLabel'#20'TargetDirectoryLabel'#7'Caption'#6#17'Target Director'
+  +'y:'#5'Color'#7#6'clNone'#11'ParentColor'#8#21'AnchorSideTop.Control'#7#23'T'
+  +'argetDirectoryComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#10#6
+  +'Height'#2#13#3'Top'#3'_'#1#5'Width'#2'^'#0#0#6'TLabel'#14'TargetCPULabel'#7
+  +'Caption'#6#10'Target CPU'#5'Color'#7#6'clNone'#11'ParentColor'#8#21'AnchorS'
+  +'ideTop.Control'#7#17'TargetCPUComboBox'#18'AnchorSideTop.Side'#7#9'asrCente'
+  +'r'#4'Left'#2#10#6'Height'#2#13#3'Top'#3'~'#1#5'Width'#2'A'#0#0#7'TButton'#14
+  +'BuildAllButton'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#18'Set to "B'
+  +'uild All"'#7'OnClick'#7#19'BuildAllButtonClick'#8'TabOrder'#2#0#4'Left'#2#10
+  +#6'Height'#2#25#3'Top'#2#12#5'Width'#3#194#0#0#0#9'TCheckBox'#16'CleanAllChe'
+  +'ckBox'#7'Caption'#6#9'Clean All'#8'TabOrder'#2#1#22'AnchorSideLeft.Control'
+  +#7#22'LCLInterfaceRadioGroup'#4'Left'#3'S'#1#6'Height'#2#24#3'Top'#2#12#5'Wi'
+  +'dth'#2'O'#0#0#5'TEdit'#11'OptionsEdit'#7'Anchors'#11#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#8'TabOrder'#2#5#4'Left'#3#156#0#6'Height'#2#23#3'Top'#3#30#1#5
+  +'Width'#3'L'#1#0#0#5'TEdit'#12'TargetOSEdit'#7'Anchors'#11#6'akLeft'#7'akRig'
+  +'ht'#8'akBottom'#0#8'TabOrder'#2#6#4'Left'#3#156#0#6'Height'#2#24#3'Top'#3';'
+  +#1#5'Width'#3'L'#1#0#0#9'TComboBox'#23'TargetDirectoryComboBox'#7'Anchors'#11
+  +#6'akLeft'#7'akRight'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLin'
+  +'eComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#7#18'A'
+  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'Height'#2#24#3'Top'#3'Y'
+  +#1#5'Width'#3'4'#1#0#0#7'TButton'#21'TargetDirectoryButton'#7'Anchors'#11#7
+  +'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'...'
+  +#7'OnClick'#7#26'TargetDirectoryButtonClick'#8'TabOrder'#2#8#4'Left'#3#210#1
+  +#6'Height'#2#19#3'Top'#3'Y'#1#5'Width'#2#22#0#0#11'TRadioGroup'#22'LCLInterf'
+  +'aceRadioGroup'#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoFill'#9
+  +#7'Caption'#6#22'LCLInterfaceRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6
+  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
+  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
+  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
+  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
+  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'
+  +#2#3#4'Left'#3'S'#1#6'Height'#3#204#0#3'Top'#2'*'#5'Width'#3#149#0#0#0#9'TCh'
+  +'eckBox'#26'WithStaticPackagesCheckBox'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
+  +#7'Caption'#6#26'WithStaticPackagesCheckBox'#8'TabOrder'#2#4#22'AnchorSideLe'
+  +'ft.Control'#7#22'LCLInterfaceRadioGroup'#4'Left'#3'S'#1#6'Height'#2#24#3'To'
+  +'p'#3#253#0#5'Width'#3#194#0#0#0#9'TCheckBox'#25'RestartAfterBuildCheckBox'#7
+  +'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#25'RestartAfterBuildCheckB'
+  +'ox'#8'TabOrder'#2#10#4'Left'#2#10#6'Height'#2#24#3'Top'#3#155#1#5'Width'#3
+  +#176#0#0#0#9'TCheckBox'#20'ConfirmBuildCheckBox'#7'Anchors'#11#6'akLeft'#8'a'
+  +'kBottom'#0#7'Caption'#6#20'ConfirmBuildCheckBox'#8'TabOrder'#2#11#4'Left'#2
+  +#10#6'Height'#2#24#3'Top'#3#181#1#5'Width'#3#154#0#0#0#7'TButton'#8'OKButton'
+  +#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#2#7
+  +'Caption'#6#2'OK'#7'Default'#9#7'OnClick'#7#13'OKButtonClick'#8'TabOrder'#2
+  +#12#4'Left'#3'0'#1#6'Height'#2#24#3'Top'#3#181#1#5'Width'#2'K'#0#0#7'TButton'
+  +#12'CancelButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.In'
+  +'nerBorder'#2#2#6'Cancel'#9#7'Caption'#6#6'Cancel'#7'OnClick'#7#17'CancelBut'
+  +'tonClick'#8'TabOrder'#2#13#4'Left'#3#157#1#6'Height'#2#24#3'Top'#3#181#1#5
+  +'Width'#2'K'#0#0#8'TListBox'#12'ItemsListBox'#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#8'akBottom'#0#10'ItemHeight'#2#25#10'OnDrawItem'#7#20'ItemsLi'
+  +'stBoxDrawItem'#11'OnMouseDown'#7#21'ItemsListBoxMouseDown'#5'Style'#7#16'lb'
+  +'OwnerDrawFixed'#8'TabOrder'#2#2#8'TopIndex'#2#255#4'Left'#2#10#6'Height'#3
+  ,#230#0#3'Top'#2'*'#5'Width'#3'@'#1#0#0#9'TComboBox'#17'TargetCPUComboBox'#7
+  +'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#16'AutoCompleteText'#11#22'c'
+  +'bactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrd'
+  +'er'#2#9#4'Left'#3#156#0#6'Height'#2#22#3'Top'#3'y'#1#5'Width'#3'4'#1#0#0#10
+  +'TImageList'#9'ImageList'#6'Height'#2#20#5'Width'#2#20#4'left'#2#12#3'top'#3
+  +#216#0#6'Bitmap'#10'{'#6#0#0'li'#3#0#0#0#20#0#0#0#20#0#0#0#198#1#0#0'/* XPM '
+  +'*/'#10'static char * menu_stepover_xpm[] = {'#10'"16 16 5 1",'#10'" '#9'c N'
+  +'one",'#10'".'#9'c #000000",'#10'"+'#9'c #000083",'#10'"@'#9'c #FFFFFF",'#10
+  +'"#'#9'c #838583",'#10'"     .  .       ",'#10'"  .        .    ",'#10'"    '
+  +'            ",'#10'".            .  ",'#10'"                ",'#10'"       '
+  +'    .....",'#10'"            ... ",'#10'"             .  ",'#10'"    ++++++'
+  +'+     ",'#10'"    +@@@@@+#    ",'#10'"    +@@@@@+#    ",'#10'"    +@@@@@+# '
+  +'   ",'#10'"    +@@@@@+#    ",'#10'"    +@@@@@+#    ",'#10'"    +++++++#    '
+  +'",'#10'"     #######    "};'#10't'#2#0#0'/* XPM */'#10'static char * thread'
+  +'_xpm[] = {'#10'"16 16 17 1",'#10'" '#9'c None",'#10'".'#9'c #FF80FF",'#10'"'
+  +'+'#9'c #848400",'#10'"@'#9'c #848484",'#10'"#'#9'c #C6C6C6",'#10'"$'#9'c #F'
+  +'FFF00",'#10'"%'#9'c #FFFFFF",'#10'"&'#9'c #FFFFFF",'#10'"*'#9'c #FFFFFF",'
+  +#10'"='#9'c #FFFFFF",'#10'"-'#9'c #FFFFFF",'#10'";'#9'c #FFFFFF",'#10'">'#9
+  +'c #FFFFFF",'#10'",'#9'c #FFFFFF",'#10'"'''#9'c #FFFFFF",'#10'")'#9'c #FFFFF'
+  +'F",'#10'"!'#9'c #000000",'#10'"                ",'#10'"                ",'
+  +#10'"                ",'#10'"     ++++       ",'#10'"   ++!$!+!!     ",'#10
+  +'"   +$$$$$+!     ",'#10'"  ++$+!+$!!!    ",'#10'"  +$$!@!$$+!    ",'#10'"  '
+  +'++$+!+$!!!    ",'#10'"  @+$$$$$+!!    ",'#10'"   @+!$!+!!     ",'#10'"    @'
+  +'!!!!       ",'#10'"                ",'#10'"                ",'#10'"        '
+  +'        ",'#10'"                "};'#10''''#2#0#0'/* XPM */'#10'static char'
+  +' * all_xpm[] = {'#10'"16 16 12 1",'#10'" '#9'c None",'#10'".'#9'c #5A3900",'
+  +#10'"+'#9'c #634A18",'#10'"@'#9'c #000000",'#10'"#'#9'c #FFBD4A",'#10'"$'#9
+  +'c #FFAD00",'#10'"%'#9'c #B57300",'#10'"&'#9'c #946300",'#10'"*'#9'c #6B4A00'
+  +'",'#10'"='#9'c #848484",'#10'"-'#9'c #FFD68C",'#10'";'#9'c #DE9400",'#10'" '
+  +'  ...+         ",'#10'" ..@#@.@@       ",'#10'" .#$$$$%@       ",'#10'"+.$&'
+  +'@&...+      ",'#10'".#$@..@#@.@@    ",'#10'".%$&.#$$$$%@    ",'#10'"*%$+.$&'
+  +'@&...+   ",'#10'" *%.#$@..@#@.@@ ",'#10'"  *.%$&.#$$$$%@ ",'#10'"   *%$+.$&'
+  +'@&$@@@",'#10'"    *%.#$@=@-;%@",'#10'"     *.%$&@-;@@@",'#10'"      *%$$-;;'
+  +'%@@",'#10'"       *%@;@%@@ ",'#10'"        *@@@@   ",'#10'"                '
+  +'"};'#10#10#0#0#0
 ]);
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 40accb2a33..15ea940132 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -28,7 +28,7 @@
 
     The BuildLazarus function will build the lazarus parts.
 }
-unit buildlazdialog;
+unit BuildLazDialog;
 
 {$mode objfpc}{$H+}
 
@@ -39,7 +39,7 @@ uses
   Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileUtil, Dialogs,
   LResources,  Laz_XMLCfg,
   LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs,
-  InputHistory, ExtToolDialog, ExtToolEditDlg,
+  IDEWindowIntf, InputHistory, ExtToolDialog, ExtToolEditDlg,
   CompilerOptions;
 
 type
@@ -190,6 +190,7 @@ type
     WithStaticPackagesCheckBox: TCheckBox;
     procedure BuildAllButtonClick(Sender: TObject);
     procedure CancelButtonClick(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure ItemsListBoxDrawItem(Control: TWinControl; Index: Integer;
       ARect: TRect; State: TOwnerDrawState);
@@ -675,6 +676,9 @@ begin
   TargetOSLabel.Caption := lisLazBuildTargetOS;
   TargetCPULabel.Caption := lisLazBuildTargetCPU;
   TargetDirectoryLabel.Caption := lisLazBuildTargetDirectory;
+
+  IDEDialogLayoutList.ApplyLayout(Self, 500, 476);
+
   Load(Options);
 end;
 
@@ -906,6 +910,12 @@ begin
   ModalResult:=mrCancel;
 end;
 
+procedure TConfigureBuildLazarusDlg.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  IDEDialogLayoutList.SaveLayout(Self);
+end;
+
 procedure TConfigureBuildLazarusDlg.BuildAllButtonClick(Sender: TObject);
 begin
   Save(Options);