From a58a097488d713024f56991045c842706194d86b Mon Sep 17 00:00:00 2001
From: laurent <laurent@lazarus-ide.org>
Date: Mon, 22 Sep 2008 09:00:32 +0000
Subject: [PATCH] Load glyph form resource

git-svn-id: trunk@16668 -
---
 ide/charactermapdlg.lfm   |  18 ++---
 ide/charactermapdlg.lrs   |  59 ++++++++--------
 ide/charactermapdlg.pas   |   2 +-
 ide/checkcompileropts.lfm |  18 ++---
 ide/checkcompileropts.lrs |  58 ++++++++--------
 ide/checkcompileropts.pas |   1 +
 ide/checklfmdlg.lfm       |  45 +++++++------
 ide/checklfmdlg.lrs       | 137 ++++++++++++++++++-------------------
 ide/checklfmdlg.pas       |   7 +-
 ide/cleandirdlg.lfm       |  76 +++++++++++----------
 ide/cleandirdlg.lrs       | 138 +++++++++++++++++++-------------------
 ide/cleandirdlg.pas       |   3 +
 12 files changed, 289 insertions(+), 273 deletions(-)

diff --git a/ide/charactermapdlg.lfm b/ide/charactermapdlg.lfm
index cc482abff0..8bb6283118 100644
--- a/ide/charactermapdlg.lfm
+++ b/ide/charactermapdlg.lfm
@@ -11,6 +11,7 @@ object CharacterMapDialog: TCharacterMapDialog
   KeyPreview = True
   OnCreate = FormCreate
   OnShow = FormShow
+  ParentFont = False
   LCLVersion = '0.9.25'
   object CharInfoLabel: TLabel
     AnchorSideLeft.Control = CharactersGroupbox
@@ -19,7 +20,7 @@ object CharacterMapDialog: TCharacterMapDialog
     AnchorSideBottom.Side = asrBottom
     Left = 6
     Height = 14
-    Top = 371
+    Top = 372
     Width = 69
     Caption = 'CharInfoLabel'
     ParentColor = False
@@ -31,13 +32,13 @@ object CharacterMapDialog: TCharacterMapDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = CloseButton
     Left = 6
-    Height = 353
+    Height = 356
     Top = 6
     Width = 459
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     Caption = 'Characters'
-    ClientHeight = 335
+    ClientHeight = 338
     ClientWidth = 455
     ParentCtl3D = False
     TabOrder = 0
@@ -49,7 +50,7 @@ object CharacterMapDialog: TCharacterMapDialog
       AnchorSideBottom.Control = CharactersGroupbox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 323
+      Height = 326
       Top = 6
       Width = 443
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -59,6 +60,7 @@ object CharacterMapDialog: TCharacterMapDialog
       ExtendedSelect = True
       FixedColor = clBtnFace
       Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goSmoothScroll]
+      ParentColor = False
       RowCount = 15
       TabOrder = 0
       OnMouseDown = StringGrid1MouseDown
@@ -70,10 +72,10 @@ object CharacterMapDialog: TCharacterMapDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 376
-    Height = 26
-    Top = 365
-    Width = 89
+    Left = 396
+    Height = 23
+    Top = 368
+    Width = 69
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
diff --git a/ide/charactermapdlg.lrs b/ide/charactermapdlg.lrs
index ff13f181d9..31463868b9 100644
--- a/ide/charactermapdlg.lrs
+++ b/ide/charactermapdlg.lrs
@@ -5,33 +5,34 @@ LazarusResources.Add('TCharacterMapDialog','FORMDATA',[
   +'t'#3#141#1#3'Top'#3#221#0#5'Width'#3#215#1#13'ActiveControl'#7#11'CloseButt'
   +'on'#7'Caption'#6#18'CharacterMapDialog'#12'ClientHeight'#3#141#1#11'ClientW'
   +'idth'#3#215#1#9'FormStyle'#7#11'fsStayOnTop'#10'KeyPreview'#9#8'OnCreate'#7
-  +#10'FormCreate'#6'OnShow'#7#8'FormShow'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabe'
-  +'l'#13'CharInfoLabel'#22'AnchorSideLeft.Control'#7#18'CharactersGroupbox'#21
-  +'AnchorSideTop.Control'#7#11'CloseButton'#18'AnchorSideTop.Side'#7#9'asrCent'
-  +'er'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#14#3'T'
-  +'op'#3's'#1#5'Width'#2'E'#7'Caption'#6#13'CharInfoLabel'#11'ParentColor'#8#0
-  +#0#9'TGroupBox'#18'CharactersGroupbox'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'C'
-  +'loseButton'#4'Left'#2#6#6'Height'#3'a'#1#3'Top'#2#6#5'Width'#3#203#1#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#10'Characters'#12'ClientHeight'#3'O'#1#11'ClientWidth'#3
-  +#199#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#11'TStringGrid'#11'StringGrid1'#22
-  +'AnchorSideLeft.Control'#7#18'CharactersGroupbox'#21'AnchorSideTop.Control'#7
-  +#18'CharactersGroupbox'#23'AnchorSideRight.Control'#7#18'CharactersGroupbox'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#18'C'
-  +'haractersGroupbox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#3'C'#1#3'Top'#2#6#5'Width'#3#187#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'ColCount'#2#17#15'Def'
-  +'aultColWidth'#2#16#14'ExtendedSelect'#9#10'FixedColor'#7#9'clBtnFace'#7'Opt'
-  +'ions'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLi'
-  +'ne'#14'goSmoothScroll'#0#8'RowCount'#2#15#8'TabOrder'#2#0#11'OnMouseDown'#7
-  +#20'StringGrid1MouseDown'#11'OnMouseMove'#7#20'StringGrid1MouseMove'#0#0#0#7
-  +'TBitBtn'#11'CloseButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
-  +'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
-  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3'x'#1#6'Height'#2#26#3'Top'#3'm'
-  +#1#5'Width'#2'Y'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#7'Caption'#6#15'&'#208#151#208#176#208#186#209#128
-  +#209#139#209#130#209#140#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#7'OnClick'#7
-  +#16'CloseButtonClick'#8'TabOrder'#2#1#0#0#0
+  +#10'FormCreate'#6'OnShow'#7#8'FormShow'#10'ParentFont'#8#10'LCLVersion'#6#6
+  +'0.9.25'#0#6'TLabel'#13'CharInfoLabel'#22'AnchorSideLeft.Control'#7#18'Chara'
+  +'ctersGroupbox'#21'AnchorSideTop.Control'#7#11'CloseButton'#18'AnchorSideTop'
+  +'.Side'#7#9'asrCenter'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2#14#3'Top'#3't'#1#5'Width'#2'E'#7'Caption'#6#13'CharInfoLabel'#11
+  +'ParentColor'#8#0#0#9'TGroupBox'#18'CharactersGroupbox'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.C'
+  +'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBot'
+  +'tom.Control'#7#11'CloseButton'#4'Left'#2#6#6'Height'#3'd'#1#3'Top'#2#6#5'Wi'
+  +'dth'#3#203#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'B'
+  +'orderSpacing.Around'#2#6#7'Caption'#6#10'Characters'#12'ClientHeight'#3'R'#1
+  +#11'ClientWidth'#3#199#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#11'TStringGrid'
+  +#11'StringGrid1'#22'AnchorSideLeft.Control'#7#18'CharactersGroupbox'#21'Anch'
+  +'orSideTop.Control'#7#18'CharactersGroupbox'#23'AnchorSideRight.Control'#7#18
+  +'CharactersGroupbox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBo'
+  +'ttom.Control'#7#18'CharactersGroupbox'#21'AnchorSideBottom.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2#6#6'Height'#3'F'#1#3'Top'#2#6#5'Width'#3#187#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8
+  +'ColCount'#2#17#15'DefaultColWidth'#2#16#14'ExtendedSelect'#9#10'FixedColor'
+  +#7#9'clBtnFace'#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goV'
+  +'ertLine'#10'goHorzLine'#14'goSmoothScroll'#0#11'ParentColor'#8#8'RowCount'#2
+  +#15#8'TabOrder'#2#0#11'OnMouseDown'#7#20'StringGrid1MouseDown'#11'OnMouseMov'
+  +'e'#7#20'StringGrid1MouseMove'#0#0#0#7'TBitBtn'#11'CloseButton'#23'AnchorSid'
+  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Ancho'
+  +'rSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#140#1#6'Height'#2#23#3'Top'#3'p'#1#5'Width'#2'E'#7'Anchors'#11#7'ak'
+  +'Right'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#15'&'#195#135#195#160#195#170#195#176#195#187#195#178#195#188#4'Kind'#7#7'b'
+  +'kClose'#9'NumGlyphs'#2#0#7'OnClick'#7#16'CloseButtonClick'#8'TabOrder'#2#1#0
+  +#0#0
 ]);
diff --git a/ide/charactermapdlg.pas b/ide/charactermapdlg.pas
index 121aca04cf..53c8f3ca45 100644
--- a/ide/charactermapdlg.pas
+++ b/ide/charactermapdlg.pas
@@ -88,7 +88,7 @@ begin
   Caption := lisCharacterMap;
   CharactersGroupbox.Caption := lisCharacterMap;
   CloseButton.Caption := lisClose;
-
+  CloseButton.LoadGlyphFromLazarusResource('btn_close');
   //EnvironmentOptions.IDEWindowLayoutList.Apply(Self, Name);
   FillCharMap;
 end;
diff --git a/ide/checkcompileropts.lfm b/ide/checkcompileropts.lfm
index 3a55faedc8..c4a8c79f1f 100644
--- a/ide/checkcompileropts.lfm
+++ b/ide/checkcompileropts.lfm
@@ -3,18 +3,18 @@ object CheckCompilerOptsDlg: TCheckCompilerOptsDlg
   Height = 307
   Top = 220
   Width = 624
-  HorzScrollBar.Page = 623
-  VertScrollBar.Page = 306
   ActiveControl = OutputListbox
   BorderIcons = [biSystemMenu]
   Caption = 'CheckCompilerOptsDlg'
   ClientHeight = 307
   ClientWidth = 624
+  ParentFont = False
   Position = poScreenCenter
+  LCLVersion = '0.9.25'
   object OutputGroupBox: TGroupBox
     AnchorSideBottom.Control = CloseButton1
     Left = 6
-    Height = 151
+    Height = 154
     Top = 116
     Width = 612
     Align = alTop
@@ -23,13 +23,13 @@ object CheckCompilerOptsDlg: TCheckCompilerOptsDlg
     BorderSpacing.Right = 6
     BorderSpacing.Bottom = 6
     Caption = 'Output'
-    ClientHeight = 133
+    ClientHeight = 136
     ClientWidth = 608
     ParentCtl3D = False
     TabOrder = 0
     object OutputListbox: TListBox
       Left = 6
-      Height = 121
+      Height = 124
       Top = 6
       Width = 596
       Align = alClient
@@ -68,10 +68,10 @@ object CheckCompilerOptsDlg: TCheckCompilerOptsDlg
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 545
-    Height = 28
-    Top = 273
-    Width = 73
+    Left = 543
+    Height = 25
+    Top = 276
+    Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
diff --git a/ide/checkcompileropts.lrs b/ide/checkcompileropts.lrs
index fc001bf57b..06bb68198c 100644
--- a/ide/checkcompileropts.lrs
+++ b/ide/checkcompileropts.lrs
@@ -2,33 +2,33 @@
 
 LazarusResources.Add('TCheckCompilerOptsDlg','FORMDATA',[
   'TPF0'#21'TCheckCompilerOptsDlg'#20'CheckCompilerOptsDlg'#4'Left'#3'B'#1#6'He'
-  +'ight'#3'3'#1#3'Top'#3#220#0#5'Width'#3'p'#2#18'HorzScrollBar.Page'#3'o'#2#18
-  +'VertScrollBar.Page'#3'2'#1#13'ActiveControl'#7#13'OutputListbox'#11'BorderI'
-  +'cons'#11#12'biSystemMenu'#0#7'Caption'#6#20'CheckCompilerOptsDlg'#12'Client'
-  +'Height'#3'3'#1#11'ClientWidth'#3'p'#2#8'Position'#7#14'poScreenCenter'#0#9
-  +'TGroupBox'#14'OutputGroupBox'#24'AnchorSideBottom.Control'#7#12'CloseButton'
-  +'1'#4'Left'#2#6#6'Height'#3#151#0#3'Top'#2't'#5'Width'#3'd'#2#5'Align'#7#5'a'
-  +'lTop'#7'Anchors'#11#8'akBottom'#0#18'BorderSpacing.Left'#2#6#19'BorderSpaci'
-  +'ng.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#6'Output'#12'Client'
-  +'Height'#3#133#0#11'ClientWidth'#3'`'#2#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#8
-  +'TListBox'#13'OutputListbox'#4'Left'#2#6#6'Height'#2'y'#3'Top'#2#6#5'Width'#3
-  +'T'#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#9'PopupMenu'#7#15
-  +'OutputPopupMenu'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#12'TestGroupbox'#4'Left'
-  +#2#6#6'Height'#2'i'#3'Top'#2#6#5'Width'#3'd'#2#5'Align'#7#5'alTop'#7'Anchors'
-  +#11#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'Bor'
-  +'derSpacing.Right'#2#6#7'Caption'#6#4'Test'#12'ClientHeight'#2'W'#11'ClientW'
-  +'idth'#3'`'#2#11'ParentCtl3D'#8#8'TabOrder'#2#1#0#5'TMemo'#8'TestMemo'#4'Lef'
-  +'t'#2#6#6'Height'#2'K'#3'Top'#2#6#5'Width'#3'T'#2#5'Align'#7#8'alClient'#20
-  +'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#7'TBitBtn'#12'CloseButton1'
-  +#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'!'#2#6'Height'#2#28#3'Top'#3#17#1#5'Width'#2'I'#7'Ancho'
-  +'rs'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6
-  +'Cancel'#9#7'Caption'#6#6'&Close'#21'Constraints.MinHeight'#2#25#20'Constrai'
-  +'nts.MinWidth'#2'K'#4'Kind'#7#7'bkClose'#11'ModalResult'#2#1#9'NumGlyphs'#2#0
-  +#8'TabOrder'#2#2#0#0#9'TSplitter'#9'Splitter1'#6'Cursor'#7#8'crVSplit'#6'Hei'
-  +'ght'#2#5#3'Top'#2'o'#5'Width'#3'p'#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7
-  +#5'akTop'#0#0#10'TPopupMenu'#15'OutputPopupMenu'#4'left'#2'n'#3'top'#3#4#1#0
-  +#9'TMenuItem'#18'CopyOutputMenuItem'#7'Caption'#6#18'CopyOutputMenuItem'#7'O'
-  +'nClick'#7#23'CopyOutputMenuItemClick'#0#0#0#0
+  +'ight'#3'3'#1#3'Top'#3#220#0#5'Width'#3'p'#2#13'ActiveControl'#7#13'OutputLi'
+  +'stbox'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#20'CheckCompilerO'
+  +'ptsDlg'#12'ClientHeight'#3'3'#1#11'ClientWidth'#3'p'#2#10'ParentFont'#8#8'P'
+  +'osition'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#14
+  +'OutputGroupBox'#24'AnchorSideBottom.Control'#7#12'CloseButton1'#4'Left'#2#6
+  +#6'Height'#3#154#0#3'Top'#2't'#5'Width'#3'd'#2#5'Align'#7#5'alTop'#7'Anchors'
+  +#11#8'akBottom'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20
+  +'BorderSpacing.Bottom'#2#6#7'Caption'#6#6'Output'#12'ClientHeight'#3#136#0#11
+  +'ClientWidth'#3'`'#2#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#8'TListBox'#13'Outp'
+  +'utListbox'#4'Left'#2#6#6'Height'#2'|'#3'Top'#2#6#5'Width'#3'T'#2#5'Align'#7
+  +#8'alClient'#20'BorderSpacing.Around'#2#6#9'PopupMenu'#7#15'OutputPopupMenu'
+  +#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#12'TestGroupbox'#4'Left'#2#6#6'Height'#2
+  +'i'#3'Top'#2#6#5'Width'#3'd'#2#5'Align'#7#5'alTop'#7'Anchors'#11#7'akRight'#0
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'
+  +#2#6#7'Caption'#6#4'Test'#12'ClientHeight'#2'W'#11'ClientWidth'#3'`'#2#11'Pa'
+  +'rentCtl3D'#8#8'TabOrder'#2#1#0#5'TMemo'#8'TestMemo'#4'Left'#2#6#6'Height'#2
+  +'K'#3'Top'#2#6#5'Width'#3'T'#2#5'Align'#7#8'alClient'#20'BorderSpacing.Aroun'
+  +'d'#2#6#8'TabOrder'#2#0#0#0#0#7'TBitBtn'#12'CloseButton1'#23'AnchorSideRight'
+  +'.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideB'
+  +'ottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#31#2#6'Height'#2#25#3'Top'#3#20#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Captio'
+  +'n'#6#6'&Close'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'
+  +#4'Kind'#7#7'bkClose'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0
+  +#0#9'TSplitter'#9'Splitter1'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2
+  +'o'#5'Width'#3'p'#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#10'T'
+  +'PopupMenu'#15'OutputPopupMenu'#4'left'#2'n'#3'top'#3#4#1#0#9'TMenuItem'#18
+  +'CopyOutputMenuItem'#7'Caption'#6#18'CopyOutputMenuItem'#7'OnClick'#7#23'Cop'
+  +'yOutputMenuItemClick'#0#0#0#0
 ]);
diff --git a/ide/checkcompileropts.pas b/ide/checkcompileropts.pas
index b840fd29f1..1765480333 100644
--- a/ide/checkcompileropts.pas
+++ b/ide/checkcompileropts.pas
@@ -1113,6 +1113,7 @@ begin
   Application.AddOnIdleHandler(@ApplicationOnIdle,true);
   Caption:=dlgCCOCaption;
   CloseButton1.Caption:=lisClose;
+  CloseButton1.LoadGlyphFromLazarusResource('btn_close');
   TestGroupbox.Caption:=dlgCCOTest;
   OutputGroupBox.Caption:=dlgCCOResults;
   CopyOutputMenuItem.Caption:=lisCCOCopyOutputToCliboard;
diff --git a/ide/checklfmdlg.lfm b/ide/checklfmdlg.lfm
index ed16b52111..0aa8637776 100644
--- a/ide/checklfmdlg.lfm
+++ b/ide/checklfmdlg.lfm
@@ -8,9 +8,10 @@ object CheckLFMDialog: TCheckLFMDialog
   ClientHeight = 580
   ClientWidth = 552
   OnCreate = CheckLFMDialogCreate
+  ParentFont = False
   LCLVersion = '0.9.25'
   object NoteLabel: TLabel
-    Height = 20
+    Height = 14
     Width = 552
     Align = alTop
     Caption = 'NoteLabel'
@@ -18,17 +19,17 @@ object CheckLFMDialog: TCheckLFMDialog
     WordWrap = True
   end
   object LFMGroupBox: TGroupBox
-    Height = 415
-    Top = 20
+    Height = 427
+    Top = 14
     Width = 552
     Align = alClient
     Caption = 'LFM file'
-    ClientHeight = 396
+    ClientHeight = 409
     ClientWidth = 548
     ParentCtl3D = False
     TabOrder = 0
     object LFMSynEdit: TSynEdit
-      Height = 396
+      Height = 409
       Width = 548
       Align = alClient
       Font.Height = -15
@@ -36,7 +37,9 @@ object CheckLFMDialog: TCheckLFMDialog
       Font.Pitch = fpFixed
       ParentColor = False
       ParentCtl3D = False
+      ParentFont = False
       TabOrder = 0
+      BookMarkOptions.OnChange = nil
       Highlighter = SynLFMSyn1
       Keystrokes = <      
         item
@@ -362,59 +365,61 @@ object CheckLFMDialog: TCheckLFMDialog
       Lines.Strings = (
         'LFMSynEdit'
       )
+      SelectedColor.OnChange = nil
       OnSpecialLineMarkup = LFMSynEditSpecialLineMarkup
     end
   end
   object ErrorsGroupBox: TGroupBox
     Height = 104
-    Top = 435
+    Top = 441
     Width = 552
     Align = alBottom
     Caption = 'Errors'
-    ClientHeight = 85
+    ClientHeight = 86
     ClientWidth = 548
     ParentCtl3D = False
     TabOrder = 1
     object ErrorsListBox: TListBox
-      Height = 85
+      Height = 86
       Width = 548
       Align = alClient
       OnClick = ErrorsListBoxClick
       TabOrder = 0
-      TopIndex = -1
     end
   end
   object BtnPanel: TPanel
-    Height = 41
-    Top = 539
+    Height = 35
+    Top = 545
     Width = 552
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 41
+    ClientHeight = 35
     ClientWidth = 552
     TabOrder = 2
-    object CancelButton: TButton
-      Left = 491
-      Height = 29
+    object CancelButton: TBitBtn
+      Left = 488
+      Height = 23
       Top = 6
-      Width = 55
+      Width = 58
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'Cancel'
       ModalResult = 2
+      NumGlyphs = 0
       TabOrder = 0
     end
-    object RemoveAllButton: TButton
-      Left = 291
-      Height = 29
+    object RemoveAllButton: TBitBtn
+      Left = 319
+      Height = 23
       Top = 6
-      Width = 194
+      Width = 163
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'Remove all invalid properties'
+      NumGlyphs = 0
       OnClick = RemoveAllButtonClick
       TabOrder = 1
     end
diff --git a/ide/checklfmdlg.lrs b/ide/checklfmdlg.lrs
index 4cec219b2e..c2af94722e 100644
--- a/ide/checklfmdlg.lrs
+++ b/ide/checklfmdlg.lrs
@@ -4,72 +4,73 @@ 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'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#9'N'
-  +'oteLabel'#6'Height'#2#20#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#159#1#3'Top'#2#20#5'Width'#3'('#2#5'Align'#7#8'alClient'#7'Capt'
-  +'ion'#6#8'LFM file'#12'ClientHeight'#3#140#1#11'ClientWidth'#3'$'#2#11'Paren'
-  +'tCtl3D'#8#8'TabOrder'#2#0#0#8'TSynEdit'#10'LFMSynEdit'#6'Height'#3#140#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'ParentCtl3D'#8#8
-  +'TabOrder'#2#0#11'Highlighter'#7#10'SynLFMSyn1'#10'Keystrokes'#14#1#7'Comman'
-  +'d'#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'Comma'
-  +'nd'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Comman'
-  +'d'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Comman'
-  +'d'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Comma'
-  +'nd'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Com'
-  +'mand'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Com'
-  +'mand'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Co'
-  +'mmand'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Com'
-  +'mand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Co'
-  +'mmand'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Com'
-  +'mand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Co'
-  +'mmand'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Com'
-  +'mand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Co'
-  +'mmand'#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'Command'#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'ShortC'
-  +'ut'#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'Com'
-  +'mand'#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'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'Short'
-  +'Cut'#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'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'Comman'
-  +'d'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'C'
-  +'ommand'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1
-  +#7'Command'#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'ShortCu'
-  +'t'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'Sh'
-  +'ortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1
-  +#8'ShortCut'#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'Comman'
-  +'d'#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'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'LF'
-  +'MSynEdit'#0#19'OnSpecialLineMarkup'#7#27'LFMSynEditSpecialLineMarkup'#0#0#0
-  +#9'TGroupBox'#14'ErrorsGroupBox'#6'Height'#2'h'#3'Top'#3#179#1#5'Width'#3'('
-  +#2#5'Align'#7#8'alBottom'#7'Caption'#6#6'Errors'#12'ClientHeight'#2'U'#11'Cl'
-  +'ientWidth'#3'$'#2#11'ParentCtl3D'#8#8'TabOrder'#2#1#0#8'TListBox'#13'Errors'
-  +'ListBox'#6'Height'#2'U'#5'Width'#3'$'#2#5'Align'#7#8'alClient'#7'OnClick'#7
-  +#18'ErrorsListBoxClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#0#6'TPanel'#8
-  +'BtnPanel'#6'Height'#2')'#3'Top'#3#27#2#5'Width'#3'('#2#5'Align'#7#8'alBotto'
-  +'m'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'Client'
-  +'Width'#3'('#2#8'TabOrder'#2#2#0#7'TButton'#12'CancelButton'#4'Left'#3#235#1
-  +#6'Height'#2#29#3'Top'#2#6#5'Width'#2'7'#5'Align'#7#7'alRight'#8'AutoSize'#9
-  ,#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'T'
-  +'abOrder'#2#0#0#0#7'TButton'#15'RemoveAllButton'#4'Left'#3'#'#1#6'Height'#2
-  +#29#3'Top'#2#6#5'Width'#3#194#0#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Borde'
-  +'rSpacing.Around'#2#6#7'Caption'#6#29'Remove all invalid properties'#7'OnCli'
-  +'ck'#7#20'RemoveAllButtonClick'#8'TabOrder'#2#1#0#0#0#10'TSynLFMSyn'#10'SynL'
-  +'FMSyn1'#13'DefaultFilter'#6' Lazarus Form Files (*.lfm)|*.lfm'#7'Enabled'#8
-  +#4'left'#3#129#0#3'top'#2'h'#0#0#0
+  +'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
 ]);
diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas
index 30ce17da79..4ab7d75462 100644
--- a/ide/checklfmdlg.pas
+++ b/ide/checklfmdlg.pas
@@ -48,14 +48,14 @@ type
   { TCheckLFMDialog }
 
   TCheckLFMDialog = class(TForm)
-    CancelButton: TButton;
+    CancelButton: TBitBtn;
     ErrorsGroupBox: TGroupBox;
     ErrorsListBox: TListBox;
     NoteLabel: TLabel;
     LFMGroupBox: TGroupBox;
     LFMSynEdit: TSynEdit;
     BtnPanel: TPanel;
-    RemoveAllButton: TButton;
+    RemoveAllButton: TBitBtn;
     SynLFMSyn1: TSynLFMSyn;
     procedure ErrorsListBoxClick(Sender: TObject);
     procedure LFMSynEditSpecialLineMarkup(Sender: TObject; Line: integer;
@@ -557,10 +557,11 @@ procedure TCheckLFMDialog.SetupComponents;
 begin
   NoteLabel.Caption:=lisTheLFMLazarusFormFileContainsInvalidPropertiesThis;
   CancelButton.Caption:=dlgCancel;
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
   ErrorsGroupBox.Caption:=lisErrors;
   LFMGroupBox.Caption:=lisLFMFile;
   RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
-  
+  RemoveAllButton.LoadGlyphFromLazarusResource('delete');
   EditorOpts.GetHighlighterSettings(SynLFMSyn1);
   EditorOpts.GetSynEditSettings(LFMSynEdit);
 end;
diff --git a/ide/cleandirdlg.lfm b/ide/cleandirdlg.lfm
index b84e1d8c3f..1b24cb2ceb 100644
--- a/ide/cleandirdlg.lfm
+++ b/ide/cleandirdlg.lfm
@@ -1,39 +1,41 @@
 object CleanDirectoryDialog: TCleanDirectoryDialog
   Left = 307
-  Height = 340
+  Height = 309
   Top = 209
   Width = 450
-  HorzScrollBar.Page = 449
-  VertScrollBar.Page = 339
   ActiveControl = DirCombobox
   AutoSize = True
   BorderIcons = [biSystemMenu]
   Caption = 'Clean Directory'
-  ClientHeight = 340
+  ClientHeight = 309
   ClientWidth = 450
   OnCreate = CleanDirectoryDialogCreate
+  ParentFont = False
   Position = poScreenCenter
+  LCLVersion = '0.9.25'
   object DirGroupbox: TGroupBox
     Left = 6
-    Height = 78
+    Height = 76
     Top = 6
     Width = 438
     Align = alTop
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Directory'
-    ClientHeight = 59
+    ClientHeight = 58
     ClientWidth = 434
     ParentCtl3D = False
     TabOrder = 0
     object DirCombobox: TComboBox
       AnchorSideRight.Control = DirBrowseButton
-      Height = 25
-      Width = 400
+      Left = 6
+      Height = 21
+      Top = 6
+      Width = 394
       Anchors = [akTop, akLeft, akRight]
       AutoCompleteText = [cbactSearchAscending]
       BorderSpacing.Around = 6
-      MaxLength = 0
+      ItemHeight = 13
       ParentCtl3D = False
       TabOrder = 0
       Text = 'DirCombobox'
@@ -42,8 +44,8 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
       AnchorSideTop.Control = DirCombobox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 31
+      Height = 19
+      Top = 33
       Width = 422
       Align = alBottom
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -60,7 +62,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
       AnchorSideRight.Side = asrBottom
       Left = 406
       Height = 21
-      Top = 2
+      Top = 6
       Width = 23
       Anchors = [akTop, akRight]
       BorderSpacing.Right = 5
@@ -71,34 +73,34 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
   end
   object RemoveGroupbox: TGroupBox
     Left = 6
-    Height = 84
-    Top = 90
+    Height = 76
+    Top = 88
     Width = 438
     Align = alTop
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Remove files matching filter:'
-    ClientHeight = 65
+    ClientHeight = 58
     ClientWidth = 434
     ParentCtl3D = False
     TabOrder = 1
     object RemoveCombobox: TComboBox
       Left = 6
-      Height = 25
+      Height = 21
       Top = 6
       Width = 422
       Align = alTop
       AutoCompleteText = [cbactSearchAscending]
       BorderSpacing.Around = 6
-      MaxLength = 0
+      ItemHeight = 13
       ParentCtl3D = False
       TabOrder = 0
       Text = 'RemoveCombobox'
     end
     object SimpleSyntaxRemoveCheckbox: TCheckBox
       Left = 6
-      Height = 22
-      Top = 37
+      Height = 19
+      Top = 33
       Width = 422
       Align = alTop
       BorderSpacing.Around = 6
@@ -108,34 +110,34 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
   end
   object KeepGroupbox: TGroupBox
     Left = 6
-    Height = 112
-    Top = 180
+    Height = 101
+    Top = 170
     Width = 438
     Align = alTop
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Keep files matching filter:'
-    ClientHeight = 93
+    ClientHeight = 83
     ClientWidth = 434
     ParentCtl3D = False
     TabOrder = 2
     object KeepCombobox: TComboBox
       Left = 6
-      Height = 25
+      Height = 21
       Top = 6
       Width = 422
       Align = alTop
       AutoCompleteText = [cbactSearchAscending]
       BorderSpacing.Around = 6
-      MaxLength = 0
+      ItemHeight = 13
       ParentCtl3D = False
       TabOrder = 0
       Text = 'KeepCombobox'
     end
     object SimpleSyntaxKeepCheckbox: TCheckBox
       Left = 6
-      Height = 22
-      Top = 37
+      Height = 19
+      Top = 33
       Width = 422
       Align = alTop
       BorderSpacing.Around = 6
@@ -144,8 +146,8 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     end
     object KeepTextFilesCheckbox: TCheckBox
       Left = 6
-      Height = 22
-      Top = 65
+      Height = 19
+      Top = 58
       Width = 422
       Align = alTop
       BorderSpacing.Around = 6
@@ -159,9 +161,9 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     AnchorSideRight.Control = CancelButton
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 285
-    Height = 36
-    Top = 298
+    Left = 288
+    Height = 25
+    Top = 277
     Width = 75
     Anchors = [akTop, akRight]
     AutoSize = True
@@ -183,10 +185,10 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 366
-    Height = 32
-    Top = 298
-    Width = 78
+    Left = 369
+    Height = 25
+    Top = 277
+    Width = 75
     Anchors = [akTop, akRight]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -206,8 +208,8 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 36
-    Top = 298
+    Height = 25
+    Top = 277
     Width = 75
     AutoSize = True
     BorderSpacing.Around = 6
diff --git a/ide/cleandirdlg.lrs b/ide/cleandirdlg.lrs
index 63a0ef8098..2b723a5be6 100644
--- a/ide/cleandirdlg.lrs
+++ b/ide/cleandirdlg.lrs
@@ -2,73 +2,73 @@
 
 LazarusResources.Add('TCleanDirectoryDialog','FORMDATA',[
   'TPF0'#21'TCleanDirectoryDialog'#20'CleanDirectoryDialog'#4'Left'#3'3'#1#6'He'
-  +'ight'#3'T'#1#3'Top'#3#209#0#5'Width'#3#194#1#18'HorzScrollBar.Page'#3#193#1
-  +#18'VertScrollBar.Page'#3'S'#1#13'ActiveControl'#7#11'DirCombobox'#8'AutoSiz'
-  +'e'#9#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#15'Clean Directory'
-  +#12'ClientHeight'#3'T'#1#11'ClientWidth'#3#194#1#8'OnCreate'#7#26'CleanDirec'
-  +'toryDialogCreate'#8'Position'#7#14'poScreenCenter'#0#9'TGroupBox'#11'DirGro'
-  +'upbox'#4'Left'#2#6#6'Height'#2'N'#3'Top'#2#6#5'Width'#3#182#1#5'Align'#7#5
-  +'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#9'Directory'
-  +#12'ClientHeight'#2';'#11'ClientWidth'#3#178#1#11'ParentCtl3D'#8#8'TabOrder'
-  +#2#0#0#9'TComboBox'#11'DirCombobox'#23'AnchorSideRight.Control'#7#15'DirBrow'
-  +'seButton'#6'Height'#2#25#5'Width'#3#144#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#16'AutoCompleteText'#11#20'cbactSearchAscending'#0#20'BorderSpac'
-  +'ing.Around'#2#6#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6
-  +#11'DirCombobox'#0#0#9'TCheckBox'#15'SubDirsCheckbox'#21'AnchorSideTop.Contr'
-  +'ol'#7#11'DirCombobox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#22#3'Top'#2#31#5'Width'#3#166#1#5'Align'#7#8'alBottom'#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#21'Clean sub directories'#8'TabOrder'#2#1#0#0#7'TButton'#15'Di'
-  +'rBrowseButton'#22'AnchorSideLeft.Control'#7#11'DirCombobox'#19'AnchorSideLe'
-  +'ft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'DirCombobox'#18'Anch'
-  +'orSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'DirGroupbox'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#150#1#6'Height'#2#21#3'To'
-  +'p'#2#2#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.R'
-  +'ight'#2#5#7'Caption'#6#3'...'#7'OnClick'#7#20'DirBrowseButtonClick'#8'TabOr'
-  +'der'#2#2#0#0#0#9'TGroupBox'#14'RemoveGroupbox'#4'Left'#2#6#6'Height'#2'T'#3
-  +'Top'#2'Z'#5'Width'#3#182#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#29'Remove files matching filter:'#12'ClientHeig'
-  +'ht'#2'A'#11'ClientWidth'#3#178#1#11'ParentCtl3D'#8#8'TabOrder'#2#1#0#9'TCom'
-  +'boBox'#14'RemoveCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5'Width'#3
-  +#166#1#5'Align'#7#5'alTop'#16'AutoCompleteText'#11#20'cbactSearchAscending'#0
-  +#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'
-  +#2#0#4'Text'#6#14'RemoveCombobox'#0#0#9'TCheckBox'#26'SimpleSyntaxRemoveChec'
-  +'kbox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'%'#5'Width'#3#166#1#5'Align'#7#5
-  +'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'$Simple syntax (e.g. * ins'
-  +'tead of .*)'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#12'KeepGroupbox'#4'Left'#2#6
-  +#6'Height'#2'p'#3'Top'#3#180#0#5'Width'#3#182#1#5'Align'#7#5'alTop'#8'AutoSi'
-  +'ze'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'Keep files matching filt'
-  +'er:'#12'ClientHeight'#2']'#11'ClientWidth'#3#178#1#11'ParentCtl3D'#8#8'TabO'
-  +'rder'#2#2#0#9'TComboBox'#12'KeepCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'
-  +#2#6#5'Width'#3#166#1#5'Align'#7#5'alTop'#16'AutoCompleteText'#11#20'cbactSe'
-  +'archAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#11'ParentCtl'
-  +'3D'#8#8'TabOrder'#2#0#4'Text'#6#12'KeepCombobox'#0#0#9'TCheckBox'#24'Simple'
-  +'SyntaxKeepCheckbox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'%'#5'Width'#3#166#1
-  +#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'$Simple synta'
-  +'x (e.g. * instead of .*)'#8'TabOrder'#2#1#0#0#9'TCheckBox'#21'KeepTextFiles'
-  +'Checkbox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'A'#5'Width'#3#166#1#5'Align'#7
-  +#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'Keep Text Files'#8'Ta'
-  +'bOrder'#2#2#0#0#0#7'TBitBtn'#8'OkButton'#21'AnchorSideTop.Control'#7#12'Kee'
-  +'pGroupbox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
-  +#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBot'
-  +'tom.Side'#7#9'asrBottom'#4'Left'#3#29#1#6'Height'#2'$'#3'Top'#3'*'#1#5'Widt'
-  +'h'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.'
-  +'Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20'Constrain'
-  +'ts.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumG'
-  +'lyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#3#0#0#7'TBitBtn'#12
-  +'CancelButton'#21'AnchorSideTop.Control'#7#12'KeepGroupbox'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideR'
-  +'ight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anchor'
-  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#3'n'#1#6'Height'#2' '#3'Top'#3'*'#1
-  +#5'Width'#2'N'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSp'
-  +'acing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHeig'
-  +'ht'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'
-  +#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#4#0#0#7'TBitBtn'#10'HelpButton'#22'Ancho'
-  +'rSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#12'KeepGroupbox'
-  ,#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owne'
-  +'r'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'$'#3'To'
-  +'p'#3'*'#1#5'Width'#2'K'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Captio'
-  +'n'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4
-  +'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'HelpButtonClick'#8'TabOr'
-  +'der'#2#5#0#0#0
+  +'ight'#3'5'#1#3'Top'#3#209#0#5'Width'#3#194#1#13'ActiveControl'#7#11'DirComb'
+  +'obox'#8'AutoSize'#9#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#15'C'
+  +'lean Directory'#12'ClientHeight'#3'5'#1#11'ClientWidth'#3#194#1#8'OnCreate'
+  +#7#26'CleanDirectoryDialogCreate'#10'ParentFont'#8#8'Position'#7#14'poScreen'
+  +'Center'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#11'DirGroupbox'#4'Left'#2
+  +#6#6'Height'#2'L'#3'Top'#2#6#5'Width'#3#182#1#5'Align'#7#5'alTop'#8'AutoSize'
+  +#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#9'Directory'#12'ClientHeight'#2
+  +':'#11'ClientWidth'#3#178#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#9'TComboBox'
+  +#11'DirCombobox'#23'AnchorSideRight.Control'#7#15'DirBrowseButton'#4'Left'#2
+  +#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3#138#1#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#0#16'AutoCompleteText'#11#20'cbactSearchAscending'#0#20'Borde'
+  +'rSpacing.Around'#2#6#10'ItemHeight'#2#13#11'ParentCtl3D'#8#8'TabOrder'#2#0#4
+  +'Text'#6#11'DirCombobox'#0#0#9'TCheckBox'#15'SubDirsCheckbox'#21'AnchorSideT'
+  +'op.Control'#7#11'DirCombobox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2#6#6'Height'#2#19#3'Top'#2'!'#5'Width'#3#166#1#5'Align'#7#8'alBottom'#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Arou'
+  +'nd'#2#6#7'Caption'#6#21'Clean sub directories'#8'TabOrder'#2#1#0#0#7'TButto'
+  +'n'#15'DirBrowseButton'#22'AnchorSideLeft.Control'#7#11'DirCombobox'#19'Anch'
+  +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'DirCombobox'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'DirG'
+  +'roupbox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#150#1#6'Height'#2
+  +#21#3'Top'#2#6#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSp'
+  +'acing.Right'#2#5#7'Caption'#6#3'...'#7'OnClick'#7#20'DirBrowseButtonClick'#8
+  +'TabOrder'#2#2#0#0#0#9'TGroupBox'#14'RemoveGroupbox'#4'Left'#2#6#6'Height'#2
+  +'L'#3'Top'#2'X'#5'Width'#3#182#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#29'Remove files matching filter:'#12'Clien'
+  +'tHeight'#2':'#11'ClientWidth'#3#178#1#11'ParentCtl3D'#8#8'TabOrder'#2#1#0#9
+  +'TComboBox'#14'RemoveCombobox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'
+  +#3#166#1#5'Align'#7#5'alTop'#16'AutoCompleteText'#11#20'cbactSearchAscending'
+  +#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#11'ParentCtl3D'#8#8'TabO'
+  +'rder'#2#0#4'Text'#6#14'RemoveCombobox'#0#0#9'TCheckBox'#26'SimpleSyntaxRemo'
+  +'veCheckbox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'!'#5'Width'#3#166#1#5'Align'
+  +#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'$Simple syntax (e.g. *'
+  +' instead of .*)'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#12'KeepGroupbox'#4'Left'
+  +#2#6#6'Height'#2'e'#3'Top'#3#170#0#5'Width'#3#182#1#5'Align'#7#5'alTop'#8'Au'
+  +'toSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'Keep files matching '
+  +'filter:'#12'ClientHeight'#2'S'#11'ClientWidth'#3#178#1#11'ParentCtl3D'#8#8
+  +'TabOrder'#2#2#0#9'TComboBox'#12'KeepCombobox'#4'Left'#2#6#6'Height'#2#21#3
+  +'Top'#2#6#5'Width'#3#166#1#5'Align'#7#5'alTop'#16'AutoCompleteText'#11#20'cb'
+  +'actSearchAscending'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#11'P'
+  +'arentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#12'KeepCombobox'#0#0#9'TCheckBox'#24
+  +'SimpleSyntaxKeepCheckbox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'!'#5'Width'#3
+  +#166#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'$Simple'
+  +' syntax (e.g. * instead of .*)'#8'TabOrder'#2#1#0#0#9'TCheckBox'#21'KeepTex'
+  +'tFilesCheckbox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2':'#5'Width'#3#166#1#5'A'
+  +'lign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'Keep Text Fil'
+  +'es'#8'TabOrder'#2#2#0#0#0#7'TBitBtn'#8'OkButton'#21'AnchorSideTop.Control'#7
+  +#12'KeepGroupbox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.C'
+  +'ontrol'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Ancho'
+  +'rSideBottom.Side'#7#9'asrBottom'#4'Left'#3' '#1#6'Height'#2#25#3'Top'#3#21#1
+  +#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20'Con'
+  +'straints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9
+  +'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#3#0#0#7'TBitBtn'
+  +#12'CancelButton'#21'AnchorSideTop.Control'#7#12'KeepGroupbox'#18'AnchorSide'
+  +'Top.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
+  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3'q'#1#6'Height'#2#25#3'Top'#3#21
+  +#1#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'Border'
+  +'Spacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHe'
+  +'ight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResu'
+  +'lt'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#4#0#0#7'TBitBtn'#10'HelpButton'#22'A'
+  +'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#12'KeepGroupb'
+  ,'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5
+  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3
+  +'Top'#3#21#1#5'Width'#2'K'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capt'
+  +'ion'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'
+  +#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'HelpButtonClick'#8'Tab'
+  +'Order'#2#5#0#0#0
 ]);
diff --git a/ide/cleandirdlg.pas b/ide/cleandirdlg.pas
index cc63db8763..6cff3b7e1b 100644
--- a/ide/cleandirdlg.pas
+++ b/ide/cleandirdlg.pas
@@ -138,6 +138,9 @@ begin
   OkButton.Caption:=lisLazBuildOk;
   CancelButton.Caption:=dlgCancel;
   HelpButton.Caption:=lisPckEditHelp;
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  HelpButton.LoadGlyphFromLazarusResource('btn_help');
 end;
 
 procedure TCleanDirectoryDialog.HelpButtonClick(Sender: TObject);