ide: don't load LCL images for Cancel, OK buttons because LCL can do it itself and direct loading makes buttons looks not native on gtk2

git-svn-id: trunk@19535 -
2025-04-06 12:40:22 +02:00 · 2009-04-21 02:01:14 +00:00 · 2009-04-21 02:01:14 +00:00 · d9cb53a1f7
commit d9cb53a1f7
parent b8cf817014
37 changed files with 599 additions and 717 deletions
--- a/ide/abstractsmethodsdlg.lfm
+++ b/ide/abstractsmethodsdlg.lfm
@ -9,10 +9,11 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
  ClientWidth = 581
  OnCreate = FormCreate
  OnDestroy = FormDestroy
-  ParentFont = False
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object NoteLabel: TLabel
+    Left = 0
    Height = 14
+    Top = 0
    Width = 581
    Align = alTop
    Caption = 'NoteLabel'
@ -20,20 +21,25 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
    WordWrap = True
  end
  object MethodsGroupBox: TGroupBox
-    Height = 280
+    Left = 0
+    Height = 292
    Top = 14
    Width = 581
    Align = alClient
+    Anchors = [akLeft, akRight, akBottom]
    Caption = 'MethodsGroupBox'
-    ClientHeight = 262
+    ClientHeight = 274
    ClientWidth = 577
    TabOrder = 0
    object MethodsCheckListBox: TCheckListBox
      AnchorSideBottom.Control = SelectAllButton
-      Height = 227
+      Left = 0
+      Height = 239
+      Top = 0
      Width = 577
      Align = alTop
      Anchors = [akTop, akLeft, akRight, akBottom]
+      ItemHeight = 0
      OnClickCheck = MethodsCheckListBoxClickCheck
      TabOrder = 0
    end
@ -43,7 +49,7 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
      AnchorSideBottom.Side = asrBottom
      Left = 6
      Height = 23
-      Top = 233
+      Top = 245
      Width = 98
      Anchors = [akLeft, akBottom]
      AutoSize = True
@ -59,8 +65,8 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
      AnchorSideBottom.Side = asrBottom
      Left = 110
      Height = 23
-      Top = 233
-      Width = 112
+      Top = 245
+      Width = 113
      Anchors = [akLeft, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
@ -70,38 +76,49 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
    end
  end
  object BtnPanel: TPanel
-    Height = 50
-    Top = 294
+    Left = 0
+    Height = 38
+    Top = 306
    Width = 581
    Align = alBottom
+    AutoSize = True
    BevelOuter = bvNone
-    ClientHeight = 50
+    ClientHeight = 38
    ClientWidth = 581
    TabOrder = 1
    object CancelBitBtn: TBitBtn
-      Left = 517
-      Height = 38
+      AnchorSideRight.Control = BtnPanel
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Control = BtnPanel
+      AnchorSideBottom.Side = asrBottom
+      Left = 498
+      Height = 26
      Top = 6
-      Width = 58
-      Align = alRight
+      Width = 77
+      Anchors = [akRight, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
      Cancel = True
      Caption = 'Cancel'
+      Constraints.MinWidth = 75
      Kind = bkCancel
      ModalResult = 2
      NumGlyphs = 0
      TabOrder = 0
    end
    object AddFirstBitBtn: TBitBtn
-      Left = 392
-      Height = 38
+      AnchorSideRight.Control = AddAllBitBtn
+      AnchorSideBottom.Control = BtnPanel
+      AnchorSideBottom.Side = asrBottom
+      Left = 322
+      Height = 26
      Top = 6
-      Width = 43
-      Align = alRight
+      Width = 75
+      Anchors = [akRight, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
      Caption = '&Yes'
+      Constraints.MinWidth = 75
      Default = True
      Kind = bkYes
      ModalResult = 6
@ -110,14 +127,18 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
      TabOrder = 1
    end
    object AddAllBitBtn: TBitBtn
-      Left = 441
-      Height = 38
+      AnchorSideRight.Control = CancelBitBtn
+      AnchorSideBottom.Control = BtnPanel
+      AnchorSideBottom.Side = asrBottom
+      Left = 403
+      Height = 26
      Top = 6
-      Width = 70
-      Align = alRight
+      Width = 89
+      Anchors = [akRight, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
      Caption = 'Yes to &All'
+      Constraints.MinWidth = 75
      Kind = bkYesToAll
      ModalResult = 10
      NumGlyphs = 0
--- a/ide/abstractsmethodsdlg.lrs
+++ b/ide/abstractsmethodsdlg.lrs
@ -5,38 +5,48 @@ LazarusResources.Add('TAbstractMethodsDialog','FORMDATA',[
  +'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
+  +'estroy'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#9'NoteLabel'#4'Left'#2#0#6'H'
+  +'eight'#2#14#3'Top'#2#0#5'Width'#3'E'#2#5'Align'#7#5'alTop'#7'Caption'#6#9'N'
+  +'oteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGroupBox'#15'MethodsGroupB'
+  +'ox'#4'Left'#2#0#6'Height'#3'$'#1#3'Top'#2#14#5'Width'#3'E'#2#5'Align'#7#8'a'
+  +'lClient'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#15'M'
+  +'ethodsGroupBox'#12'ClientHeight'#3#18#1#11'ClientWidth'#3'A'#2#8'TabOrder'#2
+  +#0#0#13'TCheckListBox'#19'MethodsCheckListBox'#24'AnchorSideBottom.Control'#7
+  +#15'SelectAllButton'#4'Left'#2#0#6'Height'#3#239#0#3'Top'#2#0#5'Width'#3'A'#2
+  +#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'
+  +#0#10'ItemHeight'#2#0#12'OnClickCheck'#7#29'MethodsCheckListBoxClickCheck'#8
+  +'TabOrder'#2#0#0#0#7'TButton'#15'SelectAllButton'#22'AnchorSideLeft.Control'
+  +#7#15'MethodsGroupBox'#24'AnchorSideBottom.Control'#7#15'MethodsGroupBox'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3
+  +#245#0#5'Width'#2'b'#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'a'
+  +'srBottom'#24'AnchorSideBottom.Control'#7#15'MethodsGroupBox'#21'AnchorSideB'
+  +'ottom.Side'#7#9'asrBottom'#4'Left'#2'n'#6'Height'#2#23#3'Top'#3#245#0#5'Wid'
+  +'th'#2'q'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#16'SelectNoneButton'#7'OnClick'#7#21'SelectNone'
+  +'ButtonClick'#8'TabOrder'#2#2#0#0#0#6'TPanel'#8'BtnPanel'#4'Left'#2#0#6'Heig'
+  +'ht'#2'&'#3'Top'#3'2'#1#5'Width'#3'E'#2#5'Align'#7#8'alBottom'#8'AutoSize'#9
+  +#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'#11'ClientWidth'#3'E'#2#8'T'
+  +'abOrder'#2#1#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSideRight.Control'#7#8
+  +'BtnPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contr'
+  +'ol'#7#8'BtnPanel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#242#1#6
+  +'Height'#2#26#3'Top'#2#6#5'Width'#2'M'#7'Anchors'#11#7'akRight'#8'akBottom'#0
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cance'
+  +'l'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9
+  +'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#14'AddFirstBitBtn'#23'AnchorS'
+  +'ideRight.Control'#7#12'AddAllBitBtn'#24'AnchorSideBottom.Control'#7#8'BtnPa'
+  +'nel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'B'#1#6'Height'#2#26
+  +#3'Top'#2#6#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'
+  +#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#4'&Yes'#20'Constraints.MinWidth'
+  +#2'K'#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'AddAll'
+  +'BitBtn'#23'AnchorSideRight.Control'#7#12'CancelBitBtn'#24'AnchorSideBottom.'
+  +'Control'#7#8'BtnPanel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#147#1#6'Height'#2#26#3'Top'#2#6#5'Width'#2'Y'#7'Anchors'#11#7'akRight'#8'ak'
+  +'Bottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'Yes to'
+  +' &All'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#10'bkYesToAll'#11'ModalResul'
+  +'t'#2#10#9'NumGlyphs'#2#0#7'OnClick'#7#17'AddAllBitBtnClick'#8'TabOrder'#2#2
+  +#0#0#0#0
 ]);
--- a/ide/abstractsmethodsdlg.pas
+++ b/ide/abstractsmethodsdlg.pas
@ -163,9 +163,6 @@ 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);
--- a/ide/checklfmdlg.lfm
+++ b/ide/checklfmdlg.lfm
@ -8,10 +8,11 @@ object CheckLFMDialog: TCheckLFMDialog
  ClientHeight = 580
  ClientWidth = 552
  OnCreate = CheckLFMDialogCreate
-  ParentFont = False
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object NoteLabel: TLabel
+    Left = 0
    Height = 14
+    Top = 0
    Width = 552
    Align = alTop
    Caption = 'NoteLabel'
@ -19,27 +20,29 @@ object CheckLFMDialog: TCheckLFMDialog
    WordWrap = True
  end
  object LFMGroupBox: TGroupBox
-    Height = 427
+    Left = 0
+    Height = 424
    Top = 14
    Width = 552
    Align = alClient
    Caption = 'LFM file'
-    ClientHeight = 409
+    ClientHeight = 406
    ClientWidth = 548
-    ParentCtl3D = False
    TabOrder = 0
    object LFMSynEdit: TSynEdit
-      Height = 409
+      Left = 0
+      Height = 406
+      Top = 0
      Width = 548
      Align = alClient
      Font.Height = -15
      Font.Name = 'courier'
      Font.Pitch = fpFixed
+      Font.Quality = fqNonAntialiased
      ParentColor = False
-      ParentCtl3D = False
      ParentFont = False
      TabOrder = 0
-      BookMarkOptions.OnChange = nil
+      Gutter.Width = 59
      Highlighter = SynLFMSyn1
      Keystrokes = <      
        item
@ -365,54 +368,86 @@ object CheckLFMDialog: TCheckLFMDialog
      Lines.Strings = (
        'LFMSynEdit'
      )
-      SelectedColor.OnChange = nil
+      BracketHighlightStyle = sbhsBoth
      OnSpecialLineMarkup = LFMSynEditSpecialLineMarkup
+      object TSynGutterPartList
+        object TSynGutterMarks
+          Width = 23
+        end
+        object TSynGutterLineNumber
+          Width = 19
+          MarkupInfo.Background = clBtnFace
+          MarkupInfo.Foreground = clNone
+          DigitCount = 2
+          ShowOnlyLineNumbersMultiplesOf = 1
+          ZeroStart = False
+          LeadingZeros = False
+        end
+        object TSynGutterChanges
+          Width = 4
+          ModifiedColor = 59900
+          SavedColor = clGreen
+        end
+        object TSynGutterSeparator
+          Width = 2
+        end
+        object TSynGutterCodeFolding
+          MarkupInfo.Background = clNone
+          MarkupInfo.Foreground = clGray
+        end
+      end
    end
  end
  object ErrorsGroupBox: TGroupBox
+    Left = 0
    Height = 104
-    Top = 441
+    Top = 438
    Width = 552
    Align = alBottom
    Caption = 'Errors'
    ClientHeight = 86
    ClientWidth = 548
-    ParentCtl3D = False
    TabOrder = 1
    object ErrorsListBox: TListBox
+      Left = 0
      Height = 86
+      Top = 0
      Width = 548
      Align = alClient
+      ItemHeight = 0
      OnClick = ErrorsListBoxClick
      TabOrder = 0
    end
  end
  object BtnPanel: TPanel
-    Height = 35
-    Top = 545
+    Left = 0
+    Height = 38
+    Top = 542
    Width = 552
    Align = alBottom
    AutoSize = True
    BevelOuter = bvNone
-    ClientHeight = 35
+    ClientHeight = 38
    ClientWidth = 552
    TabOrder = 2
    object CancelButton: TBitBtn
-      Left = 488
-      Height = 23
+      Left = 469
+      Height = 26
      Top = 6
-      Width = 58
+      Width = 77
      Align = alRight
      AutoSize = True
      BorderSpacing.Around = 6
+      Cancel = True
      Caption = 'Cancel'
+      Kind = bkCancel
      ModalResult = 2
      NumGlyphs = 0
      TabOrder = 0
    end
    object RemoveAllButton: TBitBtn
-      Left = 319
-      Height = 23
+      Left = 300
+      Height = 26
      Top = 6
      Width = 163
      Align = alRight
--- a/ide/checklfmdlg.lrs
+++ b/ide/checklfmdlg.lrs
@ -4,73 +4,82 @@ LazarusResources.Add('TCheckLFMDialog','FORMDATA',[
  'TPF0'#15'TCheckLFMDialog'#14'CheckLFMDialog'#4'Left'#3#164#1#6'Height'#3'D'#2
  +#3'Top'#3#206#0#5'Width'#3'('#2#13'ActiveControl'#7#10'LFMSynEdit'#7'Caption'
  +#6#15'Repair LFM file'#12'ClientHeight'#3'D'#2#11'ClientWidth'#3'('#2#8'OnCr'
-  +'eate'#7#20'CheckLFMDialogCreate'#10'ParentFont'#8#10'LCLVersion'#6#6'0.9.25'
-  +#0#6'TLabel'#9'NoteLabel'#6'Height'#2#14#5'Width'#3'('#2#5'Align'#7#5'alTop'
-  +#7'Caption'#6#9'NoteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGroupBox'
-  +#11'LFMGroupBox'#6'Height'#3#171#1#3'Top'#2#14#5'Width'#3'('#2#5'Align'#7#8
-  +'alClient'#7'Caption'#6#8'LFM file'#12'ClientHeight'#3#153#1#11'ClientWidth'
-  +#3'$'#2#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#8'TSynEdit'#10'LFMSynEdit'#6'Hei'
-  +'ght'#3#153#1#5'Width'#3'$'#2#5'Align'#7#8'alClient'#11'Font.Height'#2#241#9
-  +'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#11'Pa'
-  +'rentCtl3D'#8#10'ParentFont'#8#8'TabOrder'#2#0#24'BookMarkOptions.OnChange'
-  +#13#11'Highlighter'#7#10'SynLFMSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'Sh'
-  +'ortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8
-  +'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'S'
-  +'hortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8
-  +'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'S'
-  +'hortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'S'
-  +'hortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
-  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
-  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
-  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
-  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
-  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#10'LFMSynEdi'
-  +'t'#0#22'SelectedColor.OnChange'#13#19'OnSpecialLineMarkup'#7#27'LFMSynEditS'
-  +'pecialLineMarkup'#0#0#0#9'TGroupBox'#14'ErrorsGroupBox'#6'Height'#2'h'#3'To'
-  +'p'#3#185#1#5'Width'#3'('#2#5'Align'#7#8'alBottom'#7'Caption'#6#6'Errors'#12
-  +'ClientHeight'#2'V'#11'ClientWidth'#3'$'#2#11'ParentCtl3D'#8#8'TabOrder'#2#1
-  +#0#8'TListBox'#13'ErrorsListBox'#6'Height'#2'V'#5'Width'#3'$'#2#5'Align'#7#8
-  +'alClient'#7'OnClick'#7#18'ErrorsListBoxClick'#8'TabOrder'#2#0#0#0#0#6'TPane'
-  +'l'#8'BtnPanel'#6'Height'#2'#'#3'Top'#3'!'#2#5'Width'#3'('#2#5'Align'#7#8'al'
-  +'Bottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'#'#11'C'
-  +'lientWidth'#3'('#2#8'TabOrder'#2#2#0#7'TBitBtn'#12'CancelButton'#4'Left'#3
-  ,#232#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2':'#5'Align'#7#7'alRight'#8'AutoS'
-  +'ize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'#11'ModalResult'#2
-  +#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#15'RemoveAllButton'#4'Lef'
-  +'t'#3'?'#1#6'Height'#2#23#3'Top'#2#6#5'Width'#3#163#0#5'Align'#7#7'alRight'#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#29'Remove all invalid'
-  +' properties'#9'NumGlyphs'#2#0#7'OnClick'#7#20'RemoveAllButtonClick'#8'TabOr'
-  +'der'#2#1#0#0#0#10'TSynLFMSyn'#10'SynLFMSyn1'#13'DefaultFilter'#6' Lazarus F'
-  +'orm Files (*.lfm)|*.lfm'#7'Enabled'#8#4'left'#3#129#0#3'top'#2'h'#0#0#0
+  +'eate'#7#20'CheckLFMDialogCreate'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#9'N'
+  +'oteLabel'#4'Left'#2#0#6'Height'#2#14#3'Top'#2#0#5'Width'#3'('#2#5'Align'#7#5
+  +'alTop'#7'Caption'#6#9'NoteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGro'
+  +'upBox'#11'LFMGroupBox'#4'Left'#2#0#6'Height'#3#168#1#3'Top'#2#14#5'Width'#3
+  +'('#2#5'Align'#7#8'alClient'#7'Caption'#6#8'LFM file'#12'ClientHeight'#3#150
+  +#1#11'ClientWidth'#3'$'#2#8'TabOrder'#2#0#0#8'TSynEdit'#10'LFMSynEdit'#4'Lef'
+  +'t'#2#0#6'Height'#3#150#1#3'Top'#2#0#5'Width'#3'$'#2#5'Align'#7#8'alClient'
+  +#11'Font.Height'#2#241#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'
+  +#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentColor'#8#10'ParentFont'#8#8
+  +'TabOrder'#2#0#12'Gutter.Width'#2';'#11'Highlighter'#7#10'SynLFMSyn1'#10'Key'
+  +'strokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCu'
+  +'t'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'Shor'
+  +'tCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'S'
+  +'hortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Sh'
+  +'ortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Sh'
+  +'ortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Sh'
+  +'ortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
+  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
+  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
+  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
+  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
+  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
+  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
+  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
+  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
+  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
+  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
+  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
+  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
+  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
+  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
+  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
+  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
+  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
+  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
+  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
+  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
+  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
+  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
+  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
+  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
+  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
+  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
+  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
+  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
+  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
+  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
+  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
+  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
+  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
+  +#0#0#13'Lines.Strings'#1#6#10'LFMSynEdit'#0#21'BracketHighlightStyle'#7#8'sb'
+  +'hsBoth'#19'OnSpecialLineMarkup'#7#27'LFMSynEditSpecialLineMarkup'#0#18'TSyn'
+  +'GutterPartList'#0#0#15'TSynGutterMarks'#0#5'Width'#2#23#0#0#20'TSynGutterLi'
+  +'neNumber'#0#5'Width'#2#19#21'MarkupInfo.Background'#7#9'clBtnFace'#21'Marku'
+  +'pInfo.Foreground'#7#6'clNone'#10'DigitCount'#2#2#30'ShowOnlyLineNumbersMult'
+  +'iplesOf'#2#1#9'ZeroStart'#8#12'LeadingZeros'#8#0#0#17'TSynGutterChanges'#0#5
+  +'Width'#2#4#13'ModifiedColor'#4#252#233#0#0#10'SavedColor'#7#7'clGreen'#0#0
+  +#19'TSynGutterSeparator'#0#5'Width'#2#2#0#0#21'TSynGutterCodeFolding'#0#21'M'
+  +'arkupInfo.Background'#7#6'clNone'#21'MarkupInfo.Foreground'#7#6'clGray'#0#0
+  ,#0#0#0#9'TGroupBox'#14'ErrorsGroupBox'#4'Left'#2#0#6'Height'#2'h'#3'Top'#3
+  +#182#1#5'Width'#3'('#2#5'Align'#7#8'alBottom'#7'Caption'#6#6'Errors'#12'Clie'
+  +'ntHeight'#2'V'#11'ClientWidth'#3'$'#2#8'TabOrder'#2#1#0#8'TListBox'#13'Erro'
+  +'rsListBox'#4'Left'#2#0#6'Height'#2'V'#3'Top'#2#0#5'Width'#3'$'#2#5'Align'#7
+  +#8'alClient'#10'ItemHeight'#2#0#7'OnClick'#7#18'ErrorsListBoxClick'#8'TabOrd'
+  +'er'#2#0#0#0#0#6'TPanel'#8'BtnPanel'#4'Left'#2#0#6'Height'#2'&'#3'Top'#3#30#2
+  +#5'Width'#3'('#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvN'
+  +'one'#12'ClientHeight'#2'&'#11'ClientWidth'#3'('#2#8'TabOrder'#2#2#0#7'TBitB'
+  +'tn'#12'CancelButton'#4'Left'#3#213#1#6'Height'#2#26#3'Top'#2#6#5'Width'#2'M'
+  +#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'#15'RemoveAllButton'#4'Left'#3','#1#6
+  +'Height'#2#26#3'Top'#2#6#5'Width'#3#163#0#5'Align'#7#7'alRight'#8'AutoSize'#9
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#29'Remove all invalid properties'
+  +#9'NumGlyphs'#2#0#7'OnClick'#7#20'RemoveAllButtonClick'#8'TabOrder'#2#1#0#0#0
+  +#10'TSynLFMSyn'#10'SynLFMSyn1'#13'DefaultFilter'#6' Lazarus Form Files (*.lf'
+  +'m)|*.lfm'#7'Enabled'#8#4'left'#3#129#0#3'top'#2'h'#0#0#0
 ]);
--- a/ide/checklfmdlg.pas
+++ b/ide/checklfmdlg.pas
@ -560,7 +560,6 @@ procedure TCheckLFMDialog.SetupComponents;
 begin
  NoteLabel.Caption:=lisTheLFMLazarusFormFileContainsInvalidPropertiesThis;
  CancelButton.Caption:=dlgCancel;
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
  ErrorsGroupBox.Caption:=lisErrors;
  LFMGroupBox.Caption:=lisLFMFile;
  RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
--- a/ide/codemacroselect.lfm
+++ b/ide/codemacroselect.lfm
@ -9,8 +9,7 @@ object CodeMacroSelectDlg: TCodeMacroSelectDlg
  ClientWidth = 561
  OnClose = FormClose
  OnCreate = FormCreate
-  ParentFont = False
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object MacrosGroupBox: TGroupBox
    Left = 10
    Height = 210
@ -22,9 +21,12 @@ object CodeMacroSelectDlg: TCodeMacroSelectDlg
    ClientWidth = 166
    TabOrder = 0
    object MacrosListBox: TListBox
+      Left = 0
      Height = 192
+      Top = 0
      Width = 166
      Align = alClient
+      ItemHeight = 0
      OnSelectionChange = MacrosListBoxSelectionChange
      TabOrder = 0
    end
@ -40,7 +42,9 @@ object CodeMacroSelectDlg: TCodeMacroSelectDlg
    ClientWidth = 357
    TabOrder = 1
    object DescriptionMemo: TMemo
+      Left = 0
      Height = 192
+      Top = 0
      Width = 357
      Align = alClient
      Lines.Strings = (
@ -61,45 +65,22 @@ object CodeMacroSelectDlg: TCodeMacroSelectDlg
    ClientWidth = 537
    TabOrder = 2
    object ParameterEdit: TEdit
+      Left = 0
      Height = 23
+      Top = 0
      Width = 537
      Align = alTop
      TabOrder = 0
      Text = 'ParameterEdit'
    end
  end
-  object OkButton: TBitBtn
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 380
-    Height = 23
-    Top = 286
-    Width = 71
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Bottom = 10
-    Caption = 'OkButton'
-    ModalResult = 1
-    NumGlyphs = 0
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 287
+    Width = 549
    TabOrder = 3
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 461
-    Height = 23
-    Top = 286
-    Width = 90
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 10
-    Caption = 'CancelButton'
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 4
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
  end
 end
--- a/ide/codemacroselect.lrs
+++ b/ide/codemacroselect.lrs
@ -4,33 +4,25 @@ LazarusResources.Add('TCodeMacroSelectDlg','FORMDATA',[
  'TPF0'#19'TCodeMacroSelectDlg'#18'CodeMacroSelectDlg'#4'Left'#3'>'#1#6'Height'
  +#3'?'#1#3'Top'#3#200#0#5'Width'#3'1'#2#13'ActiveControl'#7#13'MacrosListBox'
  +#7'Caption'#6#18'CodeMacroSelectDlg'#12'ClientHeight'#3'?'#1#11'ClientWidth'
-  +#3'1'#2#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10'FormCreate'#10'ParentFont'
-  +#8#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#14'MacrosGroupBox'#4'Left'#2#10
-  +#6'Height'#3#210#0#3'Top'#2#10#5'Width'#3#170#0#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#8'akBottom'#0#7'Caption'#6#14'MacrosGroupBox'#12'ClientHeight'#3#192#0
-  +#11'ClientWidth'#3#166#0#8'TabOrder'#2#0#0#8'TListBox'#13'MacrosListBox'#6'H'
-  +'eight'#3#192#0#5'Width'#3#166#0#5'Align'#7#8'alClient'#17'OnSelectionChange'
-  +#7#28'MacrosListBoxSelectionChange'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#19'De'
-  +'scriptionGroupBox'#4'Left'#3#190#0#6'Height'#3#210#0#3'Top'#2#10#5'Width'#3
-  +'i'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6
-  +#19'DescriptionGroupBox'#12'ClientHeight'#3#192#0#11'ClientWidth'#3'e'#1#8'T'
-  +'abOrder'#2#1#0#5'TMemo'#15'DescriptionMemo'#6'Height'#3#192#0#5'Width'#3'e'
-  +#1#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'ReadOnly'#9#8'T'
-  +'abOrder'#2#0#0#0#0#9'TGroupBox'#17'ParameterGroupBox'#4'Left'#2#10#6'Height'
-  +#2'1'#3'Top'#3#225#0#5'Width'#3#29#2#7'Anchors'#11#6'akLeft'#7'akRight'#8'ak'
-  +'Bottom'#0#7'Caption'#6#17'ParameterGroupBox'#12'ClientHeight'#2#31#11'Clien'
-  +'tWidth'#3#25#2#8'TabOrder'#2#2#0#5'TEdit'#13'ParameterEdit'#6'Height'#2#23#5
-  +'Width'#3#25#2#5'Align'#7#5'alTop'#8'TabOrder'#2#0#4'Text'#6#13'ParameterEdi'
-  +'t'#0#0#0#7'TBitBtn'#8'OkButton'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'An'
-  +'chorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5
-  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'|'#1#6'Height'#2
-  +#23#3'Top'#3#30#1#5'Width'#2'G'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut'
-  +'oSize'#9#20'BorderSpacing.Bottom'#2#10#7'Caption'#6#8'OkButton'#11'ModalRes'
-  +'ult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#7'TBitBtn'#12'CancelButton'#23
-  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#3#205#1#6'Height'#2#23#3'Top'#3#30#1#5'Width'#2'Z'#7'Anchors'
-  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#10#7'C'
-  +'aption'#6#12'CancelButton'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'
-  +#2#4#0#0#0
+  +#3'1'#2#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'
+  +#6#6'0.9.27'#0#9'TGroupBox'#14'MacrosGroupBox'#4'Left'#2#10#6'Height'#3#210#0
+  +#3'Top'#2#10#5'Width'#3#170#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0
+  +#7'Caption'#6#14'MacrosGroupBox'#12'ClientHeight'#3#192#0#11'ClientWidth'#3
+  +#166#0#8'TabOrder'#2#0#0#8'TListBox'#13'MacrosListBox'#4'Left'#2#0#6'Height'
+  +#3#192#0#3'Top'#2#0#5'Width'#3#166#0#5'Align'#7#8'alClient'#10'ItemHeight'#2
+  +#0#17'OnSelectionChange'#7#28'MacrosListBoxSelectionChange'#8'TabOrder'#2#0#0
+  +#0#0#9'TGroupBox'#19'DescriptionGroupBox'#4'Left'#3#190#0#6'Height'#3#210#0#3
+  +'Top'#2#10#5'Width'#3'i'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
+  +'ottom'#0#7'Caption'#6#19'DescriptionGroupBox'#12'ClientHeight'#3#192#0#11'C'
+  +'lientWidth'#3'e'#1#8'TabOrder'#2#1#0#5'TMemo'#15'DescriptionMemo'#4'Left'#2
+  +#0#6'Height'#3#192#0#3'Top'#2#0#5'Width'#3'e'#1#5'Align'#7#8'alClient'#13'Li'
+  +'nes.Strings'#1#6#5'Memo1'#0#8'ReadOnly'#9#8'TabOrder'#2#0#0#0#0#9'TGroupBox'
+  +#17'ParameterGroupBox'#4'Left'#2#10#6'Height'#2'1'#3'Top'#3#225#0#5'Width'#3
+  +#29#2#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#17'Param'
+  +'eterGroupBox'#12'ClientHeight'#2#31#11'ClientWidth'#3#25#2#8'TabOrder'#2#2#0
+  +#5'TEdit'#13'ParameterEdit'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#3
+  +#25#2#5'Align'#7#5'alTop'#8'TabOrder'#2#0#4'Text'#6#13'ParameterEdit'#0#0#0
+  +#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Height'#2#26#3'Top'#3#31#1#5
+  +'Width'#3'%'#2#8'TabOrder'#2#3#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#9'Sh'
+  +'owBevel'#8#0#0#0
 ]);
--- a/ide/codemacroselect.pas
+++ b/ide/codemacroselect.pas
@ -32,15 +32,14 @@ interface
 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
  Buttons, SrcEditorIntf, IDEWindowIntf,
-  InputHistory , LazarusIDEStrConsts;
+  InputHistory , LazarusIDEStrConsts, ButtonPanel;

 type

  { TCodeMacroSelectDlg }

  TCodeMacroSelectDlg = class(TForm)
-    CancelButton: TBitBtn;
-    OkButton: TBitBtn;
+    ButtonPanel1: TButtonPanel;
    ParameterEdit: TEdit;
    ParameterGroupBox: TGroupBox;
    MacrosListBox: TListBox;
@ -86,10 +85,8 @@ begin
  Caption:=lisCTSelectCodeMacro;
  MacrosGroupBox.Caption:=lisEdtExtToolMacros;
  DescriptionGroupBox.Caption:=lisToDoLDescription;
-  OkButton.Caption:=lisCTInsertMacro;
-  CancelButton.Caption:=dlgCancel;
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  ButtonPanel1.OkButton.Caption:=lisCTInsertMacro;
+  ButtonPanel1.CancelButton.Caption:=dlgCancel;
  ParameterGroupBox.Caption:=lisCMParameter;
  ParameterEdit.Text:='';
  
--- a/ide/findpalettecomp.lfm
+++ b/ide/findpalettecomp.lfm
@ -9,8 +9,7 @@ object FindPaletteComponentDlg: TFindPaletteComponentDlg
  ClientWidth = 400
  OnCreate = FormCreate
  OnDestroy = FormDestroy
-  ParentFont = False
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object SearchPatternGroupBox: TGroupBox
    Left = 6
    Height = 55
@ -35,61 +34,35 @@ object FindPaletteComponentDlg: TFindPaletteComponentDlg
  end
  object ComponentsGroupBox: TGroupBox
    Left = 6
-    Height = 192
+    Height = 195
    Top = 67
    Width = 388
    Align = alClient
    BorderSpacing.Around = 6
    Caption = 'ComponentsGroupBox'
-    ClientHeight = 174
+    ClientHeight = 177
    ClientWidth = 384
    TabOrder = 1
    object ComponentsListBox: TListBox
-      Height = 174
+      Left = 0
+      Height = 177
+      Top = 0
      Width = 384
      Align = alClient
+      ItemHeight = 0
      OnDblClick = ComponentsListBoxDblClick
      OnDrawItem = ComponentsListBoxDrawItem
      Style = lbOwnerDrawFixed
      TabOrder = 0
    end
  end
-  object BtnPanel: TPanel
-    Height = 35
-    Top = 265
-    Width = 400
-    Align = alBottom
-    AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 35
-    ClientWidth = 400
+  object BtnPanel: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 268
+    Width = 388
    TabOrder = 2
-    object CancelButton: TBitBtn
-      Left = 304
-      Height = 23
-      Top = 6
-      Width = 90
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Cancel = True
-      Caption = 'CancelButton'
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object SelectButton: TBitBtn
-      Left = 211
-      Height = 23
-      Top = 6
-      Width = 87
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'SelectButton'
-      ModalResult = 1
-      NumGlyphs = 0
-      TabOrder = 1
-    end
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
  end
 end
--- a/ide/findpalettecomp.lrs
+++ b/ide/findpalettecomp.lrs
@ -5,27 +5,20 @@ LazarusResources.Add('TFindPaletteComponentDlg','FORMDATA',[
  +#6'Height'#3','#1#3'Top'#3#140#0#5'Width'#3#144#1#13'ActiveControl'#7#11'Pat'
  +'ternEdit'#7'Caption'#6#23'FindPaletteComponentDlg'#12'ClientHeight'#3','#1
  +#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'Form'
-  +'Destroy'#10'ParentFont'#8#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#21'Sear'
-  +'chPatternGroupBox'#4'Left'#2#6#6'Height'#2'7'#3'Top'#2#6#5'Width'#3#132#1#5
-  +'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'SearchPatter'
-  +'nGroupBox'#12'ClientHeight'#2'%'#11'ClientWidth'#3#128#1#8'TabOrder'#2#0#0#5
-  +'TEdit'#11'PatternEdit'#4'Left'#2#8#6'Height'#2#23#3'Top'#2#4#5'Width'#3'm'#1
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7#17'PatternEditC'
-  +'hange'#8'TabOrder'#2#0#4'Text'#6#11'PatternEdit'#0#0#0#9'TGroupBox'#18'Comp'
-  +'onentsGroupBox'#4'Left'#2#6#6'Height'#3#192#0#3'Top'#2'C'#5'Width'#3#132#1#5
-  +'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'Component'
-  +'sGroupBox'#12'ClientHeight'#3#174#0#11'ClientWidth'#3#128#1#8'TabOrder'#2#1
-  +#0#8'TListBox'#17'ComponentsListBox'#6'Height'#3#174#0#5'Width'#3#128#1#5'Al'
-  +'ign'#7#8'alClient'#10'OnDblClick'#7#25'ComponentsListBoxDblClick'#10'OnDraw'
-  +'Item'#7#25'ComponentsListBoxDrawItem'#5'Style'#7#16'lbOwnerDrawFixed'#8'Tab'
-  +'Order'#2#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'#'#3'Top'#3#9#1#5'Width'
-  +#3#144#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12
-  +'ClientHeight'#2'#'#11'ClientWidth'#3#144#1#8'TabOrder'#2#2#0#7'TBitBtn'#12
-  +'CancelButton'#4'Left'#3'0'#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'Z'#5'Alig'
-  +'n'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Ca'
-  +'ption'#6#12'CancelButton'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#0#0#0#7'TBitBtn'#12'SelectButton'#4'Left'#3#211#0#6'Height'#2#23#3'Top'#2#6
-  +#5'Width'#2'W'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#12'SelectButton'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabO'
-  +'rder'#2#1#0#0#0#0
+  +'Destroy'#10'LCLVersion'#6#6'0.9.27'#0#9'TGroupBox'#21'SearchPatternGroupBox'
+  +#4'Left'#2#6#6'Height'#2'7'#3'Top'#2#6#5'Width'#3#132#1#5'Align'#7#5'alTop'
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'SearchPatternGroupBox'#12'Clie'
+  +'ntHeight'#2'%'#11'ClientWidth'#3#128#1#8'TabOrder'#2#0#0#5'TEdit'#11'Patter'
+  +'nEdit'#4'Left'#2#8#6'Height'#2#23#3'Top'#2#4#5'Width'#3'm'#1#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7#17'PatternEditChange'#8'TabOrde'
+  +'r'#2#0#4'Text'#6#11'PatternEdit'#0#0#0#9'TGroupBox'#18'ComponentsGroupBox'#4
+  +'Left'#2#6#6'Height'#3#195#0#3'Top'#2'C'#5'Width'#3#132#1#5'Align'#7#8'alCli'
+  +'ent'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'ComponentsGroupBox'#12'Cl'
+  +'ientHeight'#3#177#0#11'ClientWidth'#3#128#1#8'TabOrder'#2#1#0#8'TListBox'#17
+  +'ComponentsListBox'#4'Left'#2#0#6'Height'#3#177#0#3'Top'#2#0#5'Width'#3#128#1
+  +#5'Align'#7#8'alClient'#10'ItemHeight'#2#0#10'OnDblClick'#7#25'ComponentsLis'
+  +'tBoxDblClick'#10'OnDrawItem'#7#25'ComponentsListBoxDrawItem'#5'Style'#7#16
+  +'lbOwnerDrawFixed'#8'TabOrder'#2#0#0#0#0#12'TButtonPanel'#8'BtnPanel'#4'Left'
+  +#2#6#6'Height'#2#26#3'Top'#3#12#1#5'Width'#3#132#1#8'TabOrder'#2#2#11'ShowBu'
+  +'ttons'#11#4'pbOK'#8'pbCancel'#0#9'ShowBevel'#8#0#0#0
 ]);
--- a/ide/findpalettecomp.pas
+++ b/ide/findpalettecomp.pas
@ -40,20 +40,18 @@ interface
 uses
  Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
  StdCtrls, Buttons, FormEditingIntf, db,
-  LazarusIDEStrConsts, ComponentReg, PackageDefs, ExtCtrls;
+  LazarusIDEStrConsts, ComponentReg, PackageDefs, ExtCtrls, ButtonPanel;

 type

  { TFindPaletteComponentDlg }

  TFindPaletteComponentDlg = class(TForm)
-    CancelButton: TBitBtn;
+    BtnPanel: TButtonPanel;
    ComponentsGroupBox: TGroupBox;
    ComponentsListBox: TListBox;
-    BtnPanel: TPanel;
    PatternEdit: TEdit;
    SearchPatternGroupBox: TGroupBox;
-    SelectButton: TBitBtn;
    procedure ComponentsListBoxDblClick(Sender: TObject);
    procedure ComponentsListBoxDrawItem(Control: TWinControl; Index: Integer;
      ARect: TRect; State: TOwnerDrawState);
@ -90,10 +88,8 @@ procedure TFindPaletteComponentDlg.FormCreate(Sender: TObject);
 begin
  Caption:=lisFPFindPaletteComponent;
  ComponentsGroupBox.Caption:=lisFPComponents;
-  SelectButton.Caption:=lisMenuSelect;
-  CancelButton.Caption:=dlgCancel;
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
-  SelectButton.LoadGlyphFromLazarusResource('btn_ok');
+  BtnPanel.OKButton.Caption:=lisMenuSelect;
+  BtnPanel.CancelButton.Caption:=dlgCancel;

  PatternEdit.Text:='';
  SearchPatternGroupBox.Caption:=lisMenuFind;
--- a/ide/fpdocselectinherited.lfm
+++ b/ide/fpdocselectinherited.lfm
@ -7,52 +7,26 @@ object FPDocSelectInheritedDlg: TFPDocSelectInheritedDlg
  ClientHeight = 75
  ClientWidth = 330
  OnCreate = FormCreate
-  ParentFont = False
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object InheritedComboBox: TComboBox
    Left = 8
    Height = 21
    Top = 8
    Width = 312
    Anchors = [akTop, akLeft, akRight]
+    AutoComplete = False
    ItemHeight = 13
-    MaxLength = -1
+    ItemWidth = 0
    TabOrder = 0
    Text = 'InheritedComboBox'
  end
-  object CancelButton: TBitBtn
-    AnchorSideTop.Control = InheritedComboBox
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 230
-    Height = 23
-    Top = 39
-    Width = 90
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Around = 10
-    Cancel = True
-    Caption = 'CancelButton'
-    ModalResult = 2
-    NumGlyphs = 0
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 43
+    Width = 318
    TabOrder = 1
-  end
-  object OkButton: TBitBtn
-    AnchorSideTop.Control = InheritedComboBox
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = CancelButton
-    Left = 149
-    Height = 23
-    Top = 39
-    Width = 71
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Around = 10
-    Caption = 'OkButton'
-    Default = True
-    ModalResult = 1
-    NumGlyphs = 0
-    TabOrder = 2
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
  end
 end
--- a/ide/fpdocselectinherited.lrs
+++ b/ide/fpdocselectinherited.lrs
@ -4,19 +4,10 @@ LazarusResources.Add('TFPDocSelectInheritedDlg','FORMDATA',[
  'TPF0'#24'TFPDocSelectInheritedDlg'#23'FPDocSelectInheritedDlg'#4'Left'#3#26#1
  +#6'Height'#2'K'#3'Top'#3#158#0#5'Width'#3'J'#1#7'Caption'#6#23'FPDocSelectIn'
  +'heritedDlg'#12'ClientHeight'#2'K'#11'ClientWidth'#3'J'#1#8'OnCreate'#7#10'F'
-  +'ormCreate'#10'ParentFont'#8#10'LCLVersion'#6#6'0.9.25'#0#9'TComboBox'#17'In'
-  +'heritedComboBox'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#8#5'Width'#3'8'#1#7'An'
-  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2#13#9'MaxLength'#2
-  +#255#8'TabOrder'#2#0#4'Text'#6#17'InheritedComboBox'#0#0#7'TBitBtn'#12'Cance'
-  +'lButton'#21'AnchorSideTop.Control'#7#17'InheritedComboBox'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideR'
-  +'ight.Side'#7#9'asrBottom'#4'Left'#3#230#0#6'Height'#2#23#3'Top'#2''''#5'Wid'
-  +'th'#2'Z'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing'
-  +'.Around'#2#10#6'Cancel'#9#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2
-  +#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'OkButton'#21'AnchorSideTo'
-  +'p.Control'#7#17'InheritedComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#12'CancelButton'#4'Left'#3#149#0#6'Height'#2#23#3
-  +'Top'#2''''#5'Width'#2'G'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9
-  +#20'BorderSpacing.Around'#2#10#7'Caption'#6#8'OkButton'#7'Default'#9#11'Moda'
-  +'lResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#0
+  +'ormCreate'#10'LCLVersion'#6#6'0.9.27'#0#9'TComboBox'#17'InheritedComboBox'#4
+  +'Left'#2#8#6'Height'#2#21#3'Top'#2#8#5'Width'#3'8'#1#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#12'AutoComplete'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0
+  +#8'TabOrder'#2#0#4'Text'#6#17'InheritedComboBox'#0#0#12'TButtonPanel'#12'But'
+  +'tonPanel1'#4'Left'#2#6#6'Height'#2#26#3'Top'#2'+'#5'Width'#3'>'#1#8'TabOrde'
+  +'r'#2#1#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#9'ShowBevel'#8#0#0#0
 ]);
--- a/ide/fpdocselectinherited.pas
+++ b/ide/fpdocselectinherited.pas
@ -26,16 +26,15 @@ interface

 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, LazarusIdeStrConsts;
+  Buttons, LazarusIdeStrConsts, ButtonPanel;

 type

  { TFPDocSelectInheritedDlg }

  TFPDocSelectInheritedDlg = class(TForm)
-    CancelButton: TBitBtn;
+    ButtonPanel1: TButtonPanel;
    InheritedComboBox: TComboBox;
-    OkButton: TBitBtn;
    procedure FormCreate(Sender: TObject);
  end;

@ -46,10 +45,8 @@ implementation
 procedure TFPDocSelectInheritedDlg.FormCreate(Sender: TObject);
 begin
  Caption:=rsSelectAnInheritedEntry;
-  OkButton.Caption:=lisOkBtn;
-  CancelButton.Caption:=dlgCancel;
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
+  ButtonPanel1.OKButton.Caption:=lisOkBtn;
+  ButtonPanel1.CancelButton.Caption:=dlgCancel;
 end;

 initialization
--- a/ide/frmcustomapplicationoptions.lfm
+++ b/ide/frmcustomapplicationoptions.lfm
@ -10,9 +10,8 @@ object CustomApplicationOptionsForm: TCustomApplicationOptionsForm
  ClientHeight = 290
  ClientWidth = 460
  OnCreate = FormCreate
-  ParentFont = False
  Position = poScreenCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object LEClassName: TLabel
    Left = 8
    Height = 23
@ -95,6 +94,7 @@ object CustomApplicationOptionsForm: TCustomApplicationOptionsForm
    BorderSpacing.Around = 6
    Caption = '&OK'
    Default = True
+    Kind = bkOK
    ModalResult = 1
    NumGlyphs = 0
    TabOrder = 3
@ -111,7 +111,8 @@ object CustomApplicationOptionsForm: TCustomApplicationOptionsForm
    Anchors = [akRight, akBottom]
    BorderSpacing.Around = 6
    Cancel = True
-    Caption = '&Cancel'
+    Caption = 'Cancel'
+    Kind = bkCancel
    ModalResult = 2
    NumGlyphs = 0
    TabOrder = 4
--- a/ide/frmcustomapplicationoptions.lrs
+++ b/ide/frmcustomapplicationoptions.lrs
@ -5,40 +5,40 @@ LazarusResources.Add('TCustomApplicationOptionsForm','FORMDATA',[
  +'eft'#3#130#1#6'Height'#3'"'#1#3'Top'#3#242#0#5'Width'#3#204#1#13'ActiveCont'
  +'rol'#7#10'EClassName'#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'
  +#7#8'bsDialog'#7'Caption'#6#23'New console application'#12'ClientHeight'#3'"'
-  +#1#11'ClientWidth'#3#204#1#8'OnCreate'#7#10'FormCreate'#10'ParentFont'#8#8'P'
-  +'osition'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#11'LEC'
-  +'lassName'#4'Left'#2#8#6'Height'#2#23#3'Top'#2#8#5'Width'#3#227#0#9'Alignmen'
-  +'t'#7#14'taRightJustify'#8'AutoSize'#8#7'Caption'#6#23'&Application class na'
-  +'me'#12'FocusControl'#7#10'EClassName'#6'Layout'#7#8'tlCenter'#11'ParentColo'
-  +'r'#8#0#0#6'TLabel'#7'LETitle'#4'Left'#2#8#6'Height'#2#23#3'Top'#2'&'#5'Widt'
-  +'h'#3#227#0#9'Alignment'#7#14'taRightJustify'#8'AutoSize'#8#7'Caption'#6#6'&'
-  +'Title'#12'FocusControl'#7#6'ETitle'#6'Layout'#7#8'tlCenter'#11'ParentColor'
-  +#8#0#0#5'TEdit'#10'EClassName'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#3#241#0#6'Height'#2#23#3'Top'#2#8
-  +#5'Width'#3#213#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'AutoSelec'
-  +'t'#9#20'BorderSpacing.Around'#2#6#10'OnKeyPress'#7#18'EClassNameKeyPress'#8
-  +'TabOrder'#2#0#4'Text'#6#14'TMyApplication'#0#0#11'TCheckGroup'#9'CGOptions'
-  +#4'Left'#2#8#6'Height'#3#181#0#3'Top'#2'H'#5'Width'#3#187#1#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#8'AutoSize'#9#7'Cap'
-  +'tion'#6#23'Code generation options'#28'ChildSizing.LeftRightSpacing'#2#6#28
-  +'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'cr'
-  +'sHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousC'
-  +'hildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildS'
-  +'izing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL'
-  +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2
-  +#2#0#0#5'TEdit'#6'ETitle'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
-  +'deRight.Side'#7#9'asrBottom'#4'Left'#3#240#0#6'Height'#2#23#3'Top'#2'&'#5'W'
-  +'idth'#3#214#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'AutoSelect'#9
-  +#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#14'My Application'#0
-  +#0#7'TBitBtn'#3'BOK'#23'AnchorSideRight.Control'#7#7'BCancel'#24'AnchorSideB'
-  +'ottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +'*'#1#6'Height'#2#25#3'Top'#3#3#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'a'
-  +'kBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#11
+  +#1#11'ClientWidth'#3#204#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poS'
+  +'creenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#11'LEClassName'#4'Left'
+  +#2#8#6'Height'#2#23#3'Top'#2#8#5'Width'#3#227#0#9'Alignment'#7#14'taRightJus'
+  +'tify'#8'AutoSize'#8#7'Caption'#6#23'&Application class name'#12'FocusContro'
+  +'l'#7#10'EClassName'#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#6'TLabel'
+  +#7'LETitle'#4'Left'#2#8#6'Height'#2#23#3'Top'#2'&'#5'Width'#3#227#0#9'Alignm'
+  +'ent'#7#14'taRightJustify'#8'AutoSize'#8#7'Caption'#6#6'&Title'#12'FocusCont'
+  +'rol'#7#6'ETitle'#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#5'TEdit'#10
+  +'EClassName'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#3#241#0#6'Height'#2#23#3'Top'#2#8#5'Width'#3#213#0#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'AutoSelect'#9#20'BorderSpaci'
+  +'ng.Around'#2#6#10'OnKeyPress'#7#18'EClassNameKeyPress'#8'TabOrder'#2#0#4'Te'
+  +'xt'#6#14'TMyApplication'#0#0#11'TCheckGroup'#9'CGOptions'#4'Left'#2#8#6'Hei'
+  +'ght'#3#181#0#3'Top'#2'H'#5'Width'#3#187#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#8'AutoFill'#9#8'AutoSize'#9#7'Caption'#6#23'Code gen'
+  +'eration options'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBot'
+  +'tomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildRe'
+  +'size'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Chi'
+  +'ldSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertic'
+  +'al'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopT'
+  +'oBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#2#0#0#5'TEdit'#6
+  +'ETitle'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3#240#0#6'Height'#2#23#3'Top'#2'&'#5'Width'#3#214#0#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'AutoSelect'#9#20'BorderSpacing'
+  +'.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#14'My Application'#0#0#7'TBitBtn'#3
+  +'BOK'#23'AnchorSideRight.Control'#7#7'BCancel'#24'AnchorSideBottom.Control'#7
+  +#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'*'#1#6'Height'#2
+  +#25#3'Top'#3#3#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'Bor'
+  +'derSpacing.Around'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11
  +'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#7'TBitBtn'#7'BCancel'
  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
  +'om'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'a'
  +'srBottom'#4'Left'#3'{'#1#6'Height'#2#25#3'Top'#3#3#1#5'Width'#2'K'#7'Anchor'
  +'s'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'C'
-  +'aption'#6#7'&Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#4#0
-  +#0#0
+  +'aption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2
+  +#0#8'TabOrder'#2#4#0#0#0
 ]);
--- a/ide/frmcustomapplicationoptions.pas
+++ b/ide/frmcustomapplicationoptions.pas
@ -118,9 +118,6 @@ begin

  BOK.Caption:= lisOkBtn;
  BCancel.Caption:= dlgCancel;
-
-  BOK.LoadGlyphFromLazarusResource('btn_ok');
-  BCancel.LoadGlyphFromLazarusResource('btn_cancel');
 end;

 function TCustomApplicationOptionsForm.GetBool(Index: integer): Boolean;
--- a/ide/gotofrm.pas
+++ b/ide/gotofrm.pas
@ -34,9 +34,6 @@ begin
  Caption := lisMenuGotoLine;
  Label1.Caption := lisUEGotoLine;
  Edit1.Caption := '';
-
-  btnOK.LoadGlyphFromLazarusResource('btn_ok');
-  btnCancel.LoadGlyphFromLazarusResource('btn_cancel');
 end;

 procedure TfrmGoto.DoShow;
--- a/ide/helpmanager.lfm
+++ b/ide/helpmanager.lfm
@ -10,20 +10,19 @@ object HelpSelectorDialog: THelpSelectorDialog
  Position = poScreenCenter
  LCLVersion = '0.9.27'
  object NodesGroupBox: TGroupBox
-    AnchorSideBottom.Control = CancelButton
    Left = 6
-    Height = 233
+    Height = 239
    Top = 6
    Width = 488
    Align = alClient
    BorderSpacing.Around = 6
    Caption = 'NodesGroupBox'
-    ClientHeight = 215
+    ClientHeight = 221
    ClientWidth = 484
    TabOrder = 0
    object NodesListBox: TListBox
      Left = 6
-      Height = 203
+      Height = 209
      Top = 6
      Width = 472
      Align = alClient
@ -33,58 +32,13 @@ object HelpSelectorDialog: THelpSelectorDialog
      TabOrder = 0
    end
  end
-  object BtnPanel: TPanel
-    Left = 0
-    Height = 38
-    Top = 245
-    Width = 500
-    Align = alBottom
-    AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 38
-    ClientWidth = 500
+  object BtnPanel: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 251
+    Width = 488
    TabOrder = 1
-    object OKButton: TBitBtn
-      AnchorSideTop.Control = BtnPanel
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = CancelButton
-      AnchorSideBottom.Control = BtnPanel
-      AnchorSideBottom.Side = asrBottom
-      Left = 336
-      Height = 26
-      Top = 6
-      Width = 75
-      Anchors = [akRight, akBottom]
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = '&OK'
-      Constraints.MinWidth = 75
-      Default = True
-      Kind = bkOK
-      ModalResult = 1
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object CancelButton: TBitBtn
-      AnchorSideTop.Control = BtnPanel
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = BtnPanel
-      AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = BtnPanel
-      AnchorSideBottom.Side = asrBottom
-      Left = 417
-      Height = 26
-      Top = 6
-      Width = 77
-      Anchors = [akRight, akBottom]
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'Cancel'
-      Constraints.MinWidth = 75
-      Kind = bkCancel
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 1
-    end
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
  end
 end
--- a/ide/helpmanager.lrs
+++ b/ide/helpmanager.lrs
@ -5,28 +5,13 @@ LazarusResources.Add('THelpSelectorDialog','FORMDATA',[
  +#3#27#1#3'Top'#3#158#1#5'Width'#3#244#1#7'Caption'#6#18'HelpSelectorDialog'
  +#12'ClientHeight'#3#27#1#11'ClientWidth'#3#244#1#7'OnClose'#7#23'HelpSelecto'
  +'rDialogClose'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0
-  +#9'TGroupBox'#13'NodesGroupBox'#24'AnchorSideBottom.Control'#7#12'CancelButt'
-  +'on'#4'Left'#2#6#6'Height'#3#233#0#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#8
-  +'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'NodesGroupBox'#12'Cl'
-  +'ientHeight'#3#215#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TListBox'#12
-  +'NodesListBox'#4'Left'#2#6#6'Height'#3#203#0#3'Top'#2#6#5'Width'#3#216#1#5'A'
-  +'lign'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#0#10'OnDb'
-  +'lClick'#7#20'NodesListBoxDblClick'#8'TabOrder'#2#0#0#0#0#6'TPanel'#8'BtnPan'
-  +'el'#4'Left'#2#0#6'Height'#2'&'#3'Top'#3#245#0#5'Width'#3#244#1#5'Align'#7#8
-  +'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'#11
-  +'ClientWidth'#3#244#1#8'TabOrder'#2#1#0#7'TBitBtn'#8'OKButton'#21'AnchorSide'
-  +'Top.Control'#7#8'BtnPanel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorS'
-  +'ideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#8'BtnPa'
-  +'nel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'P'#1#6'Height'#2#26
-  +#3'Top'#2#6#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'
-  +#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'
-  +#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8
-  +'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#21'AnchorSideTop.Control'#7#8
-  +'BtnPanel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'
-  +#7#8'BtnPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.C'
-  +'ontrol'#7#8'BtnPanel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#161
-  +#1#6'Height'#2#26#3'Top'#2#6#5'Width'#2'M'#7'Anchors'#11#7'akRight'#8'akBott'
-  +'om'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'#20
-  +'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumG'
-  +'lyphs'#2#0#8'TabOrder'#2#1#0#0#0#0
+  +#9'TGroupBox'#13'NodesGroupBox'#4'Left'#2#6#6'Height'#3#239#0#3'Top'#2#6#5'W'
+  +'idth'#3#232#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#13'NodesGroupBox'#12'ClientHeight'#3#221#0#11'ClientWidth'#3#228#1#8'TabO'
+  +'rder'#2#0#0#8'TListBox'#12'NodesListBox'#4'Left'#2#6#6'Height'#3#209#0#3'To'
+  +'p'#2#6#5'Width'#3#216#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6
+  +#10'ItemHeight'#2#0#10'OnDblClick'#7#20'NodesListBoxDblClick'#8'TabOrder'#2#0
+  +#0#0#0#12'TButtonPanel'#8'BtnPanel'#4'Left'#2#6#6'Height'#2#26#3'Top'#3#251#0
+  +#5'Width'#3#232#1#8'TabOrder'#2#1#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#9
+  +'ShowBevel'#8#0#0#0
 ]);
--- a/ide/helpmanager.pas
+++ b/ide/helpmanager.pas
@ -47,7 +47,7 @@ uses
  LazarusIDEStrConsts, TransferMacros, DialogProcs, IDEOptionDefs,
  ObjInspExt, EnvironmentOpts, AboutFrm, MsgView, Project, PackageDefs, MainBar,
  OutputFilter, HelpOptions, MainIntf, LazConf, HelpFPCMessages, CodeHelp,
-  IDEContextHelpEdit;
+  IDEContextHelpEdit, ButtonPanel;

 type

@ -189,11 +189,9 @@ type
  { THelpSelectorDialog }
  
  THelpSelectorDialog = class(TForm)
-    OKButton: TBitBtn;
-    CancelButton: TBitBtn;
+    BtnPanel: TButtonPanel;
    NodesGroupBox: TGroupBox;
    NodesListBox: TListBox;
-    BtnPanel: TPanel;
    procedure HelpSelectorDialogClose(Sender: TObject;
      var CloseAction: TCloseAction);
    procedure NodesListBoxDblClick(Sender: TObject);
@ -583,10 +581,8 @@ begin

  Caption := lisHelpSelectorDialog;
  NodesGroupBox.Caption:=lisSelectAHelpItem;
-  OkButton.Caption:=lisLazBuildOk;
-  CancelButton.Caption:=dlgCancel;
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  BtnPanel.OKButton.Caption:=lisLazBuildOk;
+  BtnPanel.CancelButton.Caption:=dlgCancel;
 end;

 { TIDEHelpDatabases }
--- a/ide/imexportcompileropts.lfm
+++ b/ide/imexportcompileropts.lfm
@ -8,8 +8,7 @@ object ImExportCompOptsDlg: TImExportCompOptsDlg
  ClientWidth = 554
  OnClose = ImExportCompOptsDlgCLOSE
  OnCreate = ImExportCompOptsDlgCREATE
-  ParentFont = False
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object OpenRecentGroupbox: TGroupBox
    Left = 8
    Height = 176
@ -19,14 +18,16 @@ object ImExportCompOptsDlg: TImExportCompOptsDlg
    Caption = 'OpenRecentGroupbox'
    ClientHeight = 158
    ClientWidth = 532
-    ParentCtl3D = False
    TabOrder = 0
    object RecentListbox: TListBox
+      Left = 0
      Height = 120
+      Top = 0
      Width = 532
      Align = alTop
      Anchors = [akTop, akLeft, akBottom]
      ClickOnSelChange = False
+      ItemHeight = 0
      OnClick = RecentListboxCLICK
      OnDblClick = RecentListboxDBLCLICK
      TabOrder = 0
@ -80,7 +81,9 @@ object ImExportCompOptsDlg: TImExportCompOptsDlg
    Top = 200
    Width = 110
    Anchors = [akLeft, akBottom]
-    Caption = 'CancelButton'
+    Cancel = True
+    Caption = 'Cancel'
+    Kind = bkCancel
    ModalResult = 2
    NumGlyphs = 0
    TabOrder = 3
--- a/ide/imexportcompileropts.lrs
+++ b/ide/imexportcompileropts.lrs
@ -4,28 +4,28 @@ LazarusResources.Add('TImExportCompOptsDlg','FORMDATA',[
  'TPF0'#20'TImExportCompOptsDlg'#19'ImExportCompOptsDlg'#4'Left'#3'<'#1#6'Heig'
  +'ht'#3#235#0#3'Top'#3#212#0#5'Width'#3'*'#2#7'Caption'#6#19'ImExportCompOpts'
  +'Dlg'#12'ClientHeight'#3#235#0#11'ClientWidth'#3'*'#2#7'OnClose'#7#24'ImExpo'
-  +'rtCompOptsDlgCLOSE'#8'OnCreate'#7#25'ImExportCompOptsDlgCREATE'#10'ParentFo'
-  +'nt'#8#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#18'OpenRecentGroupbox'#4'Le'
-  +'ft'#2#8#6'Height'#3#176#0#3'Top'#2#8#5'Width'#3#24#2#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#18'OpenRecentGroupbox'#12'C'
-  +'lientHeight'#3#158#0#11'ClientWidth'#3#20#2#11'ParentCtl3D'#8#8'TabOrder'#2
-  +#0#0#8'TListBox'#13'RecentListbox'#6'Height'#2'x'#5'Width'#3#20#2#5'Align'#7
-  +#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#16'ClickOnSelChange'
-  +#8#7'OnClick'#7#18'RecentListboxCLICK'#10'OnDblClick'#7#21'RecentListboxDBLC'
-  +'LICK'#8'TabOrder'#2#0#0#0#7'TButton'#16'OpenRecentButton'#4'Left'#2#9#6'Hei'
-  +'ght'#2#25#3'Top'#3#128#0#5'Width'#3#150#0#7'Anchors'#11#6'akLeft'#8'akBotto'
-  +'m'#0#7'Caption'#6#16'OpenRecentButton'#7'OnClick'#7#21'OpenRecentButtonCLIC'
-  +'K'#8'TabOrder'#2#1#0#0#7'TButton'#18'SaveToRecentButton'#4'Left'#3#182#0#6
-  +'Height'#2#25#3'Top'#3#128#0#5'Width'#3#150#0#7'Anchors'#11#6'akLeft'#8'akBo'
-  +'ttom'#0#7'Caption'#6#18'SaveToRecentButton'#7'OnClick'#7#23'SaveToRecentBut'
-  +'tonCLICK'#8'TabOrder'#2#2#0#0#0#7'TBitBtn'#10'OpenButton'#4'Left'#2#8#6'Hei'
-  +'ght'#2#25#3'Top'#3#200#0#5'Width'#3#167#0#7'Anchors'#11#6'akLeft'#8'akBotto'
-  +'m'#0#7'Caption'#6#10'OpenButton'#9'NumGlyphs'#2#0#7'OnClick'#7#15'OpenButto'
-  +'nCLICK'#8'TabOrder'#2#1#0#0#7'TBitBtn'#10'SaveButton'#4'Left'#3#214#0#6'Hei'
-  +'ght'#2#25#3'Top'#3#200#0#5'Width'#3#167#0#7'Anchors'#11#6'akLeft'#8'akBotto'
-  +'m'#0#7'Caption'#6#10'SaveButton'#9'NumGlyphs'#2#0#7'OnClick'#7#15'SaveButto'
-  +'nCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#4'Left'#3#176#1#6'H'
-  +'eight'#2#25#3'Top'#3#200#0#5'Width'#2'n'#7'Anchors'#11#6'akLeft'#8'akBottom'
-  +#0#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabO'
-  +'rder'#2#3#0#0#0
+  +'rtCompOptsDlgCLOSE'#8'OnCreate'#7#25'ImExportCompOptsDlgCREATE'#10'LCLVersi'
+  +'on'#6#6'0.9.27'#0#9'TGroupBox'#18'OpenRecentGroupbox'#4'Left'#2#8#6'Height'
+  +#3#176#0#3'Top'#2#8#5'Width'#3#24#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
+  +'ht'#8'akBottom'#0#7'Caption'#6#18'OpenRecentGroupbox'#12'ClientHeight'#3#158
+  +#0#11'ClientWidth'#3#20#2#8'TabOrder'#2#0#0#8'TListBox'#13'RecentListbox'#4
+  +'Left'#2#0#6'Height'#2'x'#3'Top'#2#0#5'Width'#3#20#2#5'Align'#7#5'alTop'#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#16'ClickOnSelChange'#8#10'ItemH'
+  +'eight'#2#0#7'OnClick'#7#18'RecentListboxCLICK'#10'OnDblClick'#7#21'RecentLi'
+  +'stboxDBLCLICK'#8'TabOrder'#2#0#0#0#7'TButton'#16'OpenRecentButton'#4'Left'#2
+  +#9#6'Height'#2#25#3'Top'#3#128#0#5'Width'#3#150#0#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#7'Caption'#6#16'OpenRecentButton'#7'OnClick'#7#21'OpenRecentBut'
+  +'tonCLICK'#8'TabOrder'#2#1#0#0#7'TButton'#18'SaveToRecentButton'#4'Left'#3
+  +#182#0#6'Height'#2#25#3'Top'#3#128#0#5'Width'#3#150#0#7'Anchors'#11#6'akLeft'
+  +#8'akBottom'#0#7'Caption'#6#18'SaveToRecentButton'#7'OnClick'#7#23'SaveToRec'
+  +'entButtonCLICK'#8'TabOrder'#2#2#0#0#0#7'TBitBtn'#10'OpenButton'#4'Left'#2#8
+  +#6'Height'#2#25#3'Top'#3#200#0#5'Width'#3#167#0#7'Anchors'#11#6'akLeft'#8'ak'
+  +'Bottom'#0#7'Caption'#6#10'OpenButton'#9'NumGlyphs'#2#0#7'OnClick'#7#15'Open'
+  +'ButtonCLICK'#8'TabOrder'#2#1#0#0#7'TBitBtn'#10'SaveButton'#4'Left'#3#214#0#6
+  +'Height'#2#25#3'Top'#3#200#0#5'Width'#3#167#0#7'Anchors'#11#6'akLeft'#8'akBo'
+  +'ttom'#0#7'Caption'#6#10'SaveButton'#9'NumGlyphs'#2#0#7'OnClick'#7#15'SaveBu'
+  +'ttonCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#4'Left'#3#176#1#6
+  +'Height'#2#25#3'Top'#3#200#0#5'Width'#2'n'#7'Anchors'#11#6'akLeft'#8'akBotto'
+  +'m'#0#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResul'
+  +'t'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#0
 ]);
--- a/ide/imexportcompileropts.pas
+++ b/ide/imexportcompileropts.pas
@ -231,7 +231,6 @@ begin
  SaveButton.Caption:=lisIECOSaveToFile;
  OpenButton.Caption:=lisIECOLoadFromFile;
  CancelButton.Caption:=dlgCancel;
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
  OpenButton.LoadGlyphFromLazarusResource('laz_open');
  SaveButton.LoadGlyphFromLazarusResource('menu_save');
  LoadRecentList;
--- a/ide/patheditordlg.lfm
+++ b/ide/patheditordlg.lfm
@ -11,7 +11,6 @@ object PathEditorDialog: TPathEditorDialog
  Constraints.MinWidth = 500
  OnCreate = FormCreate
  OnResize = FormResize
-  ParentFont = False
  Position = poScreenCenter
  LCLVersion = '0.9.27'
  object PathGroupBox: TGroupBox
@ -45,11 +44,14 @@ object PathEditorDialog: TPathEditorDialog
      Font.Height = -16
      Font.Name = 'courier'
      Font.Pitch = fpFixed
+      Font.Quality = fqNonAntialiased
      ParentColor = False
      ParentFont = False
      TabOrder = 0
      BookMarkOptions.Xoffset = -18
+      BookMarkOptions.OnChange = nil
      Gutter.Visible = False
+      Gutter.Width = 0
      Keystrokes = <      
        item
          Command = 3
@ -375,6 +377,33 @@ object PathEditorDialog: TPathEditorDialog
        'PathEdit'
      )
      Options = [eoDragDropEditing, eoHalfPageScroll, eoScrollByOneLess, eoScrollPastEol, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces, eoBracketHighlight, eoHideRightMargin]
+      BracketHighlightStyle = sbhsBoth
+      object TSynGutterPartList
+        object TSynGutterMarks
+          Width = 23
+        end
+        object TSynGutterLineNumber
+          Width = 17
+          MarkupInfo.Background = clBtnFace
+          MarkupInfo.Foreground = clNone
+          DigitCount = 2
+          ShowOnlyLineNumbersMultiplesOf = 1
+          ZeroStart = False
+          LeadingZeros = False
+        end
+        object TSynGutterChanges
+          Width = 4
+          ModifiedColor = 59900
+          SavedColor = clGreen
+        end
+        object TSynGutterSeparator
+          Width = 2
+        end
+        object TSynGutterCodeFolding
+          MarkupInfo.Background = clNone
+          MarkupInfo.Foreground = clGray
+        end
+      end
    end
    object MoveUpButton: TBitBtn
      AnchorSideLeft.Control = PathGroupBox
@ -475,6 +504,7 @@ object PathEditorDialog: TPathEditorDialog
      Width = 472
      Anchors = [akTop, akLeft, akRight, akBottom]
      BorderSpacing.Around = 6
+      ItemHeight = 0
      MultiSelect = True
      OnDblClick = TemplatesListBoxDblClick
      TabOrder = 0
@ -500,10 +530,10 @@ object PathEditorDialog: TPathEditorDialog
    AnchorSideRight.Control = CancelBitBtn
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 362
+    Left = 345
    Height = 26
    Top = 368
-    Width = 55
+    Width = 60
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Around = 6
@ -519,10 +549,10 @@ object PathEditorDialog: TPathEditorDialog
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 423
+    Left = 411
    Height = 26
    Top = 368
-    Width = 71
+    Width = 83
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Around = 6
--- a/ide/patheditordlg.lrs
+++ b/ide/patheditordlg.lrs
@ -5,34 +5,35 @@ LazarusResources.Add('TPathEditorDialog','FORMDATA',[
  +#144#1#3'Top'#3#158#0#5'Width'#3#244#1#13'ActiveControl'#7#16'TemplatesListB'
  +'ox'#7'Caption'#6#16'PathEditorDialog'#12'ClientHeight'#3#144#1#11'ClientWid'
  +'th'#3#244#1#21'Constraints.MinHeight'#3#144#1#20'Constraints.MinWidth'#3#244
-  +#1#8'OnCreate'#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#10'ParentFont'#8
-  +#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TGroupBox'
-  +#12'PathGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
-  +'trol'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.'
-  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#232
-  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6
-  +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'PathG'
-  +'roupBox'#12'ClientHeight'#3#176#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0
-  +#8'TSynEdit'#8'PathEdit'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#21'An'
-  +'chorSideTop.Control'#7#12'PathGroupBox'#23'AnchorSideRight.Control'#7#12'Pa'
-  +'thGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3
-  +#129#0#3'Top'#2#6#5'Width'#3#216#1#20'BorderSpacing.Around'#2#6#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Na'
-  +'me'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#10'ParentFon'
-  +'t'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8
-  +#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'S'
-  +'hortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8
-  +'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0
-  +#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8
-  +'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8
-  +'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8
-  +'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
-  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
-  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
-  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
-  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
-  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
-  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
+  +#1#8'OnCreate'#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TGroupBox'#12'PathGroupBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#232#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+  +'.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'PathGroupBox'#12'Clie'
+  +'ntHeight'#3#176#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TSynEdit'#8'P'
+  +'athEdit'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#21'AnchorSideTop.Con'
+  +'trol'#7#12'PathGroupBox'#23'AnchorSideRight.Control'#7#12'PathGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#129#0#3'Top'#2
+  +#6#5'Width'#3#216#1#20'BorderSpacing.Around'#2#6#7'Anchors'#11#5'akTop'#6'ak'
+  +'Left'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'couri'
+  +'er'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11
+  +'ParentColor'#8#10'ParentFont'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'
+  +#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter.Visible'#8#12'Gutter.Width'
+  +#2#0#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'
+  +#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2
+  +#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3
+  +#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2
+  +'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2
+  +'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2
+  +'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2
+  +'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2
+  +'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2
+  +'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'
+  +#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'
+  +#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8
+  +'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
@ -64,63 +65,71 @@ LazarusResources.Add('TPathEditorDialog','FORMDATA',[
  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
  +#0#0#13'Lines.Strings'#1#6#8'PathEdit'#0#7'Options'#11#17'eoDragDropEditing'
  +#16'eoHalfPageScroll'#17'eoScrollByOneLess'#15'eoScrollPastEol'#11'eoSmartTa'
-  +'bs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'#18'eoBracketHighlight'#17'e'
-  ,'oHideRightMargin'#0#0#0#7'TBitBtn'#12'MoveUpButton'#22'AnchorSideLeft.Contr'
-  +'ol'#7#12'PathGroupBox'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'A'
-  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#147
-  +#0#5'Width'#2'a'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#12'MoveUpButton'#9'NumGlyphs'#2#0#7'OnCl'
-  +'ick'#7#17'MoveUpButtonClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#14'MoveDownButt'
-  +'on'#22'AnchorSideLeft.Control'#7#12'MoveUpButton'#19'AnchorSideLeft.Side'#7
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideB'
-  +'ottom.Side'#7#9'asrBottom'#4'Left'#2'm'#6'Height'#2#23#3'Top'#3#147#0#5'Wid'
-  +'th'#2'o'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#14'MoveDownButton'#9'NumGlyphs'#2#0#7'OnClick'#7
-  +#19'MoveDownButtonClick'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'BrowseButton'#22
-  +'AnchorSideLeft.Control'#7#14'MoveDownButton'#19'AnchorSideLeft.Side'#7#9'as'
-  +'rBottom'#21'AnchorSideTop.Control'#7#14'MoveDownButton'#24'AnchorSideBottom'
-  +'.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3#226#0#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2']'#7'Anchors'#11#5'akTo'
-  +'p'#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#19'Bord'
-  +'erSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#12'BrowseBut'
-  +'ton'#9'NumGlyphs'#2#0#7'OnClick'#7#17'BrowseButtonClick'#8'TabOrder'#2#3#0#0
-  +#7'TBitBtn'#12'DeleteButton'#22'AnchorSideLeft.Control'#7#12'BrowseButton'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathG'
-  +'roupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'E'#1#6'Height'#2
-  +#23#3'Top'#3#147#0#5'Width'#2'Y'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'Aut'
-  +'oSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'DeleteButton'#9'NumGl'
-  +'yphs'#2#0#7'OnClick'#7#17'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TGroup'
-  +'Box'#16'TemplateGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
-  +'deTop.Control'#7#12'PathGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#24'AnchorSideBottom.Control'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#156#0#3
-  +'Top'#3#206#0#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'
-  +#12'ClientHeight'#3#138#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListB'
-  +'ox'#16'TemplatesListBox'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'
-  +#21'AnchorSideTop.Control'#7#16'TemplateGroupBox'#23'AnchorSideRight.Control'
-  +#7#16'TemplateGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2'['#3'Top'#2#6#5'Width'#3#216#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#10'On'
-  +'DblClick'#7#24'TemplatesListBoxDblClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#17
-  +'AddTemplateButton'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#24'Anc'
-  +'horSideBottom.Control'#7#16'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'm'#5'Width'#2'y'#7'Anchors'
-  +#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#17'AddTemplateButton'#9'NumGlyphs'#2#0#7'OnClick'#7#22'AddTemplateB'
-  +'uttonClick'#8'TabOrder'#2#1#0#0#0#7'TBitBtn'#8'OKBitBtn'#23'AnchorSideRight'
-  +'.Control'#7#12'CancelBitBtn'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
-  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3'j'#1#6'Height'#2#26#3'Top'#3'p'
-  +#1#5'Width'#2'7'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#7'Caption'#6#5'&'#195#142#195#138#7'Default'#9#4'Kin'
-  +'d'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBi'
-  +'tBtn'#12'CancelBitBtn'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide'
-  +'Right.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Ancho'
-  +'rSideBottom.Side'#7#9'asrBottom'#4'Left'#3#167#1#6'Height'#2#26#3'Top'#3'p'
-  +#1#5'Width'#2'G'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#12#195#142#195#178#195#172
-  +#195#165#195#173#195#160#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyp'
-  +'hs'#2#0#8'TabOrder'#2#3#0#0#22'TSelectDirectoryDialog'#12'BrowseDialog'#7'O'
-  +'ptions'#11#15'ofFileMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'
-  +#3#184#1#3'top'#3#168#0#0#0#0
+  ,'bs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'#18'eoBracketHighlight'#17'e'
+  +'oHideRightMargin'#0#21'BracketHighlightStyle'#7#8'sbhsBoth'#0#18'TSynGutter'
+  +'PartList'#0#0#15'TSynGutterMarks'#0#5'Width'#2#23#0#0#20'TSynGutterLineNumb'
+  +'er'#0#5'Width'#2#17#21'MarkupInfo.Background'#7#9'clBtnFace'#21'MarkupInfo.'
+  +'Foreground'#7#6'clNone'#10'DigitCount'#2#2#30'ShowOnlyLineNumbersMultiplesO'
+  +'f'#2#1#9'ZeroStart'#8#12'LeadingZeros'#8#0#0#17'TSynGutterChanges'#0#5'Widt'
+  +'h'#2#4#13'ModifiedColor'#4#252#233#0#0#10'SavedColor'#7#7'clGreen'#0#0#19'T'
+  +'SynGutterSeparator'#0#5'Width'#2#2#0#0#21'TSynGutterCodeFolding'#0#21'Marku'
+  +'pInfo.Background'#7#6'clNone'#21'MarkupInfo.Foreground'#7#6'clGray'#0#0#0#0
+  +#7'TBitBtn'#12'MoveUpButton'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#24
+  +'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2'a'#7'Anchor'
+  +'s'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#12'MoveUpButton'#9'NumGlyphs'#2#0#7'OnClick'#7#17'MoveUpButtonCl'
+  +'ick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#14'MoveDownButton'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#12'MoveUpButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorS'
+  +'ideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBott'
+  +'om'#4'Left'#2'm'#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2'o'#7'Anchors'#11#6
+  +'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#14'MoveDownButton'#9'NumGlyphs'#2#0#7'OnClick'#7#19'MoveDownButtonClick'#8
+  +'TabOrder'#2#2#0#0#7'TBitBtn'#12'BrowseButton'#22'AnchorSideLeft.Control'#7
+  +#14'MoveDownButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.'
+  +'Control'#7#14'MoveDownButton'#24'AnchorSideBottom.Control'#7#12'PathGroupBo'
+  +'x'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#226#0#6'Height'#2#23#3
+  +'Top'#3#147#0#5'Width'#2']'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8
+  +'AutoSize'#9#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'Borde'
+  +'rSpacing.Bottom'#2#6#7'Caption'#6#12'BrowseButton'#9'NumGlyphs'#2#0#7'OnCli'
+  +'ck'#7#17'BrowseButtonClick'#8'TabOrder'#2#3#0#0#7'TBitBtn'#12'DeleteButton'
+  +#22'AnchorSideLeft.Control'#7#12'BrowseButton'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBott'
+  +'om.Side'#7#9'asrBottom'#4'Left'#3'E'#1#6'Height'#2#23#3'Top'#3#147#0#5'Widt'
+  +'h'#2'Y'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#12'DeleteButton'#9'NumGlyphs'#2#0#7'OnClick'#7#17
+  +'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#16'TemplateGroupBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#12'PathGr'
+  +'oupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+  +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
+  +'l'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#156#0#3'Top'#3#206#0#5'Width'#3#232
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'#12'ClientHeight'#3#138#0#11
+  +'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListBox'#16'TemplatesListBox'#22
+  +'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#21'AnchorSideTop.Control'#7
+  +#16'TemplateGroupBox'#23'AnchorSideRight.Control'#7#16'TemplateGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'['#3'Top'#2#6#5
+  +'Width'#3#216#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20
+  +'BorderSpacing.Around'#2#6#10'ItemHeight'#2#0#11'MultiSelect'#9#10'OnDblClic'
+  +'k'#7#24'TemplatesListBoxDblClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#17'AddTemp'
+  +'lateButton'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSide'
+  +'Bottom.Control'#7#16'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'm'#5'Width'#2'y'#7'Anchors'#11#6'a'
+  +'kLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#17'AddTemplateButton'#9'NumGlyphs'#2#0#7'OnClick'#7#22'AddTemplateButtonCli'
+  +'ck'#8'TabOrder'#2#1#0#0#0#7'TBitBtn'#8'OKBitBtn'#23'AnchorSideRight.Control'
+  +#7#12'CancelBitBtn'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBot'
+  +'tom.Side'#7#9'asrBottom'#4'Left'#3'Y'#1#6'Height'#2#26#3'Top'#3'p'#1#5'Widt'
+  +'h'#2'<'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#5'&'#208#158#208#154#7'Default'#9#4'Kind'#7#4'b'
+  +'kOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12
+  +'CancelBitBtn'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Sid'
+  +'e'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBott'
+  +'om.Side'#7#9'asrBottom'#4'Left'#3#155#1#6'Height'#2#26#3'Top'#3'p'#1#5'Widt'
+  +'h'#2'S'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpaci'
+  +'ng.Around'#2#6#6'Cancel'#9#7'Caption'#6#12#208#158#209#130#208#188#208#181
+  +#208#189#208#176#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8
+  ,'TabOrder'#2#3#0#0#22'TSelectDirectoryDialog'#12'BrowseDialog'#7'Options'#11
+  +#15'ofFileMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'#3#184#1#3
+  +'top'#3#168#0#0#0#0
 ]);
--- a/ide/patheditordlg.pas
+++ b/ide/patheditordlg.pas
@ -154,8 +154,6 @@ begin

  OKBitBtn.Caption:=lisOkBtn;
  CancelBitBtn.Caption:=dlgCancel;
-  OKBitBtn.LoadGlyphFromLazarusResource('btn_ok');
-  CancelBitBtn.LoadGlyphFromLazarusResource('btn_cancel');
  AddTemplateButton.LoadGlyphFromLazarusResource('laz_add');
  MoveUpButton.LoadGlyphFromLazarusResource('arrow_up');
  MoveDownButton.LoadGlyphFromLazarusResource('arrow_down');
--- a/ide/progressdlg.lfm
+++ b/ide/progressdlg.lfm
@ -8,9 +8,8 @@ object IDEProgressDialog: TIDEProgressDialog
  ClientWidth = 400
  OnCreate = FormCreate
  OnDestroy = FormDestroy
-  ParentFont = False
  Position = poScreenCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object DescriptionLabel: TLabel
    Left = 152
    Height = 13
@ -28,7 +27,6 @@ object IDEProgressDialog: TIDEProgressDialog
    Top = 64
    Width = 370
    Anchors = [akTop]
-    Max = 100
    TabOrder = 0
  end
  object AbortButton: TBitBtn
@ -37,7 +35,9 @@ object IDEProgressDialog: TIDEProgressDialog
    Top = 92
    Width = 139
    Anchors = [akBottom]
-    Caption = 'AbortButton'
+    Cancel = True
+    Caption = 'Cancel'
+    Kind = bkCancel
    ModalResult = 3
    NumGlyphs = 0
    TabOrder = 1
--- a/ide/progressdlg.lrs
+++ b/ide/progressdlg.lrs
@ -4,13 +4,13 @@ LazarusResources.Add('TIDEProgressDialog','FORMDATA',[
  'TPF0'#18'TIDEProgressDialog'#17'IDEProgressDialog'#4'Left'#3#30#1#6'Height'#3
  +#132#0#3'Top'#3#202#0#5'Width'#3#144#1#7'Caption'#6#17'IDEProgressDialog'#12
  +'ClientHeight'#3#132#0#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#9
-  +'OnDestroy'#7#11'FormDestroy'#10'ParentFont'#8#8'Position'#7#14'poScreenCent'
-  +'er'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#16'DescriptionLabel'#4'Left'#3
-  +#152#0#6'Height'#2#13#3'Top'#2#16#5'Width'#2'_'#7'Anchors'#11#5'akTop'#0#8'A'
-  +'utoSize'#8#7'Caption'#6#16'DescriptionLabel'#11'ParentColor'#8#8'WordWrap'#9
-  +#0#0#12'TProgressBar'#11'ProgressBar'#4'Left'#2#15#6'Height'#2#20#3'Top'#2'@'
-  +#5'Width'#3'r'#1#7'Anchors'#11#5'akTop'#0#3'Max'#2'd'#8'TabOrder'#2#0#0#0#7
-  +'TBitBtn'#11'AbortButton'#4'Left'#3#130#0#6'Height'#2'!'#3'Top'#2'\'#5'Width'
-  +#3#139#0#7'Anchors'#11#8'akBottom'#0#7'Caption'#6#11'AbortButton'#11'ModalRe'
-  +'sult'#2#3#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0
+  +'OnDestroy'#7#11'FormDestroy'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'
+  +#6#6'0.9.27'#0#6'TLabel'#16'DescriptionLabel'#4'Left'#3#152#0#6'Height'#2#13
+  +#3'Top'#2#16#5'Width'#2'_'#7'Anchors'#11#5'akTop'#0#8'AutoSize'#8#7'Caption'
+  +#6#16'DescriptionLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#12'TProgressBar'
+  +#11'ProgressBar'#4'Left'#2#15#6'Height'#2#20#3'Top'#2'@'#5'Width'#3'r'#1#7'A'
+  +'nchors'#11#5'akTop'#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#11'AbortButton'#4'Left'
+  +#3#130#0#6'Height'#2'!'#3'Top'#2'\'#5'Width'#3#139#0#7'Anchors'#11#8'akBotto'
+  +'m'#0#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResul'
+  +'t'#2#3#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0
 ]);
--- a/ide/progressdlg.pas
+++ b/ide/progressdlg.pas
@ -130,7 +130,6 @@ begin
  Caption:=lisPDProgress;
  DescriptionLabel.Caption:='...';
  AbortButton.Caption:=lisPDAbort;
-  AbortButton.LoadGlyphFromLazarusResource('btn_cancel');

  Application.AddOnIdleHandler(@ApplicationIdle);
 end;
--- a/ide/searchfrm.lfm
+++ b/ide/searchfrm.lfm
@ -9,11 +9,12 @@ object SearchForm: TSearchForm
  ClientWidth = 428
  OnCreate = SearchFormCREATE
  OnDestroy = SearchFormDESTROY
-  ParentFont = False
  Position = poOwnerFormCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
  object Panel2: TPanel
+    Left = 0
    Height = 149
+    Top = 0
    Width = 428
    Align = alClient
    BevelInner = bvLowered
@ -22,7 +23,6 @@ object SearchForm: TSearchForm
    FullRepaint = False
    TabOrder = 0
    TabStop = True
-    OnClick = Panel2Click
    object lblMatches: TLabel
      Left = 121
      Height = 14
@ -76,12 +76,14 @@ object SearchForm: TSearchForm
    end
    object btnCancel: TBitBtn
      Left = 177
-      Height = 23
+      Height = 26
      Top = 112
-      Width = 58
+      Width = 77
      AutoSize = True
+      Cancel = True
      Caption = 'Cancel'
-      Default = True
+      Kind = bkCancel
+      ModalResult = 2
      NumGlyphs = 0
      OnClick = btnAbortCLICK
      TabOrder = 0
--- a/ide/searchfrm.lrs
+++ b/ide/searchfrm.lrs
@ -4,25 +4,25 @@ LazarusResources.Add('TSearchForm','FORMDATA',[
  'TPF0'#11'TSearchForm'#10'SearchForm'#4'Left'#3#166#1#6'Height'#3#149#0#3'Top'
  +#3#11#1#5'Width'#3#172#1#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#13'Searc'
  +'hing....'#12'ClientHeight'#3#149#0#11'ClientWidth'#3#172#1#8'OnCreate'#7#16
-  +'SearchFormCREATE'#9'OnDestroy'#7#17'SearchFormDESTROY'#10'ParentFont'#8#8'P'
-  +'osition'#7#17'poOwnerFormCenter'#10'LCLVersion'#6#6'0.9.25'#0#6'TPanel'#6'P'
-  +'anel2'#6'Height'#3#149#0#5'Width'#3#172#1#5'Align'#7#8'alClient'#10'BevelIn'
-  +'ner'#7#9'bvLowered'#12'ClientHeight'#3#149#0#11'ClientWidth'#3#172#1#11'Ful'
-  +'lRepaint'#8#8'TabOrder'#2#0#7'TabStop'#9#7'OnClick'#7#11'Panel2Click'#0#6'T'
-  +'Label'#10'lblMatches'#4'Left'#2'y'#6'Height'#2#14#3'Top'#2'P'#5'Width'#2#1
-  +#11'ParentColor'#8#0#0#6'TLabel'#12'MatchesLabel'#21'AnchorSideTop.Control'#7
-  +#10'lblMatches'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'
-  +#2#14#3'Top'#2'P'#5'Width'#2')'#7'Caption'#6#7'Matches'#11'ParentColor'#8#0#0
-  +#6'TLabel'#11'lblProgress'#4'Left'#2'y'#6'Height'#2#14#3'Top'#2'0'#5'Width'#2
-  +#1#11'ParentColor'#8#0#0#6'TLabel'#14'SearchingLabel'#21'AnchorSideTop.Contr'
-  +'ol'#7#11'lblProgress'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6
-  +'Height'#2#14#3'Top'#2'0'#5'Width'#2'4'#7'Caption'#6#10'Searching:'#11'Paren'
-  +'tColor'#8#0#0#6'TLabel'#15'SearchTextLabel'#21'AnchorSideTop.Control'#7#13
-  +'lblSearchText'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'
-  +#2#14#3'Top'#2#16#5'Width'#2'?'#7'Caption'#6#12'Search Text:'#11'ParentColor'
-  +#8#0#0#6'TLabel'#13'lblSearchText'#4'Left'#2'y'#6'Height'#2#14#3'Top'#2#16#5
-  +'Width'#2#1#11'ParentColor'#8#0#0#7'TBitBtn'#9'btnCancel'#4'Left'#3#177#0#6
-  +'Height'#2#23#3'Top'#2'p'#5'Width'#2':'#8'AutoSize'#9#7'Caption'#6#6'Cancel'
-  +#7'Default'#9#9'NumGlyphs'#2#0#7'OnClick'#7#13'btnAbortCLICK'#8'TabOrder'#2#0
-  +#0#0#0#0
+  +'SearchFormCREATE'#9'OnDestroy'#7#17'SearchFormDESTROY'#8'Position'#7#17'poO'
+  +'wnerFormCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TPanel'#6'Panel2'#4'Left'#2#0
+  +#6'Height'#3#149#0#3'Top'#2#0#5'Width'#3#172#1#5'Align'#7#8'alClient'#10'Bev'
+  +'elInner'#7#9'bvLowered'#12'ClientHeight'#3#149#0#11'ClientWidth'#3#172#1#11
+  +'FullRepaint'#8#8'TabOrder'#2#0#7'TabStop'#9#0#6'TLabel'#10'lblMatches'#4'Le'
+  +'ft'#2'y'#6'Height'#2#14#3'Top'#2'P'#5'Width'#2#1#11'ParentColor'#8#0#0#6'TL'
+  +'abel'#12'MatchesLabel'#21'AnchorSideTop.Control'#7#10'lblMatches'#18'Anchor'
+  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#14#3'Top'#2'P'#5'Widt'
+  +'h'#2')'#7'Caption'#6#7'Matches'#11'ParentColor'#8#0#0#6'TLabel'#11'lblProgr'
+  +'ess'#4'Left'#2'y'#6'Height'#2#14#3'Top'#2'0'#5'Width'#2#1#11'ParentColor'#8
+  +#0#0#6'TLabel'#14'SearchingLabel'#21'AnchorSideTop.Control'#7#11'lblProgress'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#14#3'Top'#2
+  +'0'#5'Width'#2'4'#7'Caption'#6#10'Searching:'#11'ParentColor'#8#0#0#6'TLabel'
+  +#15'SearchTextLabel'#21'AnchorSideTop.Control'#7#13'lblSearchText'#18'Anchor'
+  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#14#3'Top'#2#16#5'Widt'
+  +'h'#2'?'#7'Caption'#6#12'Search Text:'#11'ParentColor'#8#0#0#6'TLabel'#13'lb'
+  +'lSearchText'#4'Left'#2'y'#6'Height'#2#14#3'Top'#2#16#5'Width'#2#1#11'Parent'
+  +'Color'#8#0#0#7'TBitBtn'#9'btnCancel'#4'Left'#3#177#0#6'Height'#2#26#3'Top'#2
+  +'p'#5'Width'#2'M'#8'AutoSize'#9#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7
+  +#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#7'OnClick'#7#13'btnAbortCL'
+  +'ICK'#8'TabOrder'#2#0#0#0#0#0
 ]);
--- a/ide/searchfrm.pas
+++ b/ide/searchfrm.pas
@ -56,7 +56,6 @@ type
    Panel2: TPANEL;
    procedure OnAddMatch(const Filename: string; const StartPos, EndPos: TPoint;
                         const Lines: string);
-    procedure Panel2Click(Sender: TObject);
    procedure SearchFormCREATE(Sender: TObject);
    procedure SearchFormDESTROY(Sender: TObject);
    procedure btnAbortCLICK(Sender: TObject);
@ -622,7 +621,6 @@ begin
  SearchTextLabel.Caption:=lissSearchText;
  btnCancel.Caption:=dlgCancel;
  Caption:=dlgSearchCaption;
-  btnCancel.LoadGlyphFromLazarusResource('btn_cancel');

  fProgress:=TIDESearchInTextProgress.Create;
  FProgress.OnAddMatch:=@OnAddMatch;
@ -639,11 +637,6 @@ begin
  Caption:= dlgSearchCaption;
 end;

-procedure TSearchForm.Panel2Click(Sender: TObject);
-begin
-
-end;
-
 procedure TSearchForm.OnAddMatch(const Filename: string; const StartPos,
  EndPos: TPoint; const Lines: string);
 var
--- a/ide/tododlg.lfm
+++ b/ide/tododlg.lfm
@ -67,7 +67,6 @@ object TodoDialog: TTodoDialog
  end
  object PriorityEdit: TEdit
    AnchorSideTop.Side = asrBottom
-    AnchorSideBottom.Control = BtnPanel
    Left = 6
    Height = 23
    Top = 205
@ -100,46 +99,13 @@ object TodoDialog: TTodoDialog
    BorderSpacing.Right = 6
    TabOrder = 3
  end
-  object BtnPanel: TPanel
-    Left = 0
-    Height = 35
-    Top = 234
-    Width = 475
-    Align = alBottom
-    AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 35
-    ClientWidth = 475
+  object BtnPanel: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 237
+    Width = 463
    TabOrder = 4
-    object CancelButton: TBitBtn
-      Left = 394
-      Height = 23
-      Top = 6
-      Width = 75
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Cancel = True
-      Caption = 'Cancel'
-      Constraints.MinWidth = 75
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object OkButton: TBitBtn
-      Left = 313
-      Height = 23
-      Top = 6
-      Width = 75
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'Ok'
-      Constraints.MinWidth = 75
-      Default = True
-      ModalResult = 1
-      NumGlyphs = 0
-      TabOrder = 1
-    end
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
  end
 end
--- a/ide/tododlg.lrs
+++ b/ide/tododlg.lrs
@ -22,24 +22,16 @@ LazarusResources.Add('TTodoDialog','FORMDATA',[
  +'Top'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#2#19'Border'
  +'Spacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#10'ScrollBars'#7#10'ssAutoB'
  +'oth'#8'TabOrder'#2#0#0#0#5'TEdit'#12'PriorityEdit'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Heigh'
-  +'t'#2#23#3'Top'#3#205#0#5'Width'#2'&'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
-  +'AutoSize'#9#20'BorderSpacing.Bottom'#2#6#10'OnKeyPress'#7#20'PriorityEditKe'
-  +'yPress'#8'TabOrder'#2#1#0#0#5'TEdit'#9'OwnerEdit'#21'AnchorSideTop.Control'
-  +#7#12'PriorityEdit'#4'Left'#2'L'#6'Height'#2#23#3'Top'#3#205#0#5'Width'#3#162
-  +#0#8'AutoSize'#9#8'TabOrder'#2#2#0#0#5'TEdit'#12'CategoryEdit'#21'AnchorSide'
-  +'Top.Control'#7#12'PriorityEdit'#23'AnchorSideRight.Control'#7#5'Owner'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#248#0#6'Height'#2#23#3'Top'#3
-  +#205#0#5'Width'#3#221#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Auto'
-  +'Size'#9#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#3#0#0#6'TPanel'#8'BtnPane'
-  +'l'#4'Left'#2#0#6'Height'#2'#'#3'Top'#3#234#0#5'Width'#3#219#1#5'Align'#7#8
-  +'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'#'#11
-  +'ClientWidth'#3#219#1#8'TabOrder'#2#4#0#7'TBitBtn'#12'CancelButton'#4'Left'#3
-  +#138#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoS'
-  +'ize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'C'
-  +'onstraints.MinWidth'#2'K'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#0#0#0#7'TBitBtn'#8'OkButton'#4'Left'#3'9'#1#6'Height'#2#23#3'Top'#2#6#5'Wid'
-  +'th'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#2'Ok'#20'Constraints.MinWidth'#2'K'#7'Default'#9#11'ModalResult'
-  +#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#0
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#205#0#5'Width'#2'&'#7'Anch'
+  +'ors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Bottom'#2#6
+  +#10'OnKeyPress'#7#20'PriorityEditKeyPress'#8'TabOrder'#2#1#0#0#5'TEdit'#9'Ow'
+  +'nerEdit'#21'AnchorSideTop.Control'#7#12'PriorityEdit'#4'Left'#2'L'#6'Height'
+  +#2#23#3'Top'#3#205#0#5'Width'#3#162#0#8'AutoSize'#9#8'TabOrder'#2#2#0#0#5'TE'
+  +'dit'#12'CategoryEdit'#21'AnchorSideTop.Control'#7#12'PriorityEdit'#23'Ancho'
+  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#3#248#0#6'Height'#2#23#3'Top'#3#205#0#5'Width'#3#221#0#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#8'T'
+  +'abOrder'#2#3#0#0#12'TButtonPanel'#8'BtnPanel'#4'Left'#2#6#6'Height'#2#26#3
+  +'Top'#3#237#0#5'Width'#3#207#1#8'TabOrder'#2#4#11'ShowButtons'#11#4'pbOK'#8
+  +'pbCancel'#0#9'ShowBevel'#8#0#0#0
 ]);
--- a/ide/tododlg.pas
+++ b/ide/tododlg.pas
@ -31,19 +31,17 @@ interface
 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
  ExtCtrls,
-  TodoList, LazarusIDEStrConsts, Buttons;
+  TodoList, LazarusIDEStrConsts, Buttons, ButtonPanel;

 type

  { TTodoDialog }

  TTodoDialog = class(TForm)
-    CancelButton: TBitBtn;
-    OkButton: TBitBtn;
+    BtnPanel: TButtonPanel;
    OwnerEdit: TEdit;
    CategoryEdit: TEdit;
    CategoryLabel: TLabel;
-    BtnPanel: TPanel;
    PriorityEdit: TEdit;
    PriorityLabel: TLabel;
    OwnerLabel: TLabel;
@ -78,10 +76,8 @@ begin
  PriorityLabel.Caption:=lisToDoLPriority;
  OwnerLabel.Caption:=lisToDoLOwner;
  CategoryLabel.Caption:=listToDoLCategory;
-  OkButton.Caption:=lisOkBtn;
-  CancelButton.Caption:=dlgCancel;
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  BtnPanel.OKButton.Caption:=lisOkBtn;
+  BtnPanel.CancelButton.Caption:=dlgCancel;
 end;

 function ExecuteTodoDialog: TTodoItem;