diff --git a/ide/compileroptionsdlg.lfm b/ide/compileroptionsdlg.lfm
index 48c0b6228b..d34d20f08a 100644
--- a/ide/compileroptionsdlg.lfm
+++ b/ide/compileroptionsdlg.lfm
@@ -26,7 +26,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object PathPage: TPage
       Caption = 'PathPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object lblOtherUnits: TLabel
         Left = 6
         Height = 20
@@ -824,7 +824,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object MsgPage: TPage
       Caption = 'MsgPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object grpVerbosity: TCheckGroup
         Left = 6
         Height = 196
@@ -872,7 +872,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object OtherPage: TPage
       Caption = 'OtherPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object grpConfigFile: TGroupBox
         Left = 6
         Height = 110
@@ -919,18 +919,18 @@ object frmCompilerOptions: TfrmCompilerOptions
       end
       object grpCustomOptions: TGroupBox
         Left = 6
-        Height = 319
+        Height = 321
         Top = 122
         Width = 653
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'grpCustomOptions'
-        ClientHeight = 315
+        ClientHeight = 317
         ClientWidth = 649
         TabOrder = 1
         object memCustomOptions: TMemo
           Left = 6
-          Height = 303
+          Height = 305
           Top = 6
           Width = 637
           Align = alClient
@@ -942,7 +942,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object InheritedPage: TPage
       Caption = 'InheritedPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object InhNoteLabel: TLabel
         Left = 6
         Height = 20
@@ -967,7 +967,7 @@ object frmCompilerOptions: TfrmCompilerOptions
       end
       object InhItemMemo: TMemo
         Left = 6
-        Height = 157
+        Height = 159
         Top = 284
         Width = 653
         Align = alClient
@@ -990,7 +990,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object CompilationPage: TPage
       Caption = 'CompilationPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object chkCreateMakefile: TCheckBox
         Left = 6
         Height = 22
@@ -1504,6 +1504,8 @@ object frmCompilerOptions: TfrmCompilerOptions
       }
       NumGlyphs = 0
       OnClick = ButtonLoadSaveClick
+      ParentShowHint = False
+      ShowHint = True
       TabOrder = 3
     end
     object btnOK: TBitBtn
diff --git a/ide/compileroptionsdlg.lrs b/ide/compileroptionsdlg.lrs
index 173ddcd40c..a02dd1cae1 100644
--- a/ide/compileroptionsdlg.lrs
+++ b/ide/compileroptionsdlg.lrs
@@ -11,7 +11,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'nNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#224#1#5'W'
   +'idth'#3#157#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
   +'t'#8'akBottom'#0#9'PageIndex'#2#3#8'TabOrder'#2#0#0#5'TPage'#8'PathPage'#7
-  +'Caption'#6#8'PathPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191#1#0#6
+  +'Caption'#6#8'PathPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#6
   +'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3
   +#141#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
   +#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'lblOtherUnits'#11'ParentColor'
@@ -269,7 +269,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'bOrder'#2#5#0#0#9'TCheckBox'#15'chkSymbolsStrip'#4'Left'#2#6#6'Height'#2#22
   +#3'Top'#3#174#0#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6#15'chkSymbolsStrip'#8'TabOrder'#2#6#0#0#0#0#5'TPage'#7'Msg'
-  +'Page'#7'Caption'#6#7'MsgPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191
+  +'Page'#7'Caption'#6#7'MsgPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193
   +#1#0#11'TCheckGroup'#12'grpVerbosity'#4'Left'#2#6#6'Height'#3#196#0#3'Top'#2
   +#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Aroun'
   +'d'#2#6#7'Caption'#6#12'grpVerbosity'#28'ChildSizing.LeftRightSpacing'#2#6#28
@@ -285,7 +285,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +#6'Height'#2#23#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpac'
   +'ing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'edtErrorCnt'#0#0#0#0#5'TPage'#9
   +'OtherPage'#7'Caption'#6#9'OtherPage'#11'ClientWidth'#3#153#2#12'ClientHeigh'
-  +'t'#3#191#1#0#9'TGroupBox'#13'grpConfigFile'#4'Left'#2#6#6'Height'#2'n'#3'To'
+  +'t'#3#193#1#0#9'TGroupBox'#13'grpConfigFile'#4'Left'#2#6#6'Height'#2'n'#3'To'
   +'p'#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.'
   +'Around'#2#6#7'Caption'#6#13'grpConfigFile'#12'ClientHeight'#2'['#11'ClientW'
   +'idth'#3#137#2#8'TabOrder'#2#0#0#9'TCheckBox'#13'chkConfigFile'#4'Left'#2#6#6
@@ -297,26 +297,26 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +#0#5'TEdit'#13'edtConfigPath'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'>'#5'Width'
   +#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#2#4'T'
   +'ext'#6#13'edtConfigPath'#0#0#0#9'TGroupBox'#16'grpCustomOptions'#4'Left'#2#6
-  +#6'Height'#3'?'#1#3'Top'#2'z'#5'Width'#3#141#2#5'Align'#7#8'alClient'#20'Bor'
+  +#6'Height'#3'A'#1#3'Top'#2'z'#5'Width'#3#141#2#5'Align'#7#8'alClient'#20'Bor'
   +'derSpacing.Around'#2#6#7'Caption'#6#16'grpCustomOptions'#12'ClientHeight'#3
-  +';'#1#11'ClientWidth'#3#137#2#8'TabOrder'#2#1#0#5'TMemo'#16'memCustomOptions'
-  +#4'Left'#2#6#6'Height'#3'/'#1#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#8'alClie'
+  +'='#1#11'ClientWidth'#3#137#2#8'TabOrder'#2#1#0#5'TMemo'#16'memCustomOptions'
+  +#4'Left'#2#6#6'Height'#3'1'#1#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#8'alClie'
   +'nt'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#0#5'TPage'#13'Inheri'
   +'tedPage'#7'Caption'#6#13'InheritedPage'#11'ClientWidth'#3#153#2#12'ClientHe'
-  +'ight'#3#191#1#0#6'TLabel'#12'InhNoteLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'
+  +'ight'#3#193#1#0#6'TLabel'#12'InhNoteLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'
   +#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Cap'
   +'tion'#6#12'InhNoteLabel'#11'ParentColor'#8#0#0#9'TTreeView'#11'InhTreeView'
   +#4'Left'#2#6#6'Height'#3#247#0#3'Top'#2' '#5'Width'#3#141#2#5'Align'#7#5'alT'
   +'op'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#17'DefaultItemHe'
   +'ight'#2#19#8'TabOrder'#2#0#18'OnSelectionChanged'#7#27'InhTreeViewSelection'
-  +'Changed'#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6'Height'#3#157#0#3'Top'#3
+  +'Changed'#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#3
   +#28#1#5'Width'#3#141#2#5'Align'#7#8'alClient'#18'BorderSpacing.Left'#2#6#19
   +'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'ReadOnly'#9#10'Scro'
   +'llBars'#7#14'ssAutoVertical'#8'TabOrder'#2#1#0#0#9'TSplitter'#11'InhSplitte'
   +'r'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#3#23#1#5'Width'#3#153#2#5'A'
   +'lign'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#0#5'TPage'#15'CompilationP'
   +'age'#7'Caption'#6#15'CompilationPage'#11'ClientWidth'#3#153#2#12'ClientHeig'
-  +'ht'#3#191#1#0#9'TCheckBox'#17'chkCreateMakefile'#4'Left'#2#6#6'Height'#2#22
+  +'ht'#3#193#1#0#9'TCheckBox'#17'chkCreateMakefile'#4'Left'#2#6#6'Height'#2#22
   +#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6
   +#7'Caption'#6#17'chkCreateMakefile'#8'TabOrder'#2#0#0#0#9'TGroupBox'#20'Exec'
   +'uteAfterGroupBox'#4'Left'#2#6#6'Height'#2'f'#3'Top'#3#222#0#5'Width'#3#141#2
@@ -570,15 +570,15 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +#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#19'ButtonLoadSaveC'
-  +'lick'#8'TabOrder'#2#3#0#0#7'TBitBtn'#5'btnOK'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#3#248#1#6'Height'#2'$'#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'#4'Kind'#7#4'bk'
-  +'OK'#9'NumGlyphs'#2#0#7'OnClick'#7#15'ButtonOKClicked'#8'TabOrder'#2#4#0#0#7
-  +'TBitBtn'#9'btnCancel'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3'I'#2#6'Height'#2'$'#3'Top'#2#6#5'Widt'
-  ,'h'#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'Constrai'
-  +'nts.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2
-  +#0#8'TabOrder'#2#5#0#0#0#0
+  +'lick'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#3#0#0#7'TBitBtn'#5'b'
+  +'tnOK'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#248#1#6'Height'#2
+  +'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20'Con'
+  +'straints.MinWidth'#2'K'#4'Kind'#7#4'bkOK'#9'NumGlyphs'#2#0#7'OnClick'#7#15
+  +'ButtonOKClicked'#8'TabOrder'#2#4#0#0#7'TBitBtn'#9'btnCancel'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  ,'I'#2#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'N'#5'Align'#7#7'alRight'#8'AutoSi'
+  +'ze'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Co'
+  +'nstraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCance'
+  +'l'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#5#0#0#0#0
 ]);
diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp
index cb9c5e445e..4e015c0269 100644
--- a/ide/compileroptionsdlg.pp
+++ b/ide/compileroptionsdlg.pp
@@ -1540,7 +1540,8 @@ begin
   CancelControl:=btnCancel;
   btnShowOptions.Caption := dlgCOShowOptions;
   btnCheck.Caption := lisCompTest;
-  btnLoadSave.Caption := dlgCOLoadSave;
+  btnLoadSave.Hint := dlgCOLoadSave;
+  btnLoadSave.Caption := '...';
 end;
 
 procedure TfrmCompilerOptions.chkCustomConfigFileClick(Sender: TObject);