From 1968691a1775420fe12cd6c284bfa0eca5b650ca Mon Sep 17 00:00:00 2001
From: laurent <laurent@lazarus-ide.org>
Date: Fri, 19 Sep 2008 16:16:24 +0000
Subject: [PATCH] Load glyph form resource

git-svn-id: trunk@16652 -
---
 ide/aboutfrm.lfm            |  68 ++-----
 ide/aboutfrm.lrs            |  93 +++-------
 ide/aboutfrm.pas            |   1 +
 ide/abstractsmethodsdlg.lfm |  41 ++--
 ide/abstractsmethodsdlg.lrs |  75 ++++----
 ide/abstractsmethodsdlg.pas |   3 +
 ide/addtoprojectdlg.lfm     |  82 ++++----
 ide/addtoprojectdlg.lrs     | 119 ++++++------
 ide/addtoprojectdlg.pas     |  13 +-
 ide/buildfiledlg.lfm        | 129 +++++++------
 ide/buildfiledlg.lrs        | 173 +++++++++--------
 ide/buildfiledlg.pas        |   4 +
 ide/buildlazdialog.lfm      | 227 ++++++-----------------
 ide/buildlazdialog.lrs      | 359 +++++++++++-------------------------
 ide/buildlazdialog.pas      |   3 +
 15 files changed, 548 insertions(+), 842 deletions(-)

diff --git a/ide/aboutfrm.lfm b/ide/aboutfrm.lfm
index 31a8bdaec8..1206d7254c 100644
--- a/ide/aboutfrm.lfm
+++ b/ide/aboutfrm.lfm
@@ -83,50 +83,14 @@ object AboutForm: TAboutForm
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 70
-    Height = 26
-    Top = 269
-    Width = 71
+    Height = 23
+    Top = 272
+    Width = 52
     Anchors = [akLeft, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
     Cancel = True
     Caption = 'Close'
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00B7B7
-      B7FFAEAEAEFF3071A9FF2C6EA6FF286BA3FF2468A0FF21669EFF1D639BFF1A61
-      99FF175F97FF145C94FF115B93FF6C6C6CFF6C6C6CFFFFFFFF00FFFFFF00FFFF
-      FF00FFFFFF003675ADFF86B6D8FF83B3D7FF81B2D6FF7DAFD5FF7BADD4FF79AB
-      D3FF76AAD2FF74A8D1FF155D95FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF003C79B1FF8BB9DAFF66A2CEFF62A0CDFF5F9DCBFF5B9AC9FF5897
-      C8FF5495C7FF77ABD3FF196098FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00427DB5FF8FBDDCFF6CA7D0FF67A4CFFF64A1CDFF609ECCFF5C9B
-      CAFF5999C9FF7BADD4FF1E649CFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004882BAFF93C0DDFF71ABD2FF6DA8D1FF69A5CFFF66A2CEFF629F
-      CCFF5E9CCBFF7FB0D5FF23679FFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004E86BEFF98C3DFFF77AFD5FF73ACD3FF6FA9D2FF6BA7D0FF5BB7
-      E3FF54C2EDFF81B4D7FF286BA3FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00538AC2FF9CC6E1FF7CB3D7FF79B1D5FF75ADD4FF71ABD2FF5FBA
-      E4FF4BD4FFFF7CBBE0FF2E6FA7FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00598EC6FFA0C9E3FF82B8D9FF7EB5D8FF7AB2D6FF77AFD5FF73AC
-      D3FF6DABD4FF8CBADAFF3373ABFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF005E91C9FFA4CCE4FF87BBDBFF84B9DAFF80B6D8FF7CB3D7FF79B0
-      D5FF74ADD4FF8FBDDCFF3977AFFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006395CDFFA8CFE5FF8CBFDDFF88BDDCFF85BADBFF81B7D9FF7EB4
-      D7FF7AB2D6FF94C1DDFF3F7CB4FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006798D0FFABD1E7FF90C2DFFF8DC0DEFF8ABEDCFF87BBDBFF83B8
-      DAFF80B6D8FF99C4E0FF4580B8FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006B9BD3FFAED4E8FFABD3E8FFAAD1E7FFA8CFE5FFA5CDE4FFA2CB
-      E4FFA0C9E2FF9DC7E1FF4B84BCFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006E9DD5FF6C9BD3FF699AD2FF6697CFFF6395CDFF6093CBFF5C90
-      C8FF598EC6FF558BC3FF5188C0FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-    }
     ModalResult = 1
     NumGlyphs = 0
     TabOrder = 1
@@ -137,15 +101,15 @@ object AboutForm: TAboutForm
     Top = 6
     Width = 389
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 3
+    PageIndex = 0
     TabOrder = 0
     object AboutPage: TPage
       Caption = 'About'
-      ClientWidth = 385
-      ClientHeight = 230
+      ClientWidth = 381
+      ClientHeight = 266
       object AboutMemo: TMemo
-        Height = 230
-        Width = 385
+        Height = 266
+        Width = 381
         Align = alClient
         ReadOnly = True
         ScrollBars = ssAutoBoth
@@ -154,11 +118,11 @@ object AboutForm: TAboutForm
     end
     object ContributorsPage: TPage
       Caption = 'Contributors'
-      ClientWidth = 385
-      ClientHeight = 230
+      ClientWidth = 381
+      ClientHeight = 266
       object ContributorsMemo: TMemo
-        Height = 230
-        Width = 385
+        Height = 266
+        Width = 381
         Align = alClient
         ReadOnly = True
         ScrollBars = ssAutoBoth
@@ -167,11 +131,11 @@ object AboutForm: TAboutForm
     end
     object AcknowledgementsPage: TPage
       Caption = 'Acknowledgements'
-      ClientWidth = 385
-      ClientHeight = 230
+      ClientWidth = 381
+      ClientHeight = 266
       object AcknowledgementsMemo: TMemo
-        Height = 230
-        Width = 385
+        Height = 266
+        Width = 381
         Align = alClient
         ReadOnly = True
         ScrollBars = ssAutoBoth
diff --git a/ide/aboutfrm.lrs b/ide/aboutfrm.lrs
index 51b5861063..5bff566ff5 100644
--- a/ide/aboutfrm.lrs
+++ b/ide/aboutfrm.lrs
@@ -28,76 +28,25 @@ LazarusResources.Add('TAboutForm','FORMDATA',[
   +'eight'#2#14#3'Top'#2'"'#5'Width'#2'P'#7'Caption'#6#15'FPCVersionLabel'#11'P'
   +'arentColor'#8#0#0#7'TBitBtn'#11'CloseButton'#24'AnchorSideBottom.Control'#7
   +#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2
-  +#26#3'Top'#3#13#1#5'Width'#2'G'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'Auto'
-  +'Size'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#5'Close'#10'G'
-  +'lyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0
-  +#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#183#183#183#255#174#174#174#255'0q'#169#255',n'#166#255'(k'#163
-  +#255'$h'#160#255'!f'#158#255#29'c'#155#255#26'a'#153#255#23'_'#151#255#20'\'
-  +#148#255#17'['#147#255'lll'#255'lll'#255#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0'6u'#173#255#134#182#216#255#131#179#215#255#129#178#214
-  +#255'}'#175#213#255'{'#173#212#255'y'#171#211#255'v'#170#210#255't'#168#209
-  +#255#21']'#149#255#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0'<y'#177#255#139#185#218#255'f'#162#206#255'b'
-  +#160#205#255'_'#157#203#255'['#154#201#255'X'#151#200#255'T'#149#199#255'w'
-  +#171#211#255#25'`'#152#255#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'B}'#181#255#143#189#220#255'l'#167#208#255
-  +'g'#164#207#255'd'#161#205#255'`'#158#204#255'\'#155#202#255'Y'#153#201#255
-  +'{'#173#212#255#30'd'#156#255#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'H'#130#186#255#147#192#221#255'q'#171
-  +#210#255'm'#168#209#255'i'#165#207#255'f'#162#206#255'b'#159#204#255'^'#156
-  +#203#255''#176#213#255'#g'#159#255#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0'N'#134#190#255#152#195#223#255'w'
-  +#175#213#255's'#172#211#255'o'#169#210#255'k'#167#208#255'['#183#227#255'T'
-  +#194#237#255#129#180#215#255'(k'#163#255#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0'S'#138#194#255#156#198#225
-  +#255'|'#179#215#255'y'#177#213#255'u'#173#212#255'q'#171#210#255'_'#186#228
-  +#255'K'#212#255#255'|'#187#224#255'.o'#167#255#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'Y'#142#198#255#160
-  +#201#227#255#130#184#217#255'~'#181#216#255'z'#178#214#255'w'#175#213#255's'
-  +#172#211#255'm'#171#212#255#140#186#218#255'3s'#171#255#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'^'#145#201#255
-  +#164#204#228#255#135#187#219#255#132#185#218#255#128#182#216#255'|'#179#215
-  +#255'y'#176#213#255't'#173#212#255#143#189#220#255'9w'#175#255#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'c'#149
-  +#205#255#168#207#229#255#140#191#221#255#136#189#220#255#133#186#219#255#129
-  +#183#217#255'~'#180#215#255'z'#178#214#255#148#193#221#255'?|'#180#255#255
-  ,#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0'g'#152#208#255#171#209#231#255#144#194#223#255#141#192#222#255#138#190
-  +#220#255#135#187#219#255#131#184#218#255#128#182#216#255#153#196#224#255'E'
-  +#128#184#255#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0'k'#155#211#255#174#212#232#255#171#211#232#255#170#209
-  +#231#255#168#207#229#255#165#205#228#255#162#203#228#255#160#201#226#255#157
-  +#199#225#255'K'#132#188#255#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'n'#157#213#255'l'#155#211#255'i'#154#210
-  +#255'f'#151#207#255'c'#149#205#255'`'#147#203#255'\'#144#200#255'Y'#142#198
-  +#255'U'#139#195#255'Q'#136#192#255#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#9'TNotebook'#9'Not'
-  +'ebook1'#4'Left'#3#215#0#6'Height'#3'$'#1#3'Top'#2#6#5'Width'#3#133#1#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#3#8'TabO'
-  +'rder'#2#0#0#5'TPage'#9'AboutPage'#7'Caption'#6#5'About'#11'ClientWidth'#3
-  +#129#1#12'ClientHeight'#3#230#0#0#5'TMemo'#9'AboutMemo'#6'Height'#3#230#0#5
-  +'Width'#3#129#1#5'Align'#7#8'alClient'#8'ReadOnly'#9#10'ScrollBars'#7#10'ssA'
-  +'utoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#16'ContributorsPage'#7'Caption'#6#12
-  +'Contributors'#11'ClientWidth'#3#129#1#12'ClientHeight'#3#230#0#0#5'TMemo'#16
-  +'ContributorsMemo'#6'Height'#3#230#0#5'Width'#3#129#1#5'Align'#7#8'alClient'
-  +#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'
-  +#20'AcknowledgementsPage'#7'Caption'#6#16'Acknowledgements'#11'ClientWidth'#3
-  +#129#1#12'ClientHeight'#3#230#0#0#5'TMemo'#20'AcknowledgementsMemo'#6'Height'
-  +#3#230#0#5'Width'#3#129#1#5'Align'#7#8'alClient'#8'ReadOnly'#9#10'ScrollBars'
-  +#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#8'LogoPage'#7'Caption'#6#8
-  +'LogoPage'#11'ClientWidth'#3'}'#1#12'ClientHeight'#3#10#1#0#6'TImage'#9'Logo'
-  +'Image'#6'Height'#3#10#1#5'Width'#3'}'#1#5'Align'#7#8'alClient'#0#0#0#0#10'T'
-  +'PopupMenu'#10'PopupMenu1'#4'left'#2#18#3'top'#3#225#0#0#9'TMenuItem'#16'miV'
-  +'erToClipboard'#7'Caption'#6'%Copy version information to clipboard'#7'OnCli'
-  +'ck'#7#21'miVerToClipboardClick'#0#0#0#0
+  +#23#3'Top'#3#16#1#5'Width'#2'4'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'Auto'
+  +'Size'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#5'Close'#11'M'
+  +'odalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#9'TNotebook'#9'Noteboo'
+  +'k1'#4'Left'#3#215#0#6'Height'#3'$'#1#3'Top'#2#6#5'Width'#3#133#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#0#8'TabOrder'
+  +#2#0#0#5'TPage'#9'AboutPage'#7'Caption'#6#5'About'#11'ClientWidth'#3'}'#1#12
+  +'ClientHeight'#3#10#1#0#5'TMemo'#9'AboutMemo'#6'Height'#3#10#1#5'Width'#3'}'
+  +#1#5'Align'#7#8'alClient'#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'Ta'
+  +'bOrder'#2#0#0#0#0#5'TPage'#16'ContributorsPage'#7'Caption'#6#12'Contributor'
+  +'s'#11'ClientWidth'#3'}'#1#12'ClientHeight'#3#10#1#0#5'TMemo'#16'Contributor'
+  +'sMemo'#6'Height'#3#10#1#5'Width'#3'}'#1#5'Align'#7#8'alClient'#8'ReadOnly'#9
+  +#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#20'Acknowled'
+  +'gementsPage'#7'Caption'#6#16'Acknowledgements'#11'ClientWidth'#3'}'#1#12'Cl'
+  +'ientHeight'#3#10#1#0#5'TMemo'#20'AcknowledgementsMemo'#6'Height'#3#10#1#5'W'
+  +'idth'#3'}'#1#5'Align'#7#8'alClient'#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAut'
+  +'oBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#8'LogoPage'#7'Caption'#6#8'LogoPage'
+  +#11'ClientWidth'#3'}'#1#12'ClientHeight'#3#10#1#0#6'TImage'#9'LogoImage'#6'H'
+  +'eight'#3#10#1#5'Width'#3'}'#1#5'Align'#7#8'alClient'#0#0#0#0#10'TPopupMenu'
+  +#10'PopupMenu1'#4'left'#2#18#3'top'#3#225#0#0#9'TMenuItem'#16'miVerToClipboa'
+  +'rd'#7'Caption'#6'%Copy version information to clipboard'#7'OnClick'#7#21'mi'
+  +'VerToClipboardClick'#0#0#0#0
 ]);
diff --git a/ide/aboutfrm.pas b/ide/aboutfrm.pas
index 0535ac3963..0f33541c4f 100644
--- a/ide/aboutfrm.pas
+++ b/ide/aboutfrm.pas
@@ -147,6 +147,7 @@ begin
   LoadContributors;
   LoadAcknowledgements;
   CloseButton.Caption:=lisClose;
+  CloseButton.LoadGlyphFromLazarusResource('btn_close');
 end;
 
 procedure TAboutForm.miVerToClipboardClick(Sender: TObject);
diff --git a/ide/abstractsmethodsdlg.lfm b/ide/abstractsmethodsdlg.lfm
index 70a0c3438a..0aa885bace 100644
--- a/ide/abstractsmethodsdlg.lfm
+++ b/ide/abstractsmethodsdlg.lfm
@@ -3,16 +3,16 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
   Height = 344
   Top = 291
   Width = 581
-  HorzScrollBar.Page = 580
-  VertScrollBar.Page = 343
   ActiveControl = MethodsCheckListBox
   Caption = 'AbstractMethodsDialog'
   ClientHeight = 344
   ClientWidth = 581
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  ParentFont = False
+  LCLVersion = '0.9.25'
   object NoteLabel: TLabel
-    Height = 20
+    Height = 14
     Width = 581
     Align = alTop
     Caption = 'NoteLabel'
@@ -20,32 +20,31 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
     WordWrap = True
   end
   object MethodsGroupBox: TGroupBox
-    Height = 274
-    Top = 20
+    Height = 280
+    Top = 14
     Width = 581
     Align = alClient
     Caption = 'MethodsGroupBox'
-    ClientHeight = 255
+    ClientHeight = 262
     ClientWidth = 577
     TabOrder = 0
     object MethodsCheckListBox: TCheckListBox
       AnchorSideBottom.Control = SelectAllButton
-      Height = 214
+      Height = 227
       Width = 577
       Align = alTop
       Anchors = [akTop, akLeft, akRight, akBottom]
       OnClickCheck = MethodsCheckListBoxClickCheck
       TabOrder = 0
-      TopIndex = -1
     end
     object SelectAllButton: TButton
       AnchorSideLeft.Control = MethodsGroupBox
       AnchorSideBottom.Control = MethodsGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 29
-      Top = 220
-      Width = 110
+      Height = 23
+      Top = 233
+      Width = 98
       Anchors = [akLeft, akBottom]
       AutoSize = True
       BorderSpacing.Around = 6
@@ -58,10 +57,10 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideBottom.Control = MethodsGroupBox
       AnchorSideBottom.Side = asrBottom
-      Left = 122
-      Height = 29
-      Top = 220
-      Width = 129
+      Left = 110
+      Height = 23
+      Top = 233
+      Width = 112
       Anchors = [akLeft, akBottom]
       AutoSize = True
       BorderSpacing.Around = 6
@@ -80,10 +79,10 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
     ClientWidth = 581
     TabOrder = 1
     object CancelBitBtn: TBitBtn
-      Left = 497
+      Left = 517
       Height = 38
       Top = 6
-      Width = 78
+      Width = 58
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
@@ -95,10 +94,10 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
       TabOrder = 0
     end
     object AddFirstBitBtn: TBitBtn
-      Left = 339
+      Left = 392
       Height = 38
       Top = 6
-      Width = 59
+      Width = 43
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
@@ -111,10 +110,10 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
       TabOrder = 1
     end
     object AddAllBitBtn: TBitBtn
-      Left = 404
+      Left = 441
       Height = 38
       Top = 6
-      Width = 87
+      Width = 70
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
diff --git a/ide/abstractsmethodsdlg.lrs b/ide/abstractsmethodsdlg.lrs
index 0aa95bc3b6..ab9f34de64 100644
--- a/ide/abstractsmethodsdlg.lrs
+++ b/ide/abstractsmethodsdlg.lrs
@@ -2,42 +2,41 @@
 
 LazarusResources.Add('TAbstractMethodsDialog','FORMDATA',[
   'TPF0'#22'TAbstractMethodsDialog'#21'AbstractMethodsDialog'#4'Left'#3'^'#1#6
-  +'Height'#3'X'#1#3'Top'#3'#'#1#5'Width'#3'E'#2#18'HorzScrollBar.Page'#3'D'#2
-  +#18'VertScrollBar.Page'#3'W'#1#13'ActiveControl'#7#19'MethodsCheckListBox'#7
-  +'Caption'#6#21'AbstractMethodsDialog'#12'ClientHeight'#3'X'#1#11'ClientWidth'
-  +#3'E'#2#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#0#6'TLab'
-  +'el'#9'NoteLabel'#6'Height'#2#20#5'Width'#3'E'#2#5'Align'#7#5'alTop'#7'Capti'
-  +'on'#6#9'NoteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGroupBox'#15'Meth'
-  +'odsGroupBox'#6'Height'#3#18#1#3'Top'#2#20#5'Width'#3'E'#2#5'Align'#7#8'alCl'
-  +'ient'#7'Caption'#6#15'MethodsGroupBox'#12'ClientHeight'#3#255#0#11'ClientWi'
-  +'dth'#3'A'#2#8'TabOrder'#2#0#0#13'TCheckListBox'#19'MethodsCheckListBox'#24
-  +'AnchorSideBottom.Control'#7#15'SelectAllButton'#6'Height'#3#214#0#5'Width'#3
-  +'A'#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo'
-  +'ttom'#0#12'OnClickCheck'#7#29'MethodsCheckListBoxClickCheck'#8'TabOrder'#2#0
-  +#8'TopIndex'#2#255#0#0#7'TButton'#15'SelectAllButton'#22'AnchorSideLeft.Cont'
-  +'rol'#7#15'MethodsGroupBox'#24'AnchorSideBottom.Control'#7#15'MethodsGroupBo'
-  +'x'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'To'
-  +'p'#3#220#0#5'Width'#2'n'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'SelectAllButton'#7'OnClick'#7
-  +#20'SelectAllButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#16'SelectNoneButton'
-  +#22'AnchorSideLeft.Control'#7#15'SelectAllButton'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#24'AnchorSideBottom.Control'#7#15'MethodsGroupBox'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Height'#2#29#3'Top'#3#220#0#5'Wi'
-  +'dth'#3#129#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderS'
-  +'pacing.Around'#2#6#7'Caption'#6#16'SelectNoneButton'#7'OnClick'#7#21'Select'
-  +'NoneButtonClick'#8'TabOrder'#2#2#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'
-  +#3'Top'#3'&'#1#5'Width'#3'E'#2#5'Align'#7#8'alBottom'#10'BevelOuter'#7#6'bvN'
-  +'one'#12'ClientHeight'#2'2'#11'ClientWidth'#3'E'#2#8'TabOrder'#2#1#0#7'TBitB'
-  +'tn'#12'CancelBitBtn'#4'Left'#3#241#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'N'
-  +#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9
-  +#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyph'
-  +'s'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#14'AddFirstBitBtn'#4'Left'#3'S'#1#6'H'
-  +'eight'#2'&'#3'Top'#2#6#5'Width'#2';'#5'Align'#7#7'alRight'#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#4'&Yes'#7'Default'#9#4'Kind'#7#5'bkY'
-  +'es'#11'ModalResult'#2#6#9'NumGlyphs'#2#0#7'OnClick'#7#19'AddFirstBitBtnClic'
-  +'k'#8'TabOrder'#2#1#0#0#7'TBitBtn'#12'AddAllBitBtn'#4'Left'#3#148#1#6'Height'
-  +#2'&'#3'Top'#2#6#5'Width'#2'W'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Border'
-  +'Spacing.Around'#2#6#7'Caption'#6#11'Yes to &All'#4'Kind'#7#10'bkYesToAll'#11
-  +'ModalResult'#2#10#9'NumGlyphs'#2#0#7'OnClick'#7#17'AddAllBitBtnClick'#8'Tab'
-  +'Order'#2#2#0#0#0#0
+  +'Height'#3'X'#1#3'Top'#3'#'#1#5'Width'#3'E'#2#13'ActiveControl'#7#19'Methods'
+  +'CheckListBox'#7'Caption'#6#21'AbstractMethodsDialog'#12'ClientHeight'#3'X'#1
+  +#11'ClientWidth'#3'E'#2#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormD'
+  +'estroy'#10'ParentFont'#8#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#9'NoteLabel'
+  +#6'Height'#2#14#5'Width'#3'E'#2#5'Align'#7#5'alTop'#7'Caption'#6#9'NoteLabel'
+  +#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGroupBox'#15'MethodsGroupBox'#6'Heig'
+  +'ht'#3#24#1#3'Top'#2#14#5'Width'#3'E'#2#5'Align'#7#8'alClient'#7'Caption'#6
+  +#15'MethodsGroupBox'#12'ClientHeight'#3#6#1#11'ClientWidth'#3'A'#2#8'TabOrde'
+  +'r'#2#0#0#13'TCheckListBox'#19'MethodsCheckListBox'#24'AnchorSideBottom.Cont'
+  +'rol'#7#15'SelectAllButton'#6'Height'#3#227#0#5'Width'#3'A'#2#5'Align'#7#5'a'
+  +'lTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#12'OnClickC'
+  +'heck'#7#29'MethodsCheckListBoxClickCheck'#8'TabOrder'#2#0#0#0#7'TButton'#15
+  +'SelectAllButton'#22'AnchorSideLeft.Control'#7#15'MethodsGroupBox'#24'Anchor'
+  +'SideBottom.Control'#7#15'MethodsGroupBox'#21'AnchorSideBottom.Side'#7#9'asr'
+  +'Bottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#233#0#5'Width'#2'b'#7'Anchors'
+  +#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
+  +'tion'#6#15'SelectAllButton'#7'OnClick'#7#20'SelectAllButtonClick'#8'TabOrde'
+  +'r'#2#1#0#0#7'TButton'#16'SelectNoneButton'#22'AnchorSideLeft.Control'#7#15
+  +'SelectAllButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom'
+  +'.Control'#7#15'MethodsGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#2'n'#6'Height'#2#23#3'Top'#3#233#0#5'Width'#2'p'#7'Anchors'#11#6'akLe'
+  +'ft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16
+  +'SelectNoneButton'#7'OnClick'#7#21'SelectNoneButtonClick'#8'TabOrder'#2#2#0#0
+  +#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'#3'&'#1#5'Width'#3'E'#2#5'Alig'
+  +'n'#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'#11'Client'
+  +'Width'#3'E'#2#8'TabOrder'#2#1#0#7'TBitBtn'#12'CancelBitBtn'#4'Left'#3#5#2#6
+  +'Height'#2'&'#3'Top'#2#6#5'Width'#2':'#5'Align'#7#7'alRight'#8'AutoSize'#9#20
+  +'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bk'
+  +'Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'
+  +#14'AddFirstBitBtn'#4'Left'#3#136#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'+'#5
+  +'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#4'&Yes'#7'Default'#9#4'Kind'#7#5'bkYes'#11'ModalResult'#2#6#9'NumGlyphs'#2#0
+  +#7'OnClick'#7#19'AddFirstBitBtnClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#12'AddA'
+  +'llBitBtn'#4'Left'#3#185#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'F'#5'Align'#7
+  +#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'Yes t'
+  +'o &All'#4'Kind'#7#10'bkYesToAll'#11'ModalResult'#2#10#9'NumGlyphs'#2#0#7'On'
+  +'Click'#7#17'AddAllBitBtnClick'#8'TabOrder'#2#2#0#0#0#0
 ]);
diff --git a/ide/abstractsmethodsdlg.pas b/ide/abstractsmethodsdlg.pas
index 7b0bc37c01..dd76544562 100644
--- a/ide/abstractsmethodsdlg.pas
+++ b/ide/abstractsmethodsdlg.pas
@@ -163,6 +163,9 @@ begin
   SelectNoneButton.Caption:=lisSAMSelectNone;
   SelectAllButton.Caption:=lisMenuSelectAll;
   MethodsGroupBox.Caption:=lisSAMAbstractMethodsNotYetOverridden;
+  CancelBitBtn.LoadGlyphFromLazarusResource('btn_cancel');
+  AddFirstBitBtn.LoadGlyphFromLazarusResource('btn_ok');
+  AddAllBitBtn.LoadGlyphFromLazarusResource('btn_all');
 end;
 
 procedure TAbstractMethodsDialog.AddFirstBitBtnClick(Sender: TObject);
diff --git a/ide/addtoprojectdlg.lfm b/ide/addtoprojectdlg.lfm
index fc60d62edb..96be94a19e 100644
--- a/ide/addtoprojectdlg.lfm
+++ b/ide/addtoprojectdlg.lfm
@@ -43,28 +43,37 @@ object AddToProjectDialog: TAddToProjectDialog
         MultiSelect = True
         TabOrder = 0
       end
-      object AddFileButton: TButton
+      object AddFileButton: TBitBtn
         AnchorSideRight.Control = CancelAddFileButton
-        Left = 259
+        AnchorSideBottom.Control = AddEditorFilePage
+        AnchorSideBottom.Side = asrBottom
+        Left = 262
         Height = 23
         Top = 245
         Width = 93
         Anchors = [akRight, akBottom]
         AutoSize = True
-        BorderSpacing.Right = 6
+        BorderSpacing.Around = 6
         Caption = 'AddFileButton'
+        NumGlyphs = 0
         OnClick = AddFileButtonClick
         TabOrder = 1
       end
-      object CancelAddFileButton: TButton
-        Left = 358
+      object CancelAddFileButton: TBitBtn
+        AnchorSideRight.Control = AddEditorFilePage
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = AddEditorFilePage
+        AnchorSideBottom.Side = asrBottom
+        Left = 361
         Height = 23
         Top = 245
         Width = 125
         Anchors = [akRight, akBottom]
         AutoSize = True
+        BorderSpacing.Around = 6
         Caption = 'CancelAddFileButton'
         ModalResult = 2
+        NumGlyphs = 0
         TabOrder = 2
       end
     end
@@ -96,30 +105,6 @@ object AddToProjectDialog: TAddToProjectDialog
         Caption = 'DependMaxVersionLabel'
         ParentColor = False
       end
-      object CancelDependButton: TButton
-        Left = 359
-        Height = 23
-        Top = 249
-        Width = 127
-        Anchors = [akRight, akBottom]
-        AutoSize = True
-        Caption = 'CancelDependButton'
-        ModalResult = 2
-        TabOrder = 0
-      end
-      object NewDependButton: TButton
-        AnchorSideRight.Control = CancelDependButton
-        Left = 237
-        Height = 23
-        Top = 249
-        Width = 116
-        Anchors = [akRight, akBottom]
-        AutoSize = True
-        BorderSpacing.Right = 6
-        Caption = 'NewDependButton'
-        OnClick = NewDependButtonClick
-        TabOrder = 1
-      end
       object DependPkgNameComboBox: TComboBox
         Left = 218
         Height = 21
@@ -129,7 +114,7 @@ object AddToProjectDialog: TAddToProjectDialog
         AutoComplete = True
         AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
         ItemHeight = 13
-        TabOrder = 2
+        TabOrder = 0
         Text = 'DependPkgNameComboBox'
       end
       object DependMinVersionEdit: TEdit
@@ -138,7 +123,7 @@ object AddToProjectDialog: TAddToProjectDialog
         Top = 44
         Width = 268
         Anchors = [akTop, akLeft, akRight]
-        TabOrder = 3
+        TabOrder = 1
         Text = 'DependMinVersionEdit'
       end
       object DependMaxVersionEdit: TEdit
@@ -147,9 +132,42 @@ object AddToProjectDialog: TAddToProjectDialog
         Top = 73
         Width = 268
         Anchors = [akTop, akLeft, akRight]
-        TabOrder = 4
+        TabOrder = 2
         Text = 'DependMaxVersionEdit'
       end
+      object NewDependButton: TBitBtn
+        AnchorSideRight.Control = CancelDependButton
+        AnchorSideBottom.Control = NewDependPage
+        AnchorSideBottom.Side = asrBottom
+        Left = 237
+        Height = 23
+        Top = 245
+        Width = 116
+        Anchors = [akRight, akBottom]
+        AutoSize = True
+        BorderSpacing.Around = 6
+        Caption = 'NewDependButton'
+        NumGlyphs = 0
+        OnClick = NewDependButtonClick
+        TabOrder = 3
+      end
+      object CancelDependButton: TBitBtn
+        AnchorSideRight.Control = NewDependPage
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = NewDependPage
+        AnchorSideBottom.Side = asrBottom
+        Left = 359
+        Height = 23
+        Top = 245
+        Width = 127
+        Anchors = [akRight, akBottom]
+        AutoSize = True
+        BorderSpacing.Around = 6
+        Caption = 'CancelDependButton'
+        ModalResult = 2
+        NumGlyphs = 0
+        TabOrder = 4
+      end
     end
     object AddFilesPage: TPage
       Caption = 'AddFilesPage'
diff --git a/ide/addtoprojectdlg.lrs b/ide/addtoprojectdlg.lrs
index 378cdce5c2..fb066e715d 100644
--- a/ide/addtoprojectdlg.lrs
+++ b/ide/addtoprojectdlg.lrs
@@ -14,59 +14,68 @@ LazarusResources.Add('TAddToProjectDialog','FORMDATA',[
   +'Caption'#6#12'AddFileLabel'#11'ParentColor'#8#0#0#8'TListBox'#14'AddFileLis'
   +'tBox'#4'Left'#2#6#6'Height'#3#206#0#3'Top'#2#26#5'Width'#3#224#1#5'Align'#7
   +#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'Borde'
-  +'rSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0#0#0#7'TButton'#13'Ad'
-  +'dFileButton'#23'AnchorSideRight.Control'#7#19'CancelAddFileButton'#4'Left'#3
-  +#3#1#6'Height'#2#23#3'Top'#3#245#0#5'Width'#2']'#7'Anchors'#11#7'akRight'#8
-  +'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'AddFi'
-  +'leButton'#7'OnClick'#7#18'AddFileButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'
-  +#19'CancelAddFileButton'#4'Left'#3'f'#1#6'Height'#2#23#3'Top'#3#245#0#5'Widt'
-  +'h'#2'}'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#19
-  +'CancelAddFileButton'#11'ModalResult'#2#2#8'TabOrder'#2#2#0#0#0#5'TPage'#13
-  +'NewDependPage'#7'Caption'#6#13'NewDependPage'#11'ClientWidth'#3#236#1#12'Cl'
-  +'ientHeight'#3#18#1#0#6'TLabel'#18'DependPkgNameLabel'#4'Left'#2#8#6'Height'
-  +#2#14#3'Top'#2#19#5'Width'#2'k'#7'Caption'#6#18'DependPkgNameLabel'#11'Paren'
-  +'tColor'#8#0#0#6'TLabel'#21'DependMinVersionLabel'#4'Left'#2#8#6'Height'#2#14
-  +#3'Top'#2'/'#5'Width'#2'r'#7'Caption'#6#21'DependMinVersionLabel'#11'ParentC'
-  +'olor'#8#0#0#6'TLabel'#21'DependMaxVersionLabel'#4'Left'#2#8#6'Height'#2#14#3
-  +'Top'#2'L'#5'Width'#2'v'#7'Caption'#6#21'DependMaxVersionLabel'#11'ParentCol'
-  +'or'#8#0#0#7'TButton'#18'CancelDependButton'#4'Left'#3'g'#1#6'Height'#2#23#3
-  +'Top'#3#249#0#5'Width'#2''#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSiz'
-  +'e'#9#7'Caption'#6#18'CancelDependButton'#11'ModalResult'#2#2#8'TabOrder'#2#0
-  +#0#0#7'TButton'#15'NewDependButton'#23'AnchorSideRight.Control'#7#18'CancelD'
-  +'ependButton'#4'Left'#3#237#0#6'Height'#2#23#3'Top'#3#249#0#5'Width'#2't'#7
-  +'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2
-  +#6#7'Caption'#6#15'NewDependButton'#7'OnClick'#7#20'NewDependButtonClick'#8
-  +'TabOrder'#2#1#0#0#9'TComboBox'#21'DependPkgNameComboBox'#4'Left'#3#218#0#6
-  +'Height'#2#21#3'Top'#2#14#5'Width'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#12'AutoComplete'#9#16'AutoCompleteText'#11#12'cbactEnabled'#22'c'
-  +'bactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#8'Tab'
-  +'Order'#2#2#4'Text'#6#21'DependPkgNameComboBox'#0#0#5'TEdit'#20'DependMinVer'
-  +'sionEdit'#4'Left'#3#218#0#6'Height'#2#23#3'Top'#2','#5'Width'#3#12#1#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#3#4'Text'#6#20'Depend'
-  +'MinVersionEdit'#0#0#5'TEdit'#20'DependMaxVersionEdit'#4'Left'#3#218#0#6'Hei'
-  +'ght'#2#23#3'Top'#2'I'#5'Width'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#8'TabOrder'#2#4#4'Text'#6#20'DependMaxVersionEdit'#0#0#0#5'TPage'
-  +#12'AddFilesPage'#7'Caption'#6#12'AddFilesPage'#11'ClientWidth'#3#236#1#12'C'
-  +'lientHeight'#3#18#1#0#9'TListView'#13'FilesListView'#4'Left'#2#6#6'Height'#3
-  +#226#0#3'Top'#2#6#5'Width'#3#224#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Columns'
-  +#14#0#11'MultiSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#12'OnSele'
-  +'ctItem'#7#23'FilesListViewSelectItem'#0#0#7'TButton'#17'FilesBrowseButton'#4
-  +'Left'#2#6#6'Height'#2#23#3'Top'#3#244#0#5'Width'#2'r'#7'Anchors'#11#6'akLef'
-  +'t'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#17'FilesBrowseButton'#7'OnClick'
-  +#7#22'FilesBrowseButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#18'FilesShorten'
-  +'Button'#22'AnchorSideLeft.Control'#7#17'FilesBrowseButton'#19'AnchorSideLef'
-  +'t.Side'#7#9'asrBottom'#4'Left'#2'~'#6'Height'#2#23#3'Top'#3#244#0#5'Width'#2
-  +'u'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Lef'
-  +'t'#2#6#7'Caption'#6#18'FilesShortenButton'#7'OnClick'#7#23'FilesShortenButt'
-  +'onClick'#8'TabOrder'#2#2#0#0#7'TButton'#17'FilesDeleteButton'#22'AnchorSide'
-  +'Left.Control'#7#18'FilesShortenButton'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#4'Left'#3#249#0#6'Height'#2#23#3'Top'#3#244#0#5'Width'#2'n'#7'Anchors'#11
-  +#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7'Caption'
-  +#6#17'FilesDeleteButton'#7'OnClick'#7#22'FilesDeleteButtonClick'#8'TabOrder'
-  +#2#3#0#0#7'TButton'#14'FilesAddButton'#22'AnchorSideLeft.Control'#7#17'Files'
-  ,'DeleteButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3'm'#1#6'Heigh'
-  +'t'#2#23#3'Top'#3#244#0#5'Width'#2'b'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
-  +'AutoSize'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#14'FilesAddButton'#7'On'
-  +'Click'#7#19'FilesAddButtonClick'#8'TabOrder'#2#4#0#0#0#0#0
+  +'rSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0#0#0#7'TBitBtn'#13'Ad'
+  +'dFileButton'#23'AnchorSideRight.Control'#7#19'CancelAddFileButton'#24'Ancho'
+  +'rSideBottom.Control'#7#17'AddEditorFilePage'#21'AnchorSideBottom.Side'#7#9
+  +'asrBottom'#4'Left'#3#6#1#6'Height'#2#23#3'Top'#3#245#0#5'Width'#2']'#7'Anch'
+  +'ors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#13'AddFileButton'#9'NumGlyphs'#2#0#7'OnClick'#7#18'AddFileButt'
+  +'onClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#19'CancelAddFileButton'#23'AnchorSi'
+  +'deRight.Control'#7#17'AddEditorFilePage'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#24'AnchorSideBottom.Control'#7#17'AddEditorFilePage'#21'AnchorSideBot'
+  +'tom.Side'#7#9'asrBottom'#4'Left'#3'i'#1#6'Height'#2#23#3'Top'#3#245#0#5'Wid'
+  +'th'#2'}'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpac'
+  +'ing.Around'#2#6#7'Caption'#6#19'CancelAddFileButton'#11'ModalResult'#2#2#9
+  +'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#0#5'TPage'#13'NewDependPage'#7'Caption'#6
+  +#13'NewDependPage'#11'ClientWidth'#3#236#1#12'ClientHeight'#3#18#1#0#6'TLabe'
+  +'l'#18'DependPkgNameLabel'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#19#5'Width'#2
+  +'k'#7'Caption'#6#18'DependPkgNameLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'D'
+  +'ependMinVersionLabel'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'/'#5'Width'#2'r'#7
+  +'Caption'#6#21'DependMinVersionLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'Dep'
+  +'endMaxVersionLabel'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'L'#5'Width'#2'v'#7
+  +'Caption'#6#21'DependMaxVersionLabel'#11'ParentColor'#8#0#0#9'TComboBox'#21
+  +'DependPkgNameComboBox'#4'Left'#3#218#0#6'Height'#2#21#3'Top'#2#14#5'Width'#3
+  +#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#9#16'Au'
+  +'toCompleteText'#11#12'cbactEnabled'#22'cbactEndOfLineComplete'#20'cbactSear'
+  +'chAscending'#0#10'ItemHeight'#2#13#8'TabOrder'#2#0#4'Text'#6#21'DependPkgNa'
+  +'meComboBox'#0#0#5'TEdit'#20'DependMinVersionEdit'#4'Left'#3#218#0#6'Height'
+  +#2#23#3'Top'#2','#5'Width'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#0#8'TabOrder'#2#1#4'Text'#6#20'DependMinVersionEdit'#0#0#5'TEdit'#20'Depend'
+  +'MaxVersionEdit'#4'Left'#3#218#0#6'Height'#2#23#3'Top'#2'I'#5'Width'#3#12#1#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#2#4'Text'#6#20'De'
+  +'pendMaxVersionEdit'#0#0#7'TBitBtn'#15'NewDependButton'#23'AnchorSideRight.C'
+  +'ontrol'#7#18'CancelDependButton'#24'AnchorSideBottom.Control'#7#13'NewDepen'
+  +'dPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#237#0#6'Height'#2
+  +#23#3'Top'#3#245#0#5'Width'#2't'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Au'
+  +'toSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'NewDependButton'#9'N'
+  +'umGlyphs'#2#0#7'OnClick'#7#20'NewDependButtonClick'#8'TabOrder'#2#3#0#0#7'T'
+  +'BitBtn'#18'CancelDependButton'#23'AnchorSideRight.Control'#7#13'NewDependPa'
+  +'ge'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7
+  +#13'NewDependPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'g'#1#6
+  +'Height'#2#23#3'Top'#3#245#0#5'Width'#2''#7'Anchors'#11#7'akRight'#8'akBott'
+  +'om'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'CancelDepe'
+  +'ndButton'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#4#0#0#0#5'TPag'
+  +'e'#12'AddFilesPage'#7'Caption'#6#12'AddFilesPage'#11'ClientWidth'#3#236#1#12
+  +'ClientHeight'#3#18#1#0#9'TListView'#13'FilesListView'#4'Left'#2#6#6'Height'
+  +#3#226#0#3'Top'#2#6#5'Width'#3#224#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akT'
+  +'op'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Colum'
+  +'ns'#14#0#11'MultiSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#12'On'
+  +'SelectItem'#7#23'FilesListViewSelectItem'#0#0#7'TButton'#17'FilesBrowseButt'
+  +'on'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#244#0#5'Width'#2'r'#7'Anchors'#11#6
+  +'akLeft'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#17'FilesBrowseButton'#7'On'
+  +'Click'#7#22'FilesBrowseButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#18'Files'
+  +'ShortenButton'#22'AnchorSideLeft.Control'#7#17'FilesBrowseButton'#19'Anchor'
+  ,'SideLeft.Side'#7#9'asrBottom'#4'Left'#2'~'#6'Height'#2#23#3'Top'#3#244#0#5
+  +'Width'#2'u'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSp'
+  +'acing.Left'#2#6#7'Caption'#6#18'FilesShortenButton'#7'OnClick'#7#23'FilesSh'
+  +'ortenButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#17'FilesDeleteButton'#22'A'
+  +'nchorSideLeft.Control'#7#18'FilesShortenButton'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#4'Left'#3#249#0#6'Height'#2#23#3'Top'#3#244#0#5'Width'#2'n'#7'An'
+  +'chors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7
+  +'Caption'#6#17'FilesDeleteButton'#7'OnClick'#7#22'FilesDeleteButtonClick'#8
+  +'TabOrder'#2#3#0#0#7'TButton'#14'FilesAddButton'#22'AnchorSideLeft.Control'#7
+  +#17'FilesDeleteButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3'm'#1
+  +#6'Height'#2#23#3'Top'#3#244#0#5'Width'#2'b'#7'Anchors'#11#6'akLeft'#8'akBot'
+  +'tom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#14'FilesAddBut'
+  +'ton'#7'OnClick'#7#19'FilesAddButtonClick'#8'TabOrder'#2#4#0#0#0#0#0
 ]);
diff --git a/ide/addtoprojectdlg.pas b/ide/addtoprojectdlg.pas
index 6e54bf77db..342ced43fa 100644
--- a/ide/addtoprojectdlg.pas
+++ b/ide/addtoprojectdlg.pas
@@ -65,8 +65,8 @@ type
     // add file page
     AddFileLabel: TLabel;
     AddFileListBox: TListBox;
-    AddFileButton: TButton;
-    CancelAddFileButton: TButton;
+    AddFileButton: TBitBtn;
+    CancelAddFileButton: TBitBtn;
     // new required package
     DependPkgNameLabel: TLabel;
     DependPkgNameComboBox: TComboBox;
@@ -74,8 +74,8 @@ type
     DependMinVersionEdit: TEdit;
     DependMaxVersionLabel: TLabel;
     DependMaxVersionEdit: TEdit;
-    NewDependButton: TButton;
-    CancelDependButton: TButton;
+    NewDependButton: TBitBtn;
+    CancelDependButton: TBitBtn;
     // add files page
     FilesListView: TListView;
     FilesBrowseButton: TButton;
@@ -386,6 +386,11 @@ procedure TAddToProjectDialog.SetupComponents;
 begin
   NoteBook.PageIndex:=0;
 
+  AddFileButton.LoadGlyphFromLazarusResource('btn_ok');
+  CancelAddFileButton.LoadGlyphFromLazarusResource('btn_cancel');
+  CancelDependButton.LoadGlyphFromLazarusResource('btn_cancel');
+  NewDependButton.LoadGlyphFromLazarusResource('btn_ok');
+
   SetupAddEditorFilePage(0);
   SetupAddRequirementPage(1);
   SetupAddFilesPage(2);
diff --git a/ide/buildfiledlg.lfm b/ide/buildfiledlg.lfm
index b8e6076658..b3fa4017d4 100644
--- a/ide/buildfiledlg.lfm
+++ b/ide/buildfiledlg.lfm
@@ -11,37 +11,38 @@ object BuildFileDialog: TBuildFileDialog
   KeyPreview = True
   OnCreate = BuildFileDialogCREATE
   OnKeyDown = BuildFileDialogKEYDOWN
+  ParentFont = False
   Position = poScreenCenter
   LCLVersion = '0.9.25'
   object Notebook1: TNotebook
     AnchorSideBottom.Control = HelpButton
-    Height = 369
+    Height = 380
     Width = 451
     Align = alClient
     PageIndex = 1
     TabOrder = 0
     object GeneralPage: TPage
       Caption = 'Options'
-      ClientWidth = 449
-      ClientHeight = 342
+      ClientWidth = 443
+      ClientHeight = 353
       object WhenFileIsActiveGroupbox: TGroupBox
         Left = 6
-        Height = 81
+        Height = 74
         Top = 6
-        Width = 437
+        Width = 431
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'When this file is active in source editor ...'
-        ClientHeight = 62
-        ClientWidth = 433
+        ClientHeight = 56
+        ClientWidth = 427
         ParentCtl3D = False
         TabOrder = 0
         object OverrideBuildProjectCheckbox: TCheckBox
           Left = 6
-          Height = 22
+          Height = 19
           Top = 6
-          Width = 421
+          Width = 415
           Align = alTop
           BorderSpacing.Around = 6
           Caption = 'On build project execute the Build File command instead'
@@ -49,9 +50,9 @@ object BuildFileDialog: TBuildFileDialog
         end
         object OverrideRunProjectCheckbox: TCheckBox
           Left = 6
-          Height = 22
-          Top = 34
-          Width = 421
+          Height = 19
+          Top = 31
+          Width = 415
           Align = alTop
           BorderSpacing.Around = 6
           Caption = 'On run project execute the Run File command instead'
@@ -61,25 +62,25 @@ object BuildFileDialog: TBuildFileDialog
     end
     object BuildPage: TPage
       Caption = 'Build'
-      ClientWidth = 449
-      ClientHeight = 342
+      ClientWidth = 443
+      ClientHeight = 354
       object BuildCommandGroupbox: TGroupBox
         Left = 6
         Height = 80
-        Top = 72
-        Width = 437
+        Top = 67
+        Width = 431
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Build Command'
-        ClientHeight = 61
-        ClientWidth = 433
+        ClientHeight = 62
+        ClientWidth = 427
         ParentCtl3D = False
         TabOrder = 0
         object BuildCommandMemo: TMemo
           Left = 6
-          Height = 49
+          Height = 50
           Top = 6
-          Width = 421
+          Width = 415
           Align = alClient
           BorderSpacing.Around = 6
           Lines.Strings = (
@@ -90,9 +91,9 @@ object BuildFileDialog: TBuildFileDialog
       end
       object BuildScanForFPCMsgCheckbox: TCheckBox
         Left = 6
-        Height = 22
-        Top = 158
-        Width = 437
+        Height = 19
+        Top = 153
+        Width = 431
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Scan for FPC messages'
@@ -100,9 +101,9 @@ object BuildFileDialog: TBuildFileDialog
       end
       object BuildScanForMakeMsgCheckbox: TCheckBox
         Left = 6
-        Height = 22
-        Top = 186
-        Width = 437
+        Height = 19
+        Top = 178
+        Width = 431
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Scan for Make messages'
@@ -110,15 +111,15 @@ object BuildFileDialog: TBuildFileDialog
       end
       object BuildWorkingDirGroupbox: TGroupBox
         Left = 6
-        Height = 60
+        Height = 55
         Top = 6
-        Width = 437
+        Width = 431
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Working directory (Leave empty for file path)'
-        ClientHeight = 41
-        ClientWidth = 433
+        ClientHeight = 37
+        ClientWidth = 427
         ParentCtl3D = False
         TabOrder = 3
         object BuildWorkDirCombobox: TComboBox
@@ -126,13 +127,12 @@ object BuildFileDialog: TBuildFileDialog
           AnchorSideTop.Control = BuildWorkingDirGroupbox
           AnchorSideRight.Control = BuildBrowseWorkDirButton
           Left = 6
-          Height = 29
+          Height = 21
           Top = 6
-          Width = 390
+          Width = 384
           Anchors = [akTop, akLeft, akRight]
-          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
           BorderSpacing.Around = 6
-          MaxLength = 0
+          ItemHeight = 13
           ParentCtl3D = False
           TabOrder = 0
           Text = 'BuildWorkDirCombobox'
@@ -141,7 +141,7 @@ object BuildFileDialog: TBuildFileDialog
           AnchorSideTop.Control = BuildWorkingDirGroupbox
           AnchorSideRight.Control = BuildWorkingDirGroupbox
           AnchorSideRight.Side = asrBottom
-          Left = 402
+          Left = 396
           Height = 25
           Top = 6
           Width = 25
@@ -155,13 +155,13 @@ object BuildFileDialog: TBuildFileDialog
     end
     object RunPage: TPage
       Caption = 'Run'
-      ClientWidth = 449
-      ClientHeight = 342
+      ClientWidth = 443
+      ClientHeight = 353
       object AlwaysCompileFirstCheckbox: TCheckBox
         Left = 6
-        Height = 22
+        Height = 19
         Top = 6
-        Width = 437
+        Width = 431
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Always Build before Run'
@@ -170,20 +170,20 @@ object BuildFileDialog: TBuildFileDialog
       object RunCommandGroupbox: TGroupBox
         Left = 6
         Height = 98
-        Top = 100
-        Width = 437
+        Top = 90
+        Width = 431
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Run Command'
-        ClientHeight = 79
-        ClientWidth = 433
+        ClientHeight = 80
+        ClientWidth = 427
         ParentCtl3D = False
         TabOrder = 1
         object RunCommandMemo: TMemo
           Left = 6
-          Height = 67
+          Height = 68
           Top = 6
-          Width = 421
+          Width = 415
           Align = alClient
           BorderSpacing.Around = 6
           Lines.Strings = (
@@ -194,15 +194,15 @@ object BuildFileDialog: TBuildFileDialog
       end
       object RunWorkDirGroupbox: TGroupBox
         Left = 6
-        Height = 60
-        Top = 34
-        Width = 437
+        Height = 53
+        Top = 31
+        Width = 431
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Working Directory (Leave empty for file path)'
-        ClientHeight = 41
-        ClientWidth = 433
+        ClientHeight = 35
+        ClientWidth = 427
         ParentCtl3D = False
         TabOrder = 2
         object RunWorkDirCombobox: TComboBox
@@ -210,21 +210,20 @@ object BuildFileDialog: TBuildFileDialog
           AnchorSideTop.Control = RunWorkDirGroupbox
           AnchorSideRight.Control = RunBrowseWorkDirButton
           Left = 6
-          Height = 29
+          Height = 21
           Top = 6
-          Width = 390
+          Width = 384
           Anchors = [akTop, akLeft, akRight]
-          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
           BorderSpacing.Around = 6
-          MaxLength = 0
+          ItemHeight = 13
           ParentCtl3D = False
           TabOrder = 0
           Text = 'RunWorkDirCombobox'
         end
         object RunBrowseWorkDirButton: TButton
           AnchorSideRight.Side = asrBottom
-          Left = 402
-          Height = 29
+          Left = 396
+          Height = 23
           Top = 6
           Width = 25
           HelpType = htKeyword
@@ -238,22 +237,22 @@ object BuildFileDialog: TBuildFileDialog
     end
   end
   object BtnPanel: TPanel
-    Height = 48
-    Top = 369
+    Height = 37
+    Top = 380
     Width = 451
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 48
+    ClientHeight = 37
     ClientWidth = 451
     TabOrder = 1
     object CancelButton: TBitBtn
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Side = asrBottom
-      Left = 367
-      Height = 36
+      Left = 370
+      Height = 25
       Top = 6
-      Width = 78
+      Width = 75
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
@@ -268,8 +267,8 @@ object BuildFileDialog: TBuildFileDialog
     end
     object OKButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 286
-      Height = 36
+      Left = 289
+      Height = 25
       Top = 6
       Width = 75
       Align = alRight
@@ -288,7 +287,7 @@ object BuildFileDialog: TBuildFileDialog
     object HelpButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 36
+      Height = 25
       Top = 6
       Width = 75
       Align = alLeft
diff --git a/ide/buildfiledlg.lrs b/ide/buildfiledlg.lrs
index 5b626ba19f..091dda144e 100644
--- a/ide/buildfiledlg.lrs
+++ b/ide/buildfiledlg.lrs
@@ -5,91 +5,90 @@ LazarusResources.Add('TBuildFileDialog','FORMDATA',[
   +#1#3'Top'#3#196#0#5'Width'#3#195#1#13'ActiveControl'#7#9'Notebook1'#11'Borde'
   +'rIcons'#11#12'biSystemMenu'#0#7'Caption'#6#15'BuildFileDialog'#12'ClientHei'
   +'ght'#3#161#1#11'ClientWidth'#3#195#1#10'KeyPreview'#9#8'OnCreate'#7#21'Buil'
-  +'dFileDialogCREATE'#9'OnKeyDown'#7#22'BuildFileDialogKEYDOWN'#8'Position'#7
-  +#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TNotebook'#9'Notebook1'#24
-  +'AnchorSideBottom.Control'#7#10'HelpButton'#6'Height'#3'q'#1#5'Width'#3#195#1
-  +#5'Align'#7#8'alClient'#9'PageIndex'#2#1#8'TabOrder'#2#0#0#5'TPage'#11'Gener'
-  +'alPage'#7'Caption'#6#7'Options'#11'ClientWidth'#3#193#1#12'ClientHeight'#3
-  +'V'#1#0#9'TGroupBox'#24'WhenFileIsActiveGroupbox'#4'Left'#2#6#6'Height'#2'Q'
-  +#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpac'
-  +'ing.Around'#2#6#7'Caption'#6'-When this file is active in source editor ...'
-  +#12'ClientHeight'#2'>'#11'ClientWidth'#3#177#1#11'ParentCtl3D'#8#8'TabOrder'
-  +#2#0#0#9'TCheckBox'#28'OverrideBuildProjectCheckbox'#4'Left'#2#6#6'Height'#2
-  +#22#3'Top'#2#6#5'Width'#3#165#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6'7On build project execute the Build File command instead'#8
-  +'TabOrder'#2#0#0#0#9'TCheckBox'#26'OverrideRunProjectCheckbox'#4'Left'#2#6#6
-  +'Height'#2#22#3'Top'#2'"'#5'Width'#3#165#1#5'Align'#7#5'alTop'#20'BorderSpac'
-  +'ing.Around'#2#6#7'Caption'#6'3On run project execute the Run File command i'
-  +'nstead'#8'TabOrder'#2#1#0#0#0#0#5'TPage'#9'BuildPage'#7'Caption'#6#5'Build'
-  +#11'ClientWidth'#3#193#1#12'ClientHeight'#3'V'#1#0#9'TGroupBox'#20'BuildComm'
-  +'andGroupbox'#4'Left'#2#6#6'Height'#2'P'#3'Top'#2'H'#5'Width'#3#181#1#5'Alig'
-  +'n'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'Build Command'#12
-  +'ClientHeight'#2'='#11'ClientWidth'#3#177#1#11'ParentCtl3D'#8#8'TabOrder'#2#0
-  +#0#5'TMemo'#16'BuildCommandMemo'#4'Left'#2#6#6'Height'#2'1'#3'Top'#2#6#5'Wid'
-  +'th'#3#165#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#13'Lines.St'
-  +'rings'#1#6#18'CompileCommandMemo'#0#8'TabOrder'#2#0#0#0#0#9'TCheckBox'#26'B'
-  +'uildScanForFPCMsgCheckbox'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#158#0#5'Widt'
-  +'h'#3#181#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#21
-  +'Scan for FPC messages'#8'TabOrder'#2#1#0#0#9'TCheckBox'#27'BuildScanForMake'
-  +'MsgCheckbox'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#186#0#5'Width'#3#181#1#5'A'
-  +'lign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'Scan for Make'
-  +' messages'#8'TabOrder'#2#2#0#0#9'TGroupBox'#23'BuildWorkingDirGroupbox'#4'L'
-  +'eft'#2#6#6'Height'#2'<'#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#8'A'
-  +'utoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6'-Working directory (Le'
-  +'ave empty for file path)'#12'ClientHeight'#2')'#11'ClientWidth'#3#177#1#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#3#0#9'TComboBox'#20'BuildWorkDirCombobox'#22'A'
-  +'nchorSideLeft.Control'#7#23'BuildWorkingDirGroupbox'#21'AnchorSideTop.Contr'
-  +'ol'#7#23'BuildWorkingDirGroupbox'#23'AnchorSideRight.Control'#7#24'BuildBro'
-  +'wseWorkDirButton'#4'Left'#2#6#6'Height'#2#29#3'Top'#2#6#5'Width'#3#134#1#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbac'
-  +'tEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6
-  +#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#20'BuildWorkDi'
-  +'rCombobox'#0#0#7'TButton'#24'BuildBrowseWorkDirButton'#21'AnchorSideTop.Con'
-  +'trol'#7#23'BuildWorkingDirGroupbox'#23'AnchorSideRight.Control'#7#23'BuildW'
-  +'orkingDirGroupbox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#146#1#6
-  +'Height'#2#25#3'Top'#2#6#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#3'...'#7'OnClick'#7#29'BuildBrowseWo'
-  +'rkDirButtonCLICK'#8'TabOrder'#2#1#0#0#0#0#5'TPage'#7'RunPage'#7'Caption'#6#3
-  +'Run'#11'ClientWidth'#3#193#1#12'ClientHeight'#3'V'#1#0#9'TCheckBox'#26'Alwa'
-  +'ysCompileFirstCheckbox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#181
-  +#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'Always B'
-  +'uild before Run'#8'TabOrder'#2#0#0#0#9'TGroupBox'#18'RunCommandGroupbox'#4
-  +'Left'#2#6#6'Height'#2'b'#3'Top'#2'd'#5'Width'#3#181#1#5'Align'#7#5'alTop'#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#11'Run Command'#12'ClientHeight'#2'O'
-  +#11'ClientWidth'#3#177#1#11'ParentCtl3D'#8#8'TabOrder'#2#1#0#5'TMemo'#14'Run'
-  +'CommandMemo'#4'Left'#2#6#6'Height'#2'C'#3'Top'#2#6#5'Width'#3#165#1#5'Align'
-  +#7#8'alClient'#20'BorderSpacing.Around'#2#6#13'Lines.Strings'#1#6#18'Compile'
-  +'CommandMemo'#0#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#18'RunWorkDirGroupbox'#4
-  +'Left'#2#6#6'Height'#2'<'#3'Top'#2'"'#5'Width'#3#181#1#5'Align'#7#5'alTop'#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6'-Working Directory (L'
-  +'eave empty for file path)'#12'ClientHeight'#2')'#11'ClientWidth'#3#177#1#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#2#0#9'TComboBox'#18'RunWorkDirCombobox'#22'Anc'
-  +'horSideLeft.Control'#7#18'RunWorkDirGroupbox'#21'AnchorSideTop.Control'#7#18
-  ,'RunWorkDirGroupbox'#23'AnchorSideRight.Control'#7#22'RunBrowseWorkDirButton'
-  +#4'Left'#2#6#6'Height'#2#29#3'Top'#2#6#5'Width'#3#134#1#7'Anchors'#11#5'akTo'
-  +'p'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'
-  +#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#18'RunWorkDirCombobox'#0#0#7'TButt'
-  +'on'#22'RunBrowseWorkDirButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#3#146#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2#25#8'HelpType'#7#9'htKeywo'
-  +'rd'#5'Align'#7#7'alRight'#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'...'#7
-  +'OnClick'#7#29'BuildBrowseWorkDirButtonCLICK'#8'TabOrder'#2#1#0#0#0#0#0#6'TP'
-  +'anel'#8'BtnPanel'#6'Height'#2'0'#3'Top'#3'q'#1#5'Width'#3#195#1#5'Align'#7#8
-  +'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'0'#11
-  +'ClientWidth'#3#195#1#8'TabOrder'#2#1#0#7'TBitBtn'#12'CancelButton'#20'Ancho'
-  +'rSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#3'o'#1#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'N'#5'Align'#7#7'alRight'#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'
-  +#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bk'
-  +'Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'
-  +#8'OKButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#30#1#6'Heigh'
-  +'t'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20
-  +'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2
-  +#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonCLICK'#8'TabOrder'#2#1#0#0#7'TBi'
-  +'tBtn'#10'HelpButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'#2
-  +#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnC'
-  +'lick'#7#15'HelpButtonClick'#8'TabOrder'#2#2#0#0#0#0
+  +'dFileDialogCREATE'#9'OnKeyDown'#7#22'BuildFileDialogKEYDOWN'#10'ParentFont'
+  +#8#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TNotebook'
+  +#9'Notebook1'#24'AnchorSideBottom.Control'#7#10'HelpButton'#6'Height'#3'|'#1
+  +#5'Width'#3#195#1#5'Align'#7#8'alClient'#9'PageIndex'#2#1#8'TabOrder'#2#0#0#5
+  +'TPage'#11'GeneralPage'#7'Caption'#6#7'Options'#11'ClientWidth'#3#187#1#12'C'
+  +'lientHeight'#3'a'#1#0#9'TGroupBox'#24'WhenFileIsActiveGroupbox'#4'Left'#2#6
+  +#6'Height'#2'J'#3'Top'#2#6#5'Width'#3#175#1#5'Align'#7#5'alTop'#8'AutoSize'#9
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6'-When this file is active in sour'
+  +'ce editor ...'#12'ClientHeight'#2'8'#11'ClientWidth'#3#171#1#11'ParentCtl3D'
+  +#8#8'TabOrder'#2#0#0#9'TCheckBox'#28'OverrideBuildProjectCheckbox'#4'Left'#2
+  +#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#159#1#5'Align'#7#5'alTop'#20'BorderS'
+  +'pacing.Around'#2#6#7'Caption'#6'7On build project execute the Build File co'
+  +'mmand instead'#8'TabOrder'#2#0#0#0#9'TCheckBox'#26'OverrideRunProjectCheckb'
+  +'ox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#31#5'Width'#3#159#1#5'Align'#7#5'al'
+  +'Top'#20'BorderSpacing.Around'#2#6#7'Caption'#6'3On run project execute the '
+  +'Run File command instead'#8'TabOrder'#2#1#0#0#0#0#5'TPage'#9'BuildPage'#7'C'
+  +'aption'#6#5'Build'#11'ClientWidth'#3#187#1#12'ClientHeight'#3'b'#1#0#9'TGro'
+  +'upBox'#20'BuildCommandGroupbox'#4'Left'#2#6#6'Height'#2'P'#3'Top'#2'C'#5'Wi'
+  +'dth'#3#175#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#13'Build Command'#12'ClientHeight'#2'>'#11'ClientWidth'#3#171#1#11'ParentCt'
+  +'l3D'#8#8'TabOrder'#2#0#0#5'TMemo'#16'BuildCommandMemo'#4'Left'#2#6#6'Height'
+  +#2'2'#3'Top'#2#6#5'Width'#3#159#1#5'Align'#7#8'alClient'#20'BorderSpacing.Ar'
+  +'ound'#2#6#13'Lines.Strings'#1#6#18'CompileCommandMemo'#0#8'TabOrder'#2#0#0#0
+  +#0#9'TCheckBox'#26'BuildScanForFPCMsgCheckbox'#4'Left'#2#6#6'Height'#2#19#3
+  +'Top'#3#153#0#5'Width'#3#175#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#21'Scan for FPC messages'#8'TabOrder'#2#1#0#0#9'TCheckBox'#27
+  +'BuildScanForMakeMsgCheckbox'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#178#0#5'Wi'
+  +'dth'#3#175#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#22'Scan for Make messages'#8'TabOrder'#2#2#0#0#9'TGroupBox'#23'BuildWorking'
+  +'DirGroupbox'#4'Left'#2#6#6'Height'#2'7'#3'Top'#2#6#5'Width'#3#175#1#5'Align'
+  +#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6'-Working'
+  +' directory (Leave empty for file path)'#12'ClientHeight'#2'%'#11'ClientWidt'
+  +'h'#3#171#1#11'ParentCtl3D'#8#8'TabOrder'#2#3#0#9'TComboBox'#20'BuildWorkDir'
+  +'Combobox'#22'AnchorSideLeft.Control'#7#23'BuildWorkingDirGroupbox'#21'Ancho'
+  +'rSideTop.Control'#7#23'BuildWorkingDirGroupbox'#23'AnchorSideRight.Control'
+  +#7#24'BuildBrowseWorkDirButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Widt'
+  +'h'#3#128#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.A'
+  +'round'#2#6#10'ItemHeight'#2#13#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6
+  +#20'BuildWorkDirCombobox'#0#0#7'TButton'#24'BuildBrowseWorkDirButton'#21'Anc'
+  +'horSideTop.Control'#7#23'BuildWorkingDirGroupbox'#23'AnchorSideRight.Contro'
+  +'l'#7#23'BuildWorkingDirGroupbox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#3#140#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2#25#7'Anchors'#11#5'akTop'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'...'#7'OnClick'#7
+  +#29'BuildBrowseWorkDirButtonCLICK'#8'TabOrder'#2#1#0#0#0#0#5'TPage'#7'RunPag'
+  +'e'#7'Caption'#6#3'Run'#11'ClientWidth'#3#187#1#12'ClientHeight'#3'a'#1#0#9
+  +'TCheckBox'#26'AlwaysCompileFirstCheckbox'#4'Left'#2#6#6'Height'#2#19#3'Top'
+  +#2#6#5'Width'#3#175#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Cap'
+  +'tion'#6#23'Always Build before Run'#8'TabOrder'#2#0#0#0#9'TGroupBox'#18'Run'
+  +'CommandGroupbox'#4'Left'#2#6#6'Height'#2'b'#3'Top'#2'Z'#5'Width'#3#175#1#5
+  +'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'Run Command'
+  +#12'ClientHeight'#2'P'#11'ClientWidth'#3#171#1#11'ParentCtl3D'#8#8'TabOrder'
+  +#2#1#0#5'TMemo'#14'RunCommandMemo'#4'Left'#2#6#6'Height'#2'D'#3'Top'#2#6#5'W'
+  +'idth'#3#159#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#13'Lines.'
+  +'Strings'#1#6#18'CompileCommandMemo'#0#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#18
+  +'RunWorkDirGroupbox'#4'Left'#2#6#6'Height'#2'5'#3'Top'#2#31#5'Width'#3#175#1
+  +#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +'-Working Directory (Leave empty for file path)'#12'ClientHeight'#2'#'#11'Cl'
+  +'ientWidth'#3#171#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#9'TComboBox'#18'RunW'
+  +'orkDirCombobox'#22'AnchorSideLeft.Control'#7#18'RunWorkDirGroupbox'#21'Anch'
+  +'orSideTop.Control'#7#18'RunWorkDirGroupbox'#23'AnchorSideRight.Control'#7#22
+  ,'RunBrowseWorkDirButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3#128
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6
+  +#10'ItemHeight'#2#13#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#18'RunWorkD'
+  +'irCombobox'#0#0#7'TButton'#22'RunBrowseWorkDirButton'#20'AnchorSideRight.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#140#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2#25#8
+  +'HelpType'#7#9'htKeyword'#5'Align'#7#7'alRight'#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#3'...'#7'OnClick'#7#29'BuildBrowseWorkDirButtonCLICK'#8'TabOrd'
+  +'er'#2#1#0#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'%'#3'Top'#3'|'#1#5'Widt'
+  +'h'#3#195#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'
+  +#12'ClientHeight'#2'%'#11'ClientWidth'#3#195#1#8'TabOrder'#2#1#0#7'TBitBtn'
+  +#12'CancelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBotto'
+  +'m.Side'#7#9'asrBottom'#4'Left'#3'r'#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2
+  +'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cance'
+  +'l'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHeight'#2#25#20'Constraints.M'
+  +'inWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8
+  +'TabOrder'#2#0#0#0#7'TBitBtn'#8'OKButton'#21'AnchorSideBottom.Side'#7#9'asrB'
+  +'ottom'#4'Left'#3'!'#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7
+  +'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21
+  +'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Ki'
+  +'nd'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButton'
+  +'CLICK'#8'TabOrder'#2#1#0#0#7'TBitBtn'#10'HelpButton'#21'AnchorSideBottom.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'#5'Al'
+  +'ign'#7#6'alLeft'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#5
+  +'&Help'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'
+  +#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'HelpButtonClick'#8'TabOrder'#2
+  +#2#0#0#0#0
 ]);
diff --git a/ide/buildfiledlg.pas b/ide/buildfiledlg.pas
index 7e9401f5d0..ba1e80ae0f 100644
--- a/ide/buildfiledlg.pas
+++ b/ide/buildfiledlg.pas
@@ -559,6 +559,10 @@ begin
   AlwaysCompileFirstCheckbox.Caption:=lisBFAlwaysBuildBeforeRun;
   RunWorkDirGroupbox.Caption:=lisBFWorkingDirectoryLeaveEmptyForFilePath2;
   RunCommandGroupbox.Caption:=lisBFRunCommand;
+
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  OKButton.LoadGlyphFromLazarusResource('btn_ok');
+  HelpButton.LoadGlyphFromLazarusResource('btn_help');
 end;
 
 procedure TBuildFileDialog.BuildBrowseWorkDirButtonCLICK(Sender: TObject);
diff --git a/ide/buildlazdialog.lfm b/ide/buildlazdialog.lfm
index cf0aec7f30..7b57fdda44 100644
--- a/ide/buildlazdialog.lfm
+++ b/ide/buildlazdialog.lfm
@@ -21,162 +21,54 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Notebook
     AnchorSideRight.Side = asrBottom
-    Height = 38
-    Top = 504
+    Height = 35
+    Top = 507
     Width = 489
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 38
+    ClientHeight = 35
     ClientWidth = 489
     TabOrder = 0
     object CancelButton: TBitBtn
       AnchorSideRight.Side = asrBottom
-      Left = 406
-      Height = 26
+      Left = 425
+      Height = 23
       Top = 6
-      Width = 77
+      Width = 58
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       Cancel = True
       Caption = 'Cancel'
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF003F3DED413B38EB08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00211FE3081E1CE241FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF004A47F0414F4CF2FF403EEDFD3C39EB08FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF002725E5082422E4FC312FEAFF1F1DE241FFFFFF00FFFFFF00FFFFFF005451
-        F3415856F5FF6361FAFF5855F6FF413FEDFC3D3AEC08FFFFFF00FFFFFF00302D
-        E7082C2AE6FC413FF1FF4C4AF6FF312FEAFF1F1DE241FFFFFF00FFFFFF005956
-        F52B5B58F6FF6562FAFF7170FFFF5956F6FF4240EEFC3E3BEC083937EB083532
-        E9FC4745F2FF6362FFFF4A48F4FF2F2DE9FF2220E32BFFFFFF00FFFFFF00FFFF
-        FF005A57F52B5B59F6FF6663FAFF7471FFFF5A58F6FF4341EEFC3E3CECFD504D
-        F4FF6867FFFF504EF5FF3634EBFF2A27E52BFFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF005B58F62B5C5AF6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6C
-        FFFF5755F7FF3F3DEEFF3230E82BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF005C59F62B5D5BF7FF7976FFFF5956FFFF5754FFFF7270
-        FFFF4846F0FF3C39EB2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00615EF8085D5AF6FD7D79FFFF5E5BFFFF5B58FFFF7674
-        FFFF4643EFFD413FED08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF006967FB086663F9FC706DFBFF807EFFFF7E7BFFFF7C79FFFF7977
-        FFFF5E5CF7FF4744EFFC4240EE08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00716EFD086E6BFCFC7774FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6A
-        FAFF7B79FFFF605DF7FF4845EFFC4341EE08FFFFFF00FFFFFF00FFFFFF007673
-        FF087471FEFD7D7AFEFF8A87FFFF7C79FDFF6C69FBFF6361F92B5F5CF72B615E
-        F8FF6E6CFAFF7D7AFFFF615FF7FF4946F0FC4441EE05FFFFFF00FFFFFF007774
-        FF1F7A77FFFF817EFFFF817EFEFF7471FDFF6C69FB2BFFFFFF00FFFFFF00605D
-        F72B625FF8FF6F6DFBFF7E7CFFFF625FF8FF4A47F06F4542EE02FFFFFF00FFFF
-        FF007774FF1F7A77FFFF7976FEFF726FFD2BFFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00615EF82B6461F8FF6A68F9FF5451F3A84F4DF229FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF007774FF1F7774FF2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00625FF82B5D5BF76F5956F53EFFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF006360F80AFFFFFF00FFFFFF00FFFFFF00
-      }
       NumGlyphs = 0
       OnClick = CancelButtonClick
       TabOrder = 0
     end
     object SaveSettingsButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 290
-      Height = 26
+      Left = 328
+      Height = 23
       Top = 6
-      Width = 110
+      Width = 91
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'Save settings'
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000BA6A368FB969
-        35B5B86935EEB76835FFB56835FFB46734FFB26634FFB06533FFAE6433FFAC63
-        32FFAA6232FFA96132FFA86031FFA76031FEA66031F1A86131C4BA6A35DEEBC6
-        ADFFEAC5ADFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
-        F8FFFEFBF8FFFEFBF8FFFEFBF8FFC89A7CFFC79879FFA76031EDBA6B37FEEDCA
-        B3FFE0A27AFFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
-        88FF62C088FF62C088FFFDF9F6FFCA8D65FFC99B7CFFA76031FEBB6C38FFEECC
-        B6FFE1A27AFFFEFAF7FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDC
-        C2FFBFDCC2FFBFDCC2FFFDF9F6FFCD9068FFCC9E81FFA86132FFBB6B38FFEFCE
-        B8FFE1A279FFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
-        88FF62C088FF62C088FFFDF9F6FFCF936AFFCEA384FFAA6132FFBA6A36FFEFD0
-        BBFFE2A27AFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
-        F8FFFEFBF8FFFEFBF8FFFEFBF8FFD3966DFFD2A78AFFAB6232FFBB6A36FFF0D2
-        BEFFE2A37AFFE2A37AFFE1A37AFFE2A37BFFE1A37BFFE0A178FFDE9F77FFDD9F
-        76FFDC9D74FFD99B72FFD89971FFD69970FFD5AB8EFFAD6333FFBB6A36FFF2D5
-        C2FFE3A37AFFE3A37AFFE2A37BFFE2A37BFFE2A47BFFE1A279FFE0A178FFDEA0
-        77FFDE9E75FFDC9D74FFDA9B73FFD99B73FFDAB095FFAF6433FFBB6A36FFF2D8
-        C5FFE3A47BFFE3A37AFFE3A47AFFE2A47BFFE2A37BFFE1A37BFFE1A279FFDFA0
-        77FFDE9F76FFDD9E74FFDB9C72FFDC9D74FFDDB59AFFB16534FFBB6B36FFF4D9
-        C7FFE6A67DFFC88C64FFC98D65FFC98E67FFCB926CFFCB926DFFCA9069FFC88C
-        65FFC88C64FFC88C64FFC88C64FFDA9C74FFE1BA9FFFB36634FFBB6B36FEF4DC
-        C9FFE7A77DFFF9ECE1FFF9ECE1FFF9EDE3FFFCF4EEFFFDFAF7FFFDF7F3FFFAED
-        E5FFF7E7DBFFF7E5D9FFF6E5D8FFDEA077FFE4BEA4FFB46734FFBC6B36FAF5DD
-        CCFFE7A87EFFFAF0E8FFFAF0E8FFC98D66FFFAF0E9FFFDF8F3FFFEFAF8FFFCF4
-        EFFFF9E9DFFFF7E7DBFFF7E5D9FFE0A278FFE7C2A9FFB66835FFBC6B36F0F6DF
-        D0FFE8A87EFFFCF6F1FFFCF6F1FFC88C64FFFAF1E9FFFBF4EEFFFDFAF7FFFDF9
-        F6FFFAF0E8FFF8E8DDFFF7E6DBFFE1A37AFFEFD5C3FFB76935FEBC6B36D8F6DF
-        D1FFE9AA80FFFEFAF6FFFDFAF6FFC88C64FFFBF3EEFFFBF1EAFFFCF6F2FFFEFB
-        F8FFFCF6F1FFF9ECE2FFF8E7DBFFEED0BAFFECD0BDFFBB703EF8BC6B369BF6E0
-        D1FFF7E0D1FFFEFBF8FFFEFBF7FFFDF9F6FFFCF5F0FFFAF0EAFFFBF2EDFFFDF9
-        F6FFFDFAF7FFFBF1EBFFF8E9DFFEECD0BDFBC9895EECB5693563BC6B3671BC6B
-        3690BC6B36CCBC6B36EEBC6B36FABB6B36FEBB6B36FFBB6A36FFBB6A36FFBC6C
-        39FFBD6E3BFFBB6D3AFFBB6B38EFBB703ECBB6693554FFFFFF00
-      }
       NumGlyphs = 0
       OnClick = SaveSettingsButtonClick
       TabOrder = 1
     end
     object CompileButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 202
-      Height = 26
+      Left = 259
+      Height = 23
       Top = 6
-      Width = 82
+      Width = 63
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'Compile'
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        000000000000000000000000000000000000BE7A45FFBE7A45FFBE7A45FF0000
-        0000000000000000000000000000000000000000000000000000000000000000
-        000000000000BE7A45FFBE7A45FF78553958BE7A45FFE3CDBCFFBE7A45FF7855
-        3958BE7A45FFBE7A45FF00000000000000000000000000000000000000000000
-        0000BE7A45FFE3CDBCFFD2A786FFBE7A45FFC79064FFDAB89DFFC79064FFBE7A
-        45FFD2A786FFE3CDBCFFBE7A45FF000000000000000000000000000000000000
-        0000BE7A45FFD2A786FFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB8
-        9DFFDAB89DFFD2A786FFBE7A45FF000000000000000000000000000000000000
-        000078553958BE7A45FFE3CDBCFFCFA17CFFBD7F4CF8C38656FFBA7A46F4D5AE
-        8FFFDAB89DFFBE7A45FF7855395800000000000000000000000000000000BE7A
-        45FFBE7A45FFC79064FFDAB89DFFBD7F4CF8B78256CD78553959A56F43C0BA7A
-        46F4DAB89DFFC79064FFBE7A45FFBE7A45FF000000000000000000000000BE7A
-        45FFE3CDBCFFDAB89DFFDAB89DFFC38656FF785539590000000078553959C386
-        56FFDAB89DFFDAB89DFFE3CDBCFFBE7A45FF000000000000000000000000BE7A
-        45FFBE7A45FFC79064FFDAB89DFFBA7A46F49C6B42AE785539598F633F97BA7C
-        49EEDAB89DFFC79064FFBE7A45FFBE7A45FF0000000000000000000000000000
-        000078553958BE7A45FFDAB89DFFCFA17CFFBA7A46F4C38656FFBA7A46F4D1A5
-        82FFDAB89DFFBE7A45FF78553958000000000000000000000000000000000000
-        0000BE7A45FFD2A786FFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB8
-        9DFFDAB89DFFD2A786FFBE7A45FF000000000000000000000000000000000000
-        0000BE7A45FFE3CDBCFFD2A786FFBE7A45FFC79064FFDAB89DFFC79064FFBE7A
-        45FFD2A786FFE3CDBCFFBE7A45FF000000000000000000000000000000000000
-        000078553958BE7A45FFBE7A45FF78553958BE7A45FFE3CDBCFFBE7A45FF7855
-        3958BE7A45FFBE7A45FF00000000000000000000000000000000000000000000
-        000000000000000000000000000000000000BE7A45FFBE7A45FFBE7A45FF0000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000
-      }
       NumGlyphs = 0
       OnClick = CompileButtonClick
       TabOrder = 2
@@ -188,7 +80,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = CBLDBtnPanel
-    Height = 504
+    Height = 507
     Width = 489
     Anchors = [akTop, akLeft, akRight, akBottom]
     OnEnter = NotebookPageChanged
@@ -199,7 +91,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
       AnchorSideBottom.Side = asrBottom
       Caption = 'QuickBuildOptions'
       ClientWidth = 481
-      ClientHeight = 478
+      ClientHeight = 481
       object QuickLCLInterfaceComboLabel: TLabel
         AnchorSideLeft.Control = QuickBuildOptionsRadioGroup
         AnchorSideLeft.Side = asrBottom
@@ -246,7 +138,6 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         BorderSpacing.Right = 24
         Enabled = False
         ItemHeight = 13
-        MaxLength = -1
         OnChange = AppLCLInterfaceComboBoxChange
         TabOrder = 0
         Text = '(none)'
@@ -262,7 +153,6 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         BorderSpacing.Right = 24
         Enabled = False
         ItemHeight = 13
-        MaxLength = -1
         OnChange = AppLCLInterfaceComboBoxChange
         TabOrder = 1
         Text = '(none)'
@@ -301,15 +191,15 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
     end
     object AdvancedBuildOptionsPage: TPage
       Caption = 'AdvancedBuildOptions'
-      ClientWidth = 485
-      ClientHeight = 461
+      ClientWidth = 481
+      ClientHeight = 478
       object OptionsLabel: TLabel
         AnchorSideTop.Control = ItemsListBox
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 20
-        Top = 288
-        Width = 50
+        Height = 14
+        Top = 305
+        Width = 38
         BorderSpacing.Top = 19
         Caption = 'Options'
         ParentColor = False
@@ -318,9 +208,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideLeft.Control = OptionsLabel
         AnchorSideTop.Control = TargetOsEdit
         Left = 6
-        Height = 20
-        Top = 316
-        Width = 63
+        Height = 14
+        Top = 333
+        Width = 50
         Caption = 'Target OS'
         ParentColor = False
       end
@@ -328,9 +218,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideLeft.Control = TargetOSLabel
         AnchorSideTop.Control = TargetDirectoryComboBox
         Left = 6
-        Height = 20
-        Top = 344
-        Width = 102
+        Height = 14
+        Top = 361
+        Width = 80
         Caption = 'Target Directory'
         ParentColor = False
       end
@@ -338,9 +228,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideLeft.Control = TargetDirectoryLabel
         AnchorSideTop.Control = TargetCPUComboBox
         Left = 6
-        Height = 20
-        Top = 375
-        Width = 71
+        Height = 14
+        Top = 388
+        Width = 56
         Caption = 'Target CPU'
         ParentColor = False
       end
@@ -361,9 +251,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = CleanAllCheckBox
         Left = 320
-        Height = 197
+        Height = 220
         Top = 6
-        Width = 159
+        Width = 155
         Anchors = [akTop, akLeft, akRight, akBottom]
         AutoFill = True
         BorderSpacing.Around = 6
@@ -384,9 +274,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideTop.Side = asrBottom
         AnchorSideBottom.Control = WithStaticPackagesCheckBox
         Left = 320
-        Height = 22
-        Top = 219
-        Width = 79
+        Height = 19
+        Top = 242
+        Width = 67
         Anchors = [akLeft, akBottom]
         BorderSpacing.Top = 16
         BorderSpacing.Bottom = 6
@@ -400,9 +290,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideBottom.Control = ItemsListBox
         AnchorSideBottom.Side = asrBottom
         Left = 320
-        Height = 22
-        Top = 247
-        Width = 211
+        Height = 19
+        Top = 267
+        Width = 167
         Anchors = [akLeft, akBottom]
         BorderSpacing.Top = 6
         Caption = 'WithStaticPackagesCheckBox'
@@ -414,7 +304,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideRight.Control = ItemListHeader
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 241
+        Height = 258
         Top = 28
         Width = 308
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -427,7 +317,6 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         ShowHint = True
         Style = lbOwnerDrawFixed
         TabOrder = 3
-        TopIndex = -1
       end
       object OptionsEdit: TEdit
         AnchorSideTop.Control = OptionsLabel
@@ -435,8 +324,8 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideRight.Side = asrBottom
         Left = 156
         Height = 22
-        Top = 288
-        Width = 323
+        Top = 305
+        Width = 319
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Right = 6
         TabOrder = 4
@@ -448,8 +337,8 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideRight.Side = asrBottom
         Left = 156
         Height = 22
-        Top = 316
-        Width = 323
+        Top = 333
+        Width = 319
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
         TabOrder = 5
@@ -460,11 +349,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = TargetDirectoryButton
         Left = 156
-        Height = 25
-        Top = 344
-        Width = 295
+        Height = 21
+        Top = 361
+        Width = 291
         Anchors = [akTop, akLeft, akRight, akBottom]
-        MaxLength = -1
+        ItemHeight = 13
         TabOrder = 6
       end
       object TargetCPUComboBox: TComboBox
@@ -474,12 +363,12 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideRight.Control = TargetDirectoryComboBox
         AnchorSideRight.Side = asrBottom
         Left = 156
-        Height = 25
-        Top = 375
-        Width = 295
+        Height = 21
+        Top = 388
+        Width = 291
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
-        MaxLength = -1
+        ItemHeight = 13
         TabOrder = 7
       end
       object TargetDirectoryButton: TButton
@@ -488,9 +377,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = TargetDirectoryComboBox
         AnchorSideBottom.Side = asrBottom
-        Left = 457
-        Height = 25
-        Top = 344
+        Left = 453
+        Height = 21
+        Top = 361
         Width = 22
         Anchors = [akTop, akRight, akBottom]
         BorderSpacing.Left = 6
@@ -504,9 +393,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideTop.Control = TargetCPUComboBox
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 22
-        Top = 410
-        Width = 194
+        Height = 19
+        Top = 419
+        Width = 156
         BorderSpacing.Top = 10
         BorderSpacing.Bottom = 6
         Caption = 'RestartAfterBuildCheckBox'
@@ -517,9 +406,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg
         AnchorSideTop.Control = RestartAfterBuildCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 22
-        Top = 438
-        Width = 168
+        Height = 19
+        Top = 444
+        Width = 132
         BorderSpacing.Top = 6
         Caption = 'ConfirmBuildCheckBox'
         TabOrder = 10
diff --git a/ide/buildlazdialog.lrs b/ide/buildlazdialog.lrs
index 91c368849e..54c21abd95 100644
--- a/ide/buildlazdialog.lrs
+++ b/ide/buildlazdialog.lrs
@@ -10,212 +10,77 @@ LazarusResources.Add('TConfigureBuildLazarusDlg','FORMDATA',[
   +'er'#10'LCLVersion'#6#6'0.9.25'#0#6'TPanel'#12'CBLDBtnPanel'#22'AnchorSideLe'
   +'ft.Control'#7#8'Notebook'#21'AnchorSideTop.Control'#7#8'Notebook'#18'Anchor'
   +'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'Notebook'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#6'Height'#2'&'#3'Top'#3#248#1#5'Width'#3
+  +'nchorSideRight.Side'#7#9'asrBottom'#6'Height'#2'#'#3'Top'#3#251#1#5'Width'#3
   +#233#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'Cl'
-  +'ientHeight'#2'&'#11'ClientWidth'#3#233#1#8'TabOrder'#2#0#0#7'TBitBtn'#12'Ca'
-  +'ncelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#150#1#6'Heigh'
-  +'t'#2#26#3'Top'#2#6#5'Width'#2'M'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#10'Glyph.Data'#10
-  +':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0
-  +' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0'?='#237'A;8'#235#8#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0'!'#31#227#8#30#28#226'A'#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'JG'#240'A'
-  +'OL'#242#255'@>'#237#253'<9'#235#8#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'''%'#229#8'$"'#228#252'1/'#234#255#31#29#226'A'#255#255#255#0
-  +#255#255#255#0#255#255#255#0'TQ'#243'AXV'#245#255'ca'#250#255'XU'#246#255'A?'
-  +#237#252'=:'#236#8#255#255#255#0#255#255#255#0'0-'#231#8',*'#230#252'A?'#241
-  +#255'LJ'#246#255'1/'#234#255#31#29#226'A'#255#255#255#0#255#255#255#0'YV'#245
-  +'+[X'#246#255'eb'#250#255'qp'#255#255'YV'#246#255'B@'#238#252'>;'#236#8'97'
-  +#235#8'52'#233#252'GE'#242#255'cb'#255#255'JH'#244#255'/-'#233#255'" '#227'+'
-  +#255#255#255#0#255#255#255#0#255#255#255#0'ZW'#245'+[Y'#246#255'fc'#250#255
-  +'tq'#255#255'ZX'#246#255'CA'#238#252'><'#236#253'PM'#244#255'hg'#255#255'PN'
-  +#245#255'64'#235#255'*'''#229'+'#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0'[X'#246'+\Z'#246#255'gd'#250#255'tr'#255#255'sp'
-  +#255#255'pn'#255#255'nl'#255#255'WU'#247#255'?='#238#255'20'#232'+'#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'\Y'#246'+]['#247#255'yv'#255#255'YV'#255#255'WT'#255#255'rp'
-  +#255#255'HF'#240#255'<9'#235'+'#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'a^'#248#8
-  +']Z'#246#253'}y'#255#255'^['#255#255'[X'#255#255'vt'#255#255'FC'#239#253'A?'
-  +#237#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0'ig'#251#8'fc'#249#252'pm'#251#255#128'~'#255#255
-  +'~{'#255#255'|y'#255#255'yw'#255#255'^\'#247#255'GD'#239#252'B@'#238#8#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'qn'#253#8
-  +'nk'#252#252'wt'#253#255#134#130#255#255'vs'#252#255'db'#248#255'`]'#247#255
-  +'mj'#250#255'{y'#255#255'`]'#247#255'HE'#239#252'CA'#238#8#255#255#255#0#255
-  +#255#255#0#255#255#255#0'vs'#255#8'tq'#254#253'}z'#254#255#138#135#255#255'|'
-  +'y'#253#255'li'#251#255'ca'#249'+_\'#247'+a^'#248#255'nl'#250#255'}z'#255#255
-  +'a_'#247#255'IF'#240#252'DA'#238#5#255#255#255#0#255#255#255#0'wt'#255#31'zw'
-  +#255#255#129'~'#255#255#129'~'#254#255'tq'#253#255'li'#251'+'#255#255#255#0
-  +#255#255#255#0'`]'#247'+b_'#248#255'om'#251#255'~|'#255#255'b_'#248#255'JG'
-  +#240'oEB'#238#2#255#255#255#0#255#255#255#0'wt'#255#31'zw'#255#255'yv'#254
-  +#255'ro'#253'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'a^'
-  +#248'+da'#248#255'jh'#249#255'TQ'#243#168'OM'#242')'#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'wt'#255#31'wt'#255'+'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'b_'#248'+'
-  +']['#247'oYV'#245'>'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'c`'#248#10
-  +#255#255#255#0#255#255#255#0#255#255#255#0#9'NumGlyphs'#2#0#7'OnClick'#7#17
-  +'CancelButtonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#18'SaveSettingsButton'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'"'#1#6'Height'#2#26#3'Top'#2
-  +#6#5'Width'#2'n'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#13'Save settings'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'
-  ,#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0
-  +'d'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#186'j6'#143#185'i5'#181#184'i5'#238#183'h'
-  +'5'#255#181'h5'#255#180'g4'#255#178'f4'#255#176'e3'#255#174'd3'#255#172'c2'
-  +#255#170'b2'#255#169'a2'#255#168'`1'#255#167'`1'#254#166'`1'#241#168'a1'#196
-  +#186'j5'#222#235#198#173#255#234#197#173#255#254#251#248#255#254#251#248#255
-  +#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248
-  +#255#254#251#248#255#254#251#248#255#254#251#248#255#200#154'|'#255#199#152
-  +'y'#255#167'`1'#237#186'k7'#254#237#202#179#255#224#162'z'#255#254#250#247
-  +#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136
-  +#255'b'#192#136#255'b'#192#136#255'b'#192#136#255#253#249#246#255#202#141'e'
-  +#255#201#155'|'#255#167'`1'#254#187'l8'#255#238#204#182#255#225#162'z'#255
-  +#254#250#247#255#191#220#194#255#191#220#194#255#191#220#194#255#191#220#194
-  +#255#191#220#194#255#191#220#194#255#191#220#194#255#191#220#194#255#253#249
-  +#246#255#205#144'h'#255#204#158#129#255#168'a2'#255#187'k8'#255#239#206#184
-  +#255#225#162'y'#255#254#250#247#255'b'#192#136#255'b'#192#136#255'b'#192#136
-  +#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136
-  +#255#253#249#246#255#207#147'j'#255#206#163#132#255#170'a2'#255#186'j6'#255
-  +#239#208#187#255#226#162'z'#255#254#251#248#255#254#251#248#255#254#251#248
-  +#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251
-  +#248#255#254#251#248#255#254#251#248#255#211#150'm'#255#210#167#138#255#171
-  +'b2'#255#187'j6'#255#240#210#190#255#226#163'z'#255#226#163'z'#255#225#163'z'
-  +#255#226#163'{'#255#225#163'{'#255#224#161'x'#255#222#159'w'#255#221#159'v'
-  +#255#220#157't'#255#217#155'r'#255#216#153'q'#255#214#153'p'#255#213#171#142
-  +#255#173'c3'#255#187'j6'#255#242#213#194#255#227#163'z'#255#227#163'z'#255
-  +#226#163'{'#255#226#163'{'#255#226#164'{'#255#225#162'y'#255#224#161'x'#255
-  +#222#160'w'#255#222#158'u'#255#220#157't'#255#218#155's'#255#217#155's'#255
-  +#218#176#149#255#175'd3'#255#187'j6'#255#242#216#197#255#227#164'{'#255#227
-  +#163'z'#255#227#164'z'#255#226#164'{'#255#226#163'{'#255#225#163'{'#255#225
-  +#162'y'#255#223#160'w'#255#222#159'v'#255#221#158't'#255#219#156'r'#255#220
-  +#157't'#255#221#181#154#255#177'e4'#255#187'k6'#255#244#217#199#255#230#166
-  +'}'#255#200#140'd'#255#201#141'e'#255#201#142'g'#255#203#146'l'#255#203#146
-  +'m'#255#202#144'i'#255#200#140'e'#255#200#140'd'#255#200#140'd'#255#200#140
-  +'d'#255#218#156't'#255#225#186#159#255#179'f4'#255#187'k6'#254#244#220#201
-  +#255#231#167'}'#255#249#236#225#255#249#236#225#255#249#237#227#255#252#244
-  +#238#255#253#250#247#255#253#247#243#255#250#237#229#255#247#231#219#255#247
-  +#229#217#255#246#229#216#255#222#160'w'#255#228#190#164#255#180'g4'#255#188
-  +'k6'#250#245#221#204#255#231#168'~'#255#250#240#232#255#250#240#232#255#201
-  +#141'f'#255#250#240#233#255#253#248#243#255#254#250#248#255#252#244#239#255
-  +#249#233#223#255#247#231#219#255#247#229#217#255#224#162'x'#255#231#194#169
-  +#255#182'h5'#255#188'k6'#240#246#223#208#255#232#168'~'#255#252#246#241#255
-  +#252#246#241#255#200#140'd'#255#250#241#233#255#251#244#238#255#253#250#247
-  +#255#253#249#246#255#250#240#232#255#248#232#221#255#247#230#219#255#225#163
-  +'z'#255#239#213#195#255#183'i5'#254#188'k6'#216#246#223#209#255#233#170#128
-  +#255#254#250#246#255#253#250#246#255#200#140'd'#255#251#243#238#255#251#241
-  +#234#255#252#246#242#255#254#251#248#255#252#246#241#255#249#236#226#255#248
-  +#231#219#255#238#208#186#255#236#208#189#255#187'p>'#248#188'k6'#155#246#224
-  +#209#255#247#224#209#255#254#251#248#255#254#251#247#255#253#249#246#255#252
-  +#245#240#255#250#240#234#255#251#242#237#255#253#249#246#255#253#250#247#255
-  +#251#241#235#255#248#233#223#254#236#208#189#251#201#137'^'#236#181'i5c'#188
-  +'k6q'#188'k6'#144#188'k6'#204#188'k6'#238#188'k6'#250#187'k6'#254#187'k6'#255
-  +#187'j6'#255#187'j6'#255#188'l9'#255#189'n;'#255#187'm:'#255#187'k8'#239#187
-  +'p>'#203#182'i5T'#255#255#255#0#9'NumGlyphs'#2#0#7'OnClick'#7#23'SaveSetting'
-  +'sButtonClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#13'CompileButton'#21'AnchorSid'
-  +'eBottom.Side'#7#9'asrBottom'#4'Left'#3#202#0#6'Height'#2#26#3'Top'#2#6#5'Wi'
-  +'dth'#2'R'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#7'Compile'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0
-  +'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'z'
-  +'E'#255'xU9X'#190'zE'#255#227#205#188#255#190'zE'#255'xU9X'#190'zE'#255#190
-  ,'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#227#205
-  +#188#255#210#167#134#255#190'zE'#255#199#144'd'#255#218#184#157#255#199#144
-  +'d'#255#190'zE'#255#210#167#134#255#227#205#188#255#190'zE'#255#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#210#167#134#255#218#184#157#255#218
-  +#184#157#255#218#184#157#255#218#184#157#255#218#184#157#255#218#184#157#255
-  +#218#184#157#255#210#167#134#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0'xU9X'#190'zE'#255#227#205#188#255#207#161'|'#255#189'L'#248#195#134
-  +'V'#255#186'zF'#244#213#174#143#255#218#184#157#255#190'zE'#255'xU9X'#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#199#144'd'#255#218#184#157
-  +#255#189'L'#248#183#130'V'#205'xU9Y'#165'oC'#192#186'zF'#244#218#184#157#255
-  +#199#144'd'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255
-  +#227#205#188#255#218#184#157#255#218#184#157#255#195#134'V'#255'xU9Y'#0#0#0#0
-  +'xU9Y'#195#134'V'#255#218#184#157#255#218#184#157#255#227#205#188#255#190'zE'
-  +#255#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#199#144'd'#255#218#184
-  +#157#255#186'zF'#244#156'kB'#174'xU9Y'#143'c?'#151#186'|I'#238#218#184#157
-  +#255#199#144'd'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +'xU9X'#190'zE'#255#218#184#157#255#207#161'|'#255#186'zF'#244#195#134'V'#255
-  +#186'zF'#244#209#165#130#255#218#184#157#255#190'zE'#255'xU9X'#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#210#167#134#255#218#184#157#255#218
-  +#184#157#255#218#184#157#255#218#184#157#255#218#184#157#255#218#184#157#255
-  +#218#184#157#255#210#167#134#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#190'zE'#255#227#205#188#255#210#167#134#255#190'zE'#255#199#144'd'
-  +#255#218#184#157#255#199#144'd'#255#190'zE'#255#210#167#134#255#227#205#188
-  +#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'xU9X'#190'zE'#255
-  +#190'zE'#255'xU9X'#190'zE'#255#227#205#188#255#190'zE'#255'xU9X'#190'zE'#255
-  +#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'CompileButtonClick'#8'TabOrder'#2#2
-  +#0#0#0#9'TNotebook'#8'Notebook'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
-  +'horSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'An'
-  +'chorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'CBLDBt'
-  +'nPanel'#6'Height'#3#248#1#5'Width'#3#233#1#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#7'OnEnter'#7#19'NotebookPageChanged'#13'OnPageChan'
-  +'ged'#7#19'NotebookPageChanged'#9'PageIndex'#2#0#8'TabOrder'#2#1#0#5'TPage'
-  +#21'QuickBuildOptionsPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#7'Captio'
-  +'n'#6#17'QuickBuildOptions'#11'ClientWidth'#3#225#1#12'ClientHeight'#3#222#1
-  +#0#6'TLabel'#27'QuickLCLInterfaceComboLabel'#22'AnchorSideLeft.Control'#7#27
-  +'QuickBuildOptionsRadioGroup'#19'AnchorSideLeft.Side'#7#9'asrBottom'#20'Anch'
-  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#3#30#1#6'Height'#2#14#3'Top'#2','#5
-  +'Width'#3#147#0#19'BorderSpacing.Right'#2#24#7'Caption'#6#27'QuickLCLInterfa'
-  +'ceComboLabel'#11'ParentColor'#8#0#0#6'TLabel'#11'AppLCLLabel'#22'AnchorSide'
-  +'Left.Control'#7#27'QuickLCLInterfaceComboLabel'#23'AnchorSideRight.Control'
-  +#7#21'QuickBuildOptionsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
-  +#3#30#1#6'Height'#2#14#3'Top'#2'T'#5'Width'#2'!'#19'BorderSpacing.Right'#2#24
-  +#7'Caption'#6#6'Target'#11'ParentColor'#8#0#0#6'TLabel'#11'IDELCLLabel'#22'A'
-  +'nchorSideLeft.Control'#7#27'QuickLCLInterfaceComboLabel'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#30#1#6'Height'#2#14#3'Top'#3#132#0#5'Width'
-  +#2#18#19'BorderSpacing.Right'#2#24#7'Caption'#6#3'IDE'#11'ParentColor'#8#0#0
-  +#9'TComboBox'#23'AppLCLInterfaceComboBox'#23'AnchorSideRight.Control'#7#21'Q'
-  +'uickBuildOptionsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'e'#1
-  +#6'Height'#2#21#3'Top'#2'L'#5'Width'#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0
-  +#19'BorderSpacing.Right'#2#24#7'Enabled'#8#10'ItemHeight'#2#13#9'MaxLength'#2
-  +#255#8'OnChange'#7#29'AppLCLInterfaceComboBoxChange'#8'TabOrder'#2#0#4'Text'
-  +#6#6'(none)'#0#0#9'TComboBox'#23'IDELCLInterfaceComboBox'#23'AnchorSideRight'
-  +'.Control'#7#21'QuickBuildOptionsPage'#20'AnchorSideRight.Side'#7#9'asrBotto'
-  +'m'#4'Left'#3'e'#1#6'Height'#2#21#3'Top'#2'|'#5'Width'#2'd'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#24#7'Enabled'#8#10'ItemHeight'
-  +#2#13#9'MaxLength'#2#255#8'OnChange'#7#29'AppLCLInterfaceComboBoxChange'#8'T'
-  +'abOrder'#2#1#4'Text'#6#6'(none)'#0#0#11'TRadioGroup'#27'QuickBuildOptionsRa'
-  +'dioGroup'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#8
-  +#1#3'Top'#2#4#5'Width'#3#0#1#8'AutoFill'#9#19'BorderSpacing.Right'#2#24#7'Ca'
-  +'ption'#6#27'QuickBuildOptionsRadioGroup'#28'ChildSizing.LeftRightSpacing'#2
-  ,#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7
-  +#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomoge'
-  +'nousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'C'
-  +'hildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29
-  +'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'Clien'
-  +'tHeight'#3#246#0#11'ClientWidth'#3#252#0#9'ItemIndex'#2#5#13'Items.Strings'
-  +#1#6#9'Build LCL'#6#23'Build IDE with Packages'#6#26'Build IDE without Packa'
-  +'ges'#6#9'Build All'#6#20'Clean Up + Build all'#6#5'Other'#0#7'OnClick'#7' Q'
-  +'uickBuildOptionsRadioGroupClick'#8'TabOrder'#2#2#0#0#0#5'TPage'#24'Advanced'
-  +'BuildOptionsPage'#7'Caption'#6#20'AdvancedBuildOptions'#11'ClientWidth'#3
-  +#229#1#12'ClientHeight'#3#205#1#0#6'TLabel'#12'OptionsLabel'#21'AnchorSideTo'
-  +'p.Control'#7#12'ItemsListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
-  +#2#6#6'Height'#2#20#3'Top'#3' '#1#5'Width'#2'2'#17'BorderSpacing.Top'#2#19#7
-  +'Caption'#6#7'Options'#11'ParentColor'#8#0#0#6'TLabel'#13'TargetOSLabel'#22
-  +'AnchorSideLeft.Control'#7#12'OptionsLabel'#21'AnchorSideTop.Control'#7#12'T'
-  +'argetOsEdit'#4'Left'#2#6#6'Height'#2#20#3'Top'#3'<'#1#5'Width'#2'?'#7'Capti'
-  +'on'#6#9'Target OS'#11'ParentColor'#8#0#0#6'TLabel'#20'TargetDirectoryLabel'
+  +'ientHeight'#2'#'#11'ClientWidth'#3#233#1#8'TabOrder'#2#0#0#7'TBitBtn'#12'Ca'
+  +'ncelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#169#1#6'Heigh'
+  +'t'#2#23#3'Top'#2#6#5'Width'#2':'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#9'NumGlyphs'#2#0#7
+  +'OnClick'#7#17'CancelButtonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#18'SaveSett'
+  +'ingsButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'H'#1#6'Heigh'
+  +'t'#2#23#3'Top'#2#6#5'Width'#2'['#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#7'Caption'#6#13'Save settings'#9'NumGlyphs'#2#0#7'On'
+  +'Click'#7#23'SaveSettingsButtonClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#13'Comp'
+  +'ileButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#3#1#6'Height'
+  +#2#23#3'Top'#2#6#5'Width'#2'?'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#7'Compile'#9'NumGlyphs'#2#0#7'OnClick'#7#18
+  +'CompileButtonClick'#8'TabOrder'#2#2#0#0#0#9'TNotebook'#8'Notebook'#22'Ancho'
+  +'rSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'Ancho'
+  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'A'
+  +'nchorSideBottom.Control'#7#12'CBLDBtnPanel'#6'Height'#3#251#1#5'Width'#3#233
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'OnEnter'#7#19
+  +'NotebookPageChanged'#13'OnPageChanged'#7#19'NotebookPageChanged'#9'PageInde'
+  +'x'#2#0#8'TabOrder'#2#1#0#5'TPage'#21'QuickBuildOptionsPage'#21'AnchorSideBo'
+  +'ttom.Side'#7#9'asrBottom'#7'Caption'#6#17'QuickBuildOptions'#11'ClientWidth'
+  +#3#225#1#12'ClientHeight'#3#225#1#0#6'TLabel'#27'QuickLCLInterfaceComboLabel'
+  +#22'AnchorSideLeft.Control'#7#27'QuickBuildOptionsRadioGroup'#19'AnchorSideL'
+  +'eft.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
+  +#30#1#6'Height'#2#14#3'Top'#2','#5'Width'#3#147#0#19'BorderSpacing.Right'#2
+  +#24#7'Caption'#6#27'QuickLCLInterfaceComboLabel'#11'ParentColor'#8#0#0#6'TLa'
+  +'bel'#11'AppLCLLabel'#22'AnchorSideLeft.Control'#7#27'QuickLCLInterfaceCombo'
+  +'Label'#23'AnchorSideRight.Control'#7#21'QuickBuildOptionsPage'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#4'Left'#3#30#1#6'Height'#2#14#3'Top'#2'T'#5'Wid'
+  +'th'#2'!'#19'BorderSpacing.Right'#2#24#7'Caption'#6#6'Target'#11'ParentColor'
+  +#8#0#0#6'TLabel'#11'IDELCLLabel'#22'AnchorSideLeft.Control'#7#27'QuickLCLInt'
+  +'erfaceComboLabel'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#30#1#6
+  +'Height'#2#14#3'Top'#3#132#0#5'Width'#2#18#19'BorderSpacing.Right'#2#24#7'Ca'
+  +'ption'#6#3'IDE'#11'ParentColor'#8#0#0#9'TComboBox'#23'AppLCLInterfaceComboB'
+  +'ox'#23'AnchorSideRight.Control'#7#21'QuickBuildOptionsPage'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#3'e'#1#6'Height'#2#21#3'Top'#2'L'#5'Width'
+  +#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#24#7'Ena'
+  +'bled'#8#10'ItemHeight'#2#13#8'OnChange'#7#29'AppLCLInterfaceComboBoxChange'
+  +#8'TabOrder'#2#0#4'Text'#6#6'(none)'#0#0#9'TComboBox'#23'IDELCLInterfaceComb'
+  +'oBox'#23'AnchorSideRight.Control'#7#21'QuickBuildOptionsPage'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#3'e'#1#6'Height'#2#21#3'Top'#2'|'#5'Widt'
+  +'h'#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#24#7
+  +'Enabled'#8#10'ItemHeight'#2#13#8'OnChange'#7#29'AppLCLInterfaceComboBoxChan'
+  +'ge'#8'TabOrder'#2#1#4'Text'#6#6'(none)'#0#0#11'TRadioGroup'#27'QuickBuildOp'
+  +'tionsRadioGroup'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Hei'
+  +'ght'#3#8#1#3'Top'#2#4#5'Width'#3#0#1#8'AutoFill'#9#19'BorderSpacing.Right'#2
+  +#24#7'Caption'#6#27'QuickBuildOptionsRadioGroup'#28'ChildSizing.LeftRightSpa'
+  +'cing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizo'
+  +'ntal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'c'
+  +'rsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChil'
+  +'ds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layo'
+  +'ut'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1
+  +#12'ClientHeight'#3#246#0#11'ClientWidth'#3#252#0#9'ItemIndex'#2#5#13'Items.'
+  +'Strings'#1#6#9'Build LCL'#6#23'Build IDE with Packages'#6#26'Build IDE with'
+  ,'out Packages'#6#9'Build All'#6#20'Clean Up + Build all'#6#5'Other'#0#7'OnCl'
+  +'ick'#7' QuickBuildOptionsRadioGroupClick'#8'TabOrder'#2#2#0#0#0#5'TPage'#24
+  +'AdvancedBuildOptionsPage'#7'Caption'#6#20'AdvancedBuildOptions'#11'ClientWi'
+  +'dth'#3#225#1#12'ClientHeight'#3#222#1#0#6'TLabel'#12'OptionsLabel'#21'Ancho'
+  +'rSideTop.Control'#7#12'ItemsListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#14#3'Top'#3'1'#1#5'Width'#2'&'#17'BorderSpacing.Top'#2
+  +#19#7'Caption'#6#7'Options'#11'ParentColor'#8#0#0#6'TLabel'#13'TargetOSLabel'
+  +#22'AnchorSideLeft.Control'#7#12'OptionsLabel'#21'AnchorSideTop.Control'#7#12
+  +'TargetOsEdit'#4'Left'#2#6#6'Height'#2#14#3'Top'#3'M'#1#5'Width'#2'2'#7'Capt'
+  +'ion'#6#9'Target OS'#11'ParentColor'#8#0#0#6'TLabel'#20'TargetDirectoryLabel'
   +#22'AnchorSideLeft.Control'#7#13'TargetOSLabel'#21'AnchorSideTop.Control'#7
-  +#23'TargetDirectoryComboBox'#4'Left'#2#6#6'Height'#2#20#3'Top'#3'X'#1#5'Widt'
-  +'h'#2'f'#7'Caption'#6#16'Target Directory'#11'ParentColor'#8#0#0#6'TLabel'#14
+  +#23'TargetDirectoryComboBox'#4'Left'#2#6#6'Height'#2#14#3'Top'#3'i'#1#5'Widt'
+  +'h'#2'P'#7'Caption'#6#16'Target Directory'#11'ParentColor'#8#0#0#6'TLabel'#14
   +'TargetCPULabel'#22'AnchorSideLeft.Control'#7#20'TargetDirectoryLabel'#21'An'
-  +'chorSideTop.Control'#7#17'TargetCPUComboBox'#4'Left'#2#6#6'Height'#2#20#3'T'
-  +'op'#3'w'#1#5'Width'#2'G'#7'Caption'#6#10'Target CPU'#11'ParentColor'#8#0#0
+  +'chorSideTop.Control'#7#17'TargetCPUComboBox'#4'Left'#2#6#6'Height'#2#14#3'T'
+  +'op'#3#132#1#5'Width'#2'8'#7'Caption'#6#10'Target CPU'#11'ParentColor'#8#0#0
   +#14'THeaderControl'#14'ItemListHeader'#4'Left'#2#6#6'Height'#2#24#3'Top'#2#4
   +#5'Width'#3'4'#1#8'Sections'#14#0#14'OnSectionClick'#7#26'ItemListHeaderSect'
   +'ionClick'#8'OnResize'#7#20'ItemListHeaderResize'#0#0#11'TRadioGroup'#22'LCL'
@@ -223,7 +88,7 @@ LazarusResources.Add('TConfigureBuildLazarusDlg','FORMDATA',[
   +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'AdvancedBui'
   +'ldOptionsPage'#23'AnchorSideRight.Control'#7#24'AdvancedBuildOptionsPage'#20
   +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#16'Clea'
-  +'nAllCheckBox'#4'Left'#3'@'#1#6'Height'#3#197#0#3'Top'#2#6#5'Width'#3#159#0#7
+  +'nAllCheckBox'#4'Left'#3'@'#1#6'Height'#3#220#0#3'Top'#2#6#5'Width'#3#155#0#7
   +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'Bo'
   +'rderSpacing.Around'#2#6#7'Caption'#6#22'LCLInterfaceRadioGroup'#28'ChildSiz'
   +'ing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizi'
@@ -235,58 +100,58 @@ LazarusResources.Add('TConfigureBuildLazarusDlg','FORMDATA',[
   +'chorSideLeft.Control'#7#22'LCLInterfaceRadioGroup'#21'AnchorSideTop.Control'
   +#7#22'LCLInterfaceRadioGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'Ancho'
   +'rSideBottom.Control'#7#26'WithStaticPackagesCheckBox'#4'Left'#3'@'#1#6'Heig'
-  +'ht'#2#22#3'Top'#3#219#0#5'Width'#2'O'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
+  +'ht'#2#19#3'Top'#3#242#0#5'Width'#2'C'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
   +#17'BorderSpacing.Top'#2#16#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#9'Clea'
   +'n All'#8'TabOrder'#2#1#0#0#9'TCheckBox'#26'WithStaticPackagesCheckBox'#22'A'
   +'nchorSideLeft.Control'#7#22'LCLInterfaceRadioGroup'#21'AnchorSideTop.Contro'
   +'l'#7#16'CleanAllCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSi'
   +'deBottom.Control'#7#12'ItemsListBox'#21'AnchorSideBottom.Side'#7#9'asrBotto'
-  +'m'#4'Left'#3'@'#1#6'Height'#2#22#3'Top'#3#247#0#5'Width'#3#211#0#7'Anchors'
+  +'m'#4'Left'#3'@'#1#6'Height'#2#19#3'Top'#3#11#1#5'Width'#3#167#0#7'Anchors'
   +#11#6'akLeft'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'WithSt'
   +'aticPackagesCheckBox'#8'TabOrder'#2#2#0#0#8'TListBox'#12'ItemsListBox'#21'A'
   +'nchorSideTop.Control'#7#14'ItemListHeader'#18'AnchorSideTop.Side'#7#9'asrBo'
   +'ttom'#23'AnchorSideRight.Control'#7#14'ItemListHeader'#20'AnchorSideRight.S'
-  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#241#0#3'Top'#2#28#5'Width'#3'4'
-  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacin'
-  +'g.Left'#2#6#10'ItemHeight'#2#25#10'OnDrawItem'#7#20'ItemsListBoxDrawItem'#11
+  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#2#1#3'Top'#2#28#5'Width'#3'4'#1
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.'
+  +'Left'#2#6#10'ItemHeight'#2#25#10'OnDrawItem'#7#20'ItemsListBoxDrawItem'#11
   +'OnMouseDown'#7#21'ItemsListBoxMouseDown'#10'OnShowHint'#7#20'ItemsListBoxSh'
   +'owHint'#14'ParentShowHint'#8#8'ShowHint'#9#5'Style'#7#16'lbOwnerDrawFixed'#8
-  +'TabOrder'#2#3#8'TopIndex'#2#255#0#0#5'TEdit'#11'OptionsEdit'#21'AnchorSideT'
-  +'op.Control'#7#12'OptionsLabel'#23'AnchorSideRight.Control'#7#24'AdvancedBui'
-  +'ldOptionsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'He'
-  +'ight'#2#22#3'Top'#3' '#1#5'Width'#3'C'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#4#0#0#5'TE'
-  +'dit'#12'TargetOsEdit'#21'AnchorSideTop.Control'#7#11'OptionsEdit'#18'Anchor'
-  ,'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#24'AdvancedBuild'
-  +'OptionsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'Heig'
-  +'ht'#2#22#3'Top'#3'<'#1#5'Width'#3'C'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
-  +'kRight'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#5#0#0#9'TComboBox'#23
-  +'TargetDirectoryComboBox'#22'AnchorSideLeft.Control'#7#12'TargetOsEdit'#21'A'
-  +'nchorSideTop.Control'#7#12'TargetOsEdit'#18'AnchorSideTop.Side'#7#9'asrBott'
-  +'om'#23'AnchorSideRight.Control'#7#21'TargetDirectoryButton'#4'Left'#3#156#0
-  +#6'Height'#2#25#3'Top'#3'X'#1#5'Width'#3''''#1#7'Anchors'#11#5'akTop'#6'akLe'
-  +'ft'#7'akRight'#8'akBottom'#0#9'MaxLength'#2#255#8'TabOrder'#2#6#0#0#9'TComb'
-  +'oBox'#17'TargetCPUComboBox'#22'AnchorSideLeft.Control'#7#23'TargetDirectory'
-  +'ComboBox'#21'AnchorSideTop.Control'#7#23'TargetDirectoryComboBox'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#23'TargetDirecto'
-  +'ryComboBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'Heigh'
-  +'t'#2#25#3'Top'#3'w'#1#5'Width'#3''''#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
-  +'kRight'#0#17'BorderSpacing.Top'#2#6#9'MaxLength'#2#255#8'TabOrder'#2#7#0#0#7
-  +'TButton'#21'TargetDirectoryButton'#21'AnchorSideTop.Control'#7#23'TargetDir'
-  +'ectoryComboBox'#23'AnchorSideRight.Control'#7#24'AdvancedBuildOptionsPage'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#23'T'
-  +'argetDirectoryComboBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +#201#1#6'Height'#2#25#3'Top'#3'X'#1#5'Width'#2#22#7'Anchors'#11#5'akTop'#7'a'
-  +'kRight'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6
-  +#7'Caption'#6#3'...'#7'OnClick'#7#26'TargetDirectoryButtonClick'#8'TabOrder'
-  +#2#8#0#0#9'TCheckBox'#25'RestartAfterBuildCheckBox'#22'AnchorSideLeft.Contro'
-  +'l'#7#14'TargetCPULabel'#21'AnchorSideTop.Control'#7#17'TargetCPUComboBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#154#1
-  +#5'Width'#3#194#0#17'BorderSpacing.Top'#2#10#20'BorderSpacing.Bottom'#2#6#7
-  +'Caption'#6#25'RestartAfterBuildCheckBox'#8'TabOrder'#2#9#0#0#9'TCheckBox'#20
-  +'ConfirmBuildCheckBox'#22'AnchorSideLeft.Control'#7#25'RestartAfterBuildChec'
-  +'kBox'#21'AnchorSideTop.Control'#7#25'RestartAfterBuildCheckBox'#18'AnchorSi'
-  +'deTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#182#1#5'Widt'
-  +'h'#3#168#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#20'ConfirmBuildCheckBox'#8
-  +'TabOrder'#2#10#0#0#0#0#0
+  +'TabOrder'#2#3#0#0#5'TEdit'#11'OptionsEdit'#21'AnchorSideTop.Control'#7#12'O'
+  +'ptionsLabel'#23'AnchorSideRight.Control'#7#24'AdvancedBuildOptionsPage'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'Height'#2#22#3'Top'#3
+  +'1'#1#5'Width'#3'?'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'
+  +#0#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#4#0#0#5'TEdit'#12'TargetOsEdit'
+  +#21'AnchorSideTop.Control'#7#11'OptionsEdit'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#23'AnchorSideRight.Control'#7#24'AdvancedBuildOptionsPage'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'Height'#2#22#3'Top'#3'M'#1
+  +#5'Width'#3'?'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpac'
+  +'ing.Around'#2#6#8'TabOrder'#2#5#0#0#9'TComboBox'#23'TargetDirectoryComboBox'
+  +#22'AnchorSideLeft.Control'#7#12'TargetOsEdit'#21'AnchorSideTop.Control'#7#12
+  +'TargetOsEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Cont'
+  +'rol'#7#21'TargetDirectoryButton'#4'Left'#3#156#0#6'Height'#2#21#3'Top'#3'i'
+  ,#1#5'Width'#3'#'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#10'ItemHeight'#2#13#8'TabOrder'#2#6#0#0#9'TComboBox'#17'TargetCPUComboBox'
+  +#22'AnchorSideLeft.Control'#7#23'TargetDirectoryComboBox'#21'AnchorSideTop.C'
+  +'ontrol'#7#23'TargetDirectoryComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#23'TargetDirectoryComboBox'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#4'Left'#3#156#0#6'Height'#2#21#3'Top'#3#132#1#5'Widt'
+  +'h'#3'#'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.To'
+  +'p'#2#6#10'ItemHeight'#2#13#8'TabOrder'#2#7#0#0#7'TButton'#21'TargetDirector'
+  +'yButton'#21'AnchorSideTop.Control'#7#23'TargetDirectoryComboBox'#23'AnchorS'
+  +'ideRight.Control'#7#24'AdvancedBuildOptionsPage'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#23'TargetDirectoryComboBox'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#197#1#6'Height'#2#21#3'Top'
+  +#3'i'#1#5'Width'#2#22#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#18'Bor'
+  +'derSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#3'...'#7'OnCl'
+  +'ick'#7#26'TargetDirectoryButtonClick'#8'TabOrder'#2#8#0#0#9'TCheckBox'#25'R'
+  +'estartAfterBuildCheckBox'#22'AnchorSideLeft.Control'#7#14'TargetCPULabel'#21
+  +'AnchorSideTop.Control'#7#17'TargetCPUComboBox'#18'AnchorSideTop.Side'#7#9'a'
+  +'srBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#163#1#5'Width'#3#156#0#17'Bor'
+  +'derSpacing.Top'#2#10#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#25'RestartAf'
+  +'terBuildCheckBox'#8'TabOrder'#2#9#0#0#9'TCheckBox'#20'ConfirmBuildCheckBox'
+  +#22'AnchorSideLeft.Control'#7#25'RestartAfterBuildCheckBox'#21'AnchorSideTop'
+  +'.Control'#7#25'RestartAfterBuildCheckBox'#18'AnchorSideTop.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#188#1#5'Width'#3#132#0#17'BorderSp'
+  +'acing.Top'#2#6#7'Caption'#6#20'ConfirmBuildCheckBox'#8'TabOrder'#2#10#0#0#0
+  +#0#0
 ]);
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 3fdd114382..bd2d49a71e 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -880,6 +880,9 @@ begin
 
   IDEDialogLayoutList.ApplyLayout(Self, 500, 500);
 
+  CompileButton.LoadGlyphFromLazarusResource('menu_build');
+  SaveSettingsButton.LoadGlyphFromLazarusResource('menu_save');
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
   Load(FOptions);
 end;