Load glyph form resource and somme resourcestrings

git-svn-id: trunk@16705 -
2025-08-16 10:19:36 +02:00 · 2008-09-24 12:56:01 +00:00 · 2008-09-24 12:56:01 +00:00 · dd28cb447d
commit dd28cb447d
parent c96500a8bd
18 changed files with 435 additions and 402 deletions
--- a/converter/chgencodingdlg.lfm
+++ b/converter/chgencodingdlg.lfm
@ -9,17 +9,18 @@ object ChgEncodingDialog: TChgEncodingDialog
  ClientWidth = 509
  OnCreate = FormCreate
  OnDestroy = FormDestroy
+  ParentFont = False
  LCLVersion = '0.9.25'
  object FilesGroupBox: TGroupBox
    Left = 6
-    Height = 163
-    Top = 72
+    Height = 141
+    Top = 63
    Width = 497
    Align = alTop
    AutoSize = True
    BorderSpacing.Around = 6
    Caption = 'FilesGroupBox'
-    ClientHeight = 144
+    ClientHeight = 123
    ClientWidth = 493
    TabOrder = 0
    object FileFilterLabel: TLabel
@ -27,9 +28,9 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideTop.Control = NonUTF8FilesCheckBox
      AnchorSideTop.Side = asrBottom
      Left = 6
-      Height = 18
-      Top = 71
-      Width = 85
+      Height = 14
+      Top = 65
+      Width = 66
      BorderSpacing.Left = 6
      BorderSpacing.Top = 15
      BorderSpacing.Bottom = 2
@ -40,9 +41,9 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideLeft.Control = FilesGroupBox
      AnchorSideTop.Control = FilesGroupBox
      Left = 6
-      Height = 22
+      Height = 19
      Top = 6
-      Width = 146
+      Width = 119
      BorderSpacing.Around = 6
      Caption = 'UTF8FilesCheckBox'
      Checked = True
@ -54,9 +55,9 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideTop.Control = UTF8FilesCheckBox
      AnchorSideTop.Side = asrBottom
      Left = 6
-      Height = 22
-      Top = 34
-      Width = 172
+      Height = 19
+      Top = 31
+      Width = 138
      BorderSpacing.Around = 6
      Caption = 'NonUTF8FilesCheckBox'
      Checked = True
@ -68,9 +69,9 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideTop.Control = FileFilterCombobox
      AnchorSideTop.Side = asrBottom
      Left = 6
-      Height = 22
-      Top = 122
-      Width = 138
+      Height = 19
+      Top = 104
+      Width = 114
      BorderSpacing.Left = 6
      BorderSpacing.Top = 2
      Caption = 'RegExprCheckBox'
@ -83,76 +84,87 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideRight.Control = FilesGroupBox
      AnchorSideRight.Side = asrBottom
      Left = 6
-      Height = 29
-      Top = 91
+      Height = 21
+      Top = 81
      Width = 481
      Anchors = [akTop, akLeft, akRight]
      BorderSpacing.Left = 6
      BorderSpacing.Right = 6
+      ItemHeight = 13
+      MaxLength = -1
      TabOrder = 3
      Text = 'FileFilterCombobox'
    end
  end
  object BtnPanel: TPanel
-    Height = 41
-    Top = 438
+    Height = 35
+    Top = 444
    Width = 509
    Align = alBottom
    AutoSize = True
    BevelOuter = bvNone
-    ClientHeight = 41
+    ClientHeight = 35
    ClientWidth = 509
    TabOrder = 1
-    object ApplyButton: TButton
-      Left = 317
-      Height = 29
+    object CloseButton: TBitBtn
+      AnchorSideRight.Control = BtnPanel
+      AnchorSideBottom.Control = BtnPanel
+      Left = 419
+      Height = 23
      Top = 6
-      Width = 90
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'ApplyButton'
-      Constraints.MinWidth = 75
-      OnClick = ApplyButtonClick
-      TabOrder = 0
-    end
-    object CloseButton: TButton
-      Left = 413
-      Height = 29
-      Top = 6
-      Width = 90
+      Width = 84
      Align = alRight
      AutoSize = True
      BorderSpacing.Around = 6
      Caption = 'CloseButton'
      Constraints.MinWidth = 75
      ModalResult = 1
+      NumGlyphs = 0
+      TabOrder = 0
+    end
+    object ApplyButton: TBitBtn
+      AnchorSideRight.Control = CloseButton
+      AnchorSideBottom.Control = BtnPanel
+      Left = 328
+      Height = 23
+      Top = 6
+      Width = 85
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = 'ApplyButton'
+      Constraints.MinWidth = 75
+      NumGlyphs = 0
+      OnClick = ApplyButtonClick
      TabOrder = 1
    end
-    object PreviewButton: TButton
-      Left = 208
-      Height = 29
+    object PreviewButton: TBitBtn
+      AnchorSideRight.Control = ApplyButton
+      AnchorSideBottom.Control = BtnPanel
+      Left = 226
+      Height = 23
      Top = 6
-      Width = 103
+      Width = 96
      Align = alRight
      AutoSize = True
      BorderSpacing.Around = 6
      Caption = 'PreviewButton'
      Constraints.MinWidth = 75
+      NumGlyphs = 0
      OnClick = PreviewButtonClick
      TabOrder = 2
    end
  end
  object ScopeGroupBox: TGroupBox
    Left = 6
-    Height = 60
+    Height = 51
    Top = 6
    Width = 497
    Align = alTop
    AutoSize = True
    BorderSpacing.Around = 6
    Caption = 'ScopeGroupBox'
-    ClientHeight = 41
+    ClientHeight = 33
    ClientWidth = 493
    TabOrder = 2
    object NewEncodingLabel: TLabel
@ -160,10 +172,10 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideTop.Control = NewEncodingComboBox
      AnchorSideTop.Side = asrCenter
      AnchorSideRight.Control = NewEncodingComboBox
-      Left = 240
-      Height = 18
-      Top = 11
-      Width = 120
+      Left = 270
+      Height = 14
+      Top = 9
+      Width = 90
      Anchors = [akTop, akRight]
      BorderSpacing.Left = 15
      Caption = 'NewEncodingLabel'
@ -174,11 +186,13 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideTop.Control = ScopeGroupBox
      AnchorSideRight.Control = NewEncodingLabel
      Left = 6
-      Height = 29
+      Height = 21
      Top = 6
-      Width = 219
+      Width = 249
      Anchors = [akTop, akLeft, akRight]
      BorderSpacing.Around = 6
+      ItemHeight = 13
+      MaxLength = -1
      TabOrder = 0
      Text = 'OwnerComboBox'
    end
@ -187,30 +201,32 @@ object ChgEncodingDialog: TChgEncodingDialog
      AnchorSideRight.Control = ScopeGroupBox
      AnchorSideRight.Side = asrBottom
      Left = 360
-      Height = 29
+      Height = 21
      Top = 6
      Width = 127
      Anchors = [akTop, akRight]
      BorderSpacing.Top = 6
      BorderSpacing.Right = 6
      BorderSpacing.Bottom = 6
+      ItemHeight = 13
+      MaxLength = -1
      TabOrder = 1
      Text = 'NewEncodingComboBox'
    end
  end
  object PreviewGroupBox: TGroupBox
    Left = 6
-    Height = 191
-    Top = 241
+    Height = 228
+    Top = 210
    Width = 497
    Align = alClient
    BorderSpacing.Around = 6
    Caption = 'PreviewGroupBox'
-    ClientHeight = 172
+    ClientHeight = 210
    ClientWidth = 493
    TabOrder = 3
    object PreviewListView: TListView
-      Height = 172
+      Height = 210
      Width = 493
      Align = alClient
      Columns = <      
--- a/converter/chgencodingdlg.lrs
+++ b/converter/chgencodingdlg.lrs
@ -4,72 +4,77 @@ LazarusResources.Add('TChgEncodingDialog','FORMDATA',[
  'TPF0'#18'TChgEncodingDialog'#17'ChgEncodingDialog'#4'Left'#3'"'#1#6'Height'#3
  +#223#1#3'Top'#3#191#0#5'Width'#3#253#1#13'ActiveControl'#7#13'OwnerComboBox'
  +#7'Caption'#6#17'ChgEncodingDialog'#12'ClientHeight'#3#223#1#11'ClientWidth'
-  +#3#253#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#10'LCLV'
-  +'ersion'#6#6'0.9.25'#0#9'TGroupBox'#13'FilesGroupBox'#4'Left'#2#6#6'Height'#3
-  +#163#0#3'Top'#2'H'#5'Width'#3#241#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#7'Caption'#6#13'FilesGroupBox'#12'ClientHeight'#3#144
-  +#0#11'ClientWidth'#3#237#1#8'TabOrder'#2#0#0#6'TLabel'#15'FileFilterLabel'#22
-  +'AnchorSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'#7#20
-  +'NonUTF8FilesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#18#3'Top'#2'G'#5'Width'#2'U'#18'BorderSpacing.Left'#2#6#17'BorderS'
-  +'pacing.Top'#2#15#20'BorderSpacing.Bottom'#2#2#7'Caption'#6#15'FileFilterLab'
-  +'el'#11'ParentColor'#8#0#0#9'TCheckBox'#17'UTF8FilesCheckBox'#22'AnchorSideL'
-  +'eft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'#7#13'FilesGroupB'
-  +'ox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#146#0#20'BorderSpacing'
-  +'.Around'#2#6#7'Caption'#6#17'UTF8FilesCheckBox'#7'Checked'#9#5'State'#7#9'c'
-  +'bChecked'#8'TabOrder'#2#0#0#0#9'TCheckBox'#20'NonUTF8FilesCheckBox'#22'Anch'
-  +'orSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'#7#17'UTF8'
-  +'FilesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +#22#3'Top'#2'"'#5'Width'#3#172#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#20
-  +'NonUTF8FilesCheckBox'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#1#0
-  +#0#9'TCheckBox'#15'RegExprCheckBox'#22'AnchorSideLeft.Control'#7#13'FilesGro'
-  +'upBox'#21'AnchorSideTop.Control'#7#18'FileFilterCombobox'#18'AnchorSideTop.'
-  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'z'#5'Width'#3#138#0
-  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#7'Caption'#6#15'RegExp'
-  +'rCheckBox'#8'TabOrder'#2#2#0#0#9'TComboBox'#18'FileFilterCombobox'#22'Ancho'
-  +'rSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'#7#15'FileF'
-  +'ilterLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contro'
-  +'l'#7#13'FilesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2#29#3'Top'#2'['#5'Width'#3#225#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrde'
-  +'r'#2#3#4'Text'#6#18'FileFilterCombobox'#0#0#0#6'TPanel'#8'BtnPanel'#6'Heigh'
-  +'t'#2')'#3'Top'#3#182#1#5'Width'#3#253#1#5'Align'#7#8'alBottom'#8'AutoSize'#9
-  +#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWidth'#3#253#1#8
-  +'TabOrder'#2#1#0#7'TButton'#11'ApplyButton'#4'Left'#3'='#1#6'Height'#2#29#3
-  +'Top'#2#6#5'Width'#2'Z'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing'
-  +'.Around'#2#6#7'Caption'#6#11'ApplyButton'#20'Constraints.MinWidth'#2'K'#7'O'
-  +'nClick'#7#16'ApplyButtonClick'#8'TabOrder'#2#0#0#0#7'TButton'#11'CloseButto'
-  +'n'#4'Left'#3#157#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2'Z'#5'Align'#7#7'alR'
-  +'ight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'CloseButto'
-  +'n'#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#1#8'TabOrder'#2#1#0#0#7
-  +'TButton'#13'PreviewButton'#4'Left'#3#208#0#6'Height'#2#29#3'Top'#2#6#5'Widt'
-  +'h'#2'g'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#13'PreviewButton'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#18
-  +'PreviewButtonClick'#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#13'ScopeGroupBox'#4
-  +'Left'#2#6#6'Height'#2'<'#3'Top'#2#6#5'Width'#3#241#1#5'Align'#7#5'alTop'#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'ScopeGroupBox'#12
-  +'ClientHeight'#2')'#11'ClientWidth'#3#237#1#8'TabOrder'#2#2#0#6'TLabel'#16'N'
-  +'ewEncodingLabel'#22'AnchorSideLeft.Control'#7#19'NewEncodingComboBox'#21'An'
-  +'chorSideTop.Control'#7#19'NewEncodingComboBox'#18'AnchorSideTop.Side'#7#9'a'
-  +'srCenter'#23'AnchorSideRight.Control'#7#19'NewEncodingComboBox'#4'Left'#3
-  +#240#0#6'Height'#2#18#3'Top'#2#11#5'Width'#2'x'#7'Anchors'#11#5'akTop'#7'akR'
-  +'ight'#0#18'BorderSpacing.Left'#2#15#7'Caption'#6#16'NewEncodingLabel'#11'Pa'
-  +'rentColor'#8#0#0#9'TComboBox'#13'OwnerComboBox'#22'AnchorSideLeft.Control'#7
-  +#13'ScopeGroupBox'#21'AnchorSideTop.Control'#7#13'ScopeGroupBox'#23'AnchorSi'
-  +'deRight.Control'#7#16'NewEncodingLabel'#4'Left'#2#6#6'Height'#2#29#3'Top'#2
-  +#6#5'Width'#3#219#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderS'
-  +'pacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#13'OwnerComboBox'#0#0#9'TCombo'
-  +'Box'#19'NewEncodingComboBox'#21'AnchorSideTop.Control'#7#13'ScopeGroupBox'
-  +#23'AnchorSideRight.Control'#7#13'ScopeGroupBox'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#3'h'#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2''#7'Anchors'
-  +#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
-  +#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#1#4'Text'#6#19'NewEncodingComb'
-  +'oBox'#0#0#0#9'TGroupBox'#15'PreviewGroupBox'#4'Left'#2#6#6'Height'#3#191#0#3
-  ,'Top'#3#241#0#5'Width'#3#241#1#5'Align'#7#8'alClient'#20'BorderSpacing.Aroun'
-  +'d'#2#6#7'Caption'#6#15'PreviewGroupBox'#12'ClientHeight'#3#172#0#11'ClientW'
-  +'idth'#3#237#1#8'TabOrder'#2#3#0#9'TListView'#15'PreviewListView'#6'Height'#3
-  +#172#0#5'Width'#3#237#1#5'Align'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#5
-  +'Files'#8'MinWidth'#2'K'#5'Width'#3','#1#0#1#7'Caption'#6#8'Encoding'#8'MinW'
-  +'idth'#2'K'#5'Width'#3#175#0#0#0#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0
-  +#0#0#0
+  +#3#253#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#10'Pare'
+  +'ntFont'#8#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#13'FilesGroupBox'#4'Lef'
+  +'t'#2#6#6'Height'#3#141#0#3'Top'#2'?'#5'Width'#3#241#1#5'Align'#7#5'alTop'#8
+  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'FilesGroupBox'#12
+  +'ClientHeight'#2'{'#11'ClientWidth'#3#237#1#8'TabOrder'#2#0#0#6'TLabel'#15'F'
+  +'ileFilterLabel'#22'AnchorSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSid'
+  +'eTop.Control'#7#20'NonUTF8FilesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'A'#5'Width'#2'B'#18'BorderSpacing.L'
+  +'eft'#2#6#17'BorderSpacing.Top'#2#15#20'BorderSpacing.Bottom'#2#2#7'Caption'
+  +#6#15'FileFilterLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#17'UTF8FilesCheckB'
+  +'ox'#22'AnchorSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'
+  +#7#13'FilesGroupBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#2'w'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#17'UTF8FilesCheckBox'#7'Checked'#9#5
+  +'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#9'TCheckBox'#20'NonUTF8FilesCheck'
+  +'Box'#22'AnchorSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Contro'
+  +'l'#7#17'UTF8FilesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#19#3'Top'#2#31#5'Width'#3#138#0#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#20'NonUTF8FilesCheckBox'#7'Checked'#9#5'State'#7#9'cbChecked'#8
+  +'TabOrder'#2#1#0#0#9'TCheckBox'#15'RegExprCheckBox'#22'AnchorSideLeft.Contro'
+  +'l'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'#7#18'FileFilterCombobox'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'h'#5
+  +'Width'#2'r'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#7'Caption'
+  +#6#15'RegExprCheckBox'#8'TabOrder'#2#2#0#0#9'TComboBox'#18'FileFilterCombobo'
+  +'x'#22'AnchorSideLeft.Control'#7#13'FilesGroupBox'#21'AnchorSideTop.Control'
+  +#7#15'FileFilterLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRi'
+  +'ght.Control'#7#13'FilesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#21#3'Top'#2'Q'#5'Width'#3#225#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2
+  +#6#10'ItemHeight'#2#13#9'MaxLength'#2#255#8'TabOrder'#2#3#4'Text'#6#18'FileF'
+  +'ilterCombobox'#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'#'#3'Top'#3#188#1#5
+  +'Width'#3#253#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNo'
+  +'ne'#12'ClientHeight'#2'#'#11'ClientWidth'#3#253#1#8'TabOrder'#2#1#0#7'TBitB'
+  +'tn'#11'CloseButton'#23'AnchorSideRight.Control'#7#8'BtnPanel'#24'AnchorSide'
+  +'Bottom.Control'#7#8'BtnPanel'#4'Left'#3#163#1#6'Height'#2#23#3'Top'#2#6#5'W'
+  +'idth'#2'T'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#11'CloseButton'#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2
+  +#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#11'ApplyButton'#23'Anchor'
+  +'SideRight.Control'#7#11'CloseButton'#24'AnchorSideBottom.Control'#7#8'BtnPa'
+  +'nel'#4'Left'#3'H'#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'U'#5'Align'#7#7'al'
+  +'Right'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'ApplyButt'
+  +'on'#20'Constraints.MinWidth'#2'K'#9'NumGlyphs'#2#0#7'OnClick'#7#16'ApplyBut'
+  +'tonClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#13'PreviewButton'#23'AnchorSideRig'
+  +'ht.Control'#7#11'ApplyButton'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4
+  +'Left'#3#226#0#6'Height'#2#23#3'Top'#2#6#5'Width'#2'`'#5'Align'#7#7'alRight'
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'PreviewButton'#20
+  +'Constraints.MinWidth'#2'K'#9'NumGlyphs'#2#0#7'OnClick'#7#18'PreviewButtonCl'
+  +'ick'#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#13'ScopeGroupBox'#4'Left'#2#6#6'Hei'
+  +'ght'#2'3'#3'Top'#2#6#5'Width'#3#241#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#13'ScopeGroupBox'#12'ClientHeight'#2
+  +'!'#11'ClientWidth'#3#237#1#8'TabOrder'#2#2#0#6'TLabel'#16'NewEncodingLabel'
+  +#22'AnchorSideLeft.Control'#7#19'NewEncodingComboBox'#21'AnchorSideTop.Contr'
+  +'ol'#7#19'NewEncodingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anch'
+  +'orSideRight.Control'#7#19'NewEncodingComboBox'#4'Left'#3#14#1#6'Height'#2#14
+  +#3'Top'#2#9#5'Width'#2'Z'#7'Anchors'#11#5'akTop'#7'akRight'#0#18'BorderSpaci'
+  +'ng.Left'#2#15#7'Caption'#6#16'NewEncodingLabel'#11'ParentColor'#8#0#0#9'TCo'
+  +'mboBox'#13'OwnerComboBox'#22'AnchorSideLeft.Control'#7#13'ScopeGroupBox'#21
+  +'AnchorSideTop.Control'#7#13'ScopeGroupBox'#23'AnchorSideRight.Control'#7#16
+  +'NewEncodingLabel'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3#249#0#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#10
+  +'ItemHeight'#2#13#9'MaxLength'#2#255#8'TabOrder'#2#0#4'Text'#6#13'OwnerCombo'
+  +'Box'#0#0#9'TComboBox'#19'NewEncodingComboBox'#21'AnchorSideTop.Control'#7#13
+  ,'ScopeGroupBox'#23'AnchorSideRight.Control'#7#13'ScopeGroupBox'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#4'Left'#3'h'#1#6'Height'#2#21#3'Top'#2#6#5'Widt'
+  +'h'#2''#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'Bo'
+  +'rderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#10'ItemHeight'#2#13#9'M'
+  +'axLength'#2#255#8'TabOrder'#2#1#4'Text'#6#19'NewEncodingComboBox'#0#0#0#9'T'
+  +'GroupBox'#15'PreviewGroupBox'#4'Left'#2#6#6'Height'#3#228#0#3'Top'#3#210#0#5
+  +'Width'#3#241#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Captio'
+  +'n'#6#15'PreviewGroupBox'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#237#1#8
+  +'TabOrder'#2#3#0#9'TListView'#15'PreviewListView'#6'Height'#3#210#0#5'Width'
+  +#3#237#1#5'Align'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#5'Files'#8'MinW'
+  +'idth'#2'K'#5'Width'#3','#1#0#1#7'Caption'#6#8'Encoding'#8'MinWidth'#2'K'#5
+  +'Width'#3#175#0#0#0#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0#0#0
 ]);
--- a/converter/chgencodingdlg.pas
+++ b/converter/chgencodingdlg.pas
@ -37,24 +37,24 @@ uses
  CodeCache, CodeToolsStructs, CodeToolManager, AVL_Tree,
  // IDE
  IDEProcs, CodeBrowser, PackageDefs, PackageSystem, Project,
-  LazarusIDEStrConsts;
+  LazarusIDEStrConsts, Buttons;

 type

  { TChgEncodingDialog }

  TChgEncodingDialog = class(TForm)
+    ApplyButton: TBitBtn;
    BtnPanel: TPanel;
+    CloseButton: TBitBtn;
    NewEncodingComboBox: TComboBox;
    FileFilterCombobox: TComboBox;
    NewEncodingLabel: TLabel;
-    PreviewButton: TButton;
+    PreviewButton: TBitBtn;
    PreviewListView: TListView;
-    CloseButton: TButton;
    PreviewGroupBox: TGroupBox;
    OwnerComboBox: TComboBox;
    ScopeGroupBox: TGroupBox;
-    ApplyButton: TButton;
    RegExprCheckBox: TCheckBox;
    FileFilterLabel: TLabel;
    NonUTF8FilesCheckBox: TCheckBox;
@ -106,6 +106,9 @@ begin
  PreviewButton.Caption:=lisUpdatePreview;
  CloseButton.Caption:=lisMenuClose;
  ApplyButton.Caption:=lisConvert;
+  PreviewButton.LoadGlyphFromLazarusResource('refresh');
+  CloseButton.LoadGlyphFromLazarusResource('btn_close');
+  ApplyButton.LoadGlyphFromLazarusResource('btn_ok');

  PreviewGroupBox.Caption:=dlgWRDPreview;
  PreviewListView.Column[0].Caption:=dlgEnvFiles;
--- a/designer/aligncompsdlg.lfm
+++ b/designer/aligncompsdlg.lfm
@ -3,19 +3,19 @@ object AlignComponentsDialog: TAlignComponentsDialog
  Height = 238
  Top = 325
  Width = 400
-  HorzScrollBar.Page = 399
-  VertScrollBar.Page = 237
  ActiveControl = OKButton
  BorderStyle = bsSizeToolWin
  Caption = 'AlignComponentsDialog'
  ClientHeight = 238
  ClientWidth = 400
  OnResize = FormResize
+  ParentFont = False
  Position = poScreenCenter
+  LCLVersion = '0.9.25'
  object HorizontalRadioGroup: TRadioGroup
    AnchorSideBottom.Control = ACDBtnPanel
    Left = 6
-    Height = 176
+    Height = 191
    Top = 6
    Width = 191
    Anchors = [akTop, akLeft, akBottom]
@ -35,7 +35,7 @@ object AlignComponentsDialog: TAlignComponentsDialog
  object VerticalRadioGroup: TRadioGroup
    AnchorSideBottom.Control = ACDBtnPanel
    Left = 203
-    Height = 176
+    Height = 191
    Top = 6
    Width = 191
    Anchors = [akTop, akRight, akBottom]
@ -53,23 +53,21 @@ object AlignComponentsDialog: TAlignComponentsDialog
    TabOrder = 1
  end
  object ACDBtnPanel: TPanel
-    Height = 50
-    Top = 188
+    Height = 35
+    Top = 203
    Width = 400
    Align = alBottom
    AutoSize = True
    BevelOuter = bvNone
-    ClientHeight = 50
+    ClientHeight = 35
    ClientWidth = 400
    TabOrder = 2
    object OKButton: TBitBtn
-      AnchorSideRight.Control = CancelButton
-      Left = 227
-      Height = 38
+      Left = 238
+      Height = 23
      Top = 6
      Width = 75
      Align = alRight
-      Anchors = [akRight, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
      Caption = '&OK'
@ -82,10 +80,10 @@ object AlignComponentsDialog: TAlignComponentsDialog
    end
    object CancelButton: TBitBtn
      AnchorSideRight.Side = asrBottom
-      Left = 308
-      Height = 38
+      Left = 319
+      Height = 23
      Top = 6
-      Width = 86
+      Width = 75
      Align = alRight
      AutoSize = True
      BorderSpacing.Around = 6
--- a/designer/aligncompsdlg.lrs
+++ b/designer/aligncompsdlg.lrs
@ -2,39 +2,38 @@

 LazarusResources.Add('TAlignComponentsDialog','FORMDATA',[
  'TPF0'#22'TAlignComponentsDialog'#21'AlignComponentsDialog'#4'Left'#3'j'#1#6
-  +'Height'#3#238#0#3'Top'#3'E'#1#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143
-  +#1#18'VertScrollBar.Page'#3#237#0#13'ActiveControl'#7#8'OKButton'#11'BorderS'
-  +'tyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComponentsDialog'#12'ClientH'
-  +'eight'#3#238#0#11'ClientWidth'#3#144#1#8'OnResize'#7#10'FormResize'#8'Posit'
-  +'ion'#7#14'poScreenCenter'#0#11'TRadioGroup'#20'HorizontalRadioGroup'#24'Anc'
-  +'horSideBottom.Control'#7#11'ACDBtnPanel'#4'Left'#2#6#6'Height'#3#176#0#3'To'
-  +'p'#2#6#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'Au'
-  +'toFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'HorizontalRadioGroup'
-  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
-  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
-  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
-  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
-  +'ilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSi'
-  +'zing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#11'TRadioGroup'#18'VerticalRa'
-  +'dioGroup'#24'AnchorSideBottom.Control'#7#11'ACDBtnPanel'#4'Left'#3#203#0#6
-  +'Height'#3#176#0#3'Top'#2#6#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#7'akRigh'
-  +'t'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18
-  +'VerticalRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.Top'
-  +'BottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChil'
-  +'dResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28
-  +'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVer'
-  +'tical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenT'
-  +'opToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#1#0#0#6'TPane'
-  +'l'#11'ACDBtnPanel'#6'Height'#2'2'#3'Top'#3#188#0#5'Width'#3#144#1#5'Align'#7
-  +#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'
-  +#11'ClientWidth'#3#144#1#8'TabOrder'#2#2#0#7'TBitBtn'#8'OKButton'#23'AnchorS'
-  +'ideRight.Control'#7#12'CancelButton'#4'Left'#3#227#0#6'Height'#2'&'#3'Top'#2
-  +#6#5'Width'#2'K'#5'Align'#7#7'alRight'#7'Anchors'#11#7'akRight'#8'akBottom'#0
-  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#20'Constrain'
-  +'ts.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumG'
-  +'lyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRig'
-  +'ht.Side'#7#9'asrBottom'#4'Left'#3'4'#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2
-  +'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
-  +'on'#6#6'Cancel'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'Moda'
-  +'lResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#0
+  +'Height'#3#238#0#3'Top'#3'E'#1#5'Width'#3#144#1#13'ActiveControl'#7#8'OKButt'
+  +'on'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComponentsDial'
+  +'og'#12'ClientHeight'#3#238#0#11'ClientWidth'#3#144#1#8'OnResize'#7#10'FormR'
+  +'esize'#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6
+  +'0.9.25'#0#11'TRadioGroup'#20'HorizontalRadioGroup'#24'AnchorSideBottom.Cont'
+  +'rol'#7#11'ACDBtnPanel'#4'Left'#2#6#6'Height'#3#191#0#3'Top'#2#6#5'Width'#3
+  +#191#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#20'Borde'
+  +'rSpacing.Around'#2#6#7'Caption'#6#20'HorizontalRadioGroup'#28'ChildSizing.L'
+  +'eftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.En'
+  +'largeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVerti'
+  +'cal'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'c'
+  +'rsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'Child'
+  +'Sizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsP'
+  +'erLine'#2#1#8'TabOrder'#2#0#0#0#11'TRadioGroup'#18'VerticalRadioGroup'#24'A'
+  +'nchorSideBottom.Control'#7#11'ACDBtnPanel'#4'Left'#3#203#0#6'Height'#3#191#0
+  +#3'Top'#2#6#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0
+  +#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'VerticalRadioGro'
+  +'up'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2
+  +#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'Child'
+  +'Sizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.Shrin'
+  +'kHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsSc'
+  +'aleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'Ch'
+  +'ildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#1#0#0#6'TPanel'#11'ACDBtnPanel'
+  +#6'Height'#2'#'#3'Top'#3#203#0#5'Width'#3#144#1#5'Align'#7#8'alBottom'#8'Aut'
+  +'oSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'#'#11'ClientWidth'#3
+  +#144#1#8'TabOrder'#2#2#0#7'TBitBtn'#8'OKButton'#4'Left'#3#238#0#6'Height'#2
+  +#23#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Defau'
+  +'lt'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0
+  +#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+  +'eft'#3'?'#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8
+  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'#20'Constrai'
+  +'nts.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2
+  +#0#8'TabOrder'#2#1#0#0#0#0
 ]);
--- a/designer/aligncompsdlg.pp
+++ b/designer/aligncompsdlg.pp
@ -117,6 +117,8 @@ begin

  OkButton.Caption:=dlgButApply;
  CancelButton.Caption:=dlgCancel;
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
 end;

 initialization
--- a/designer/designermenu.lfm
+++ b/designer/designermenu.lfm
@ -3,8 +3,6 @@ object TemplateMenuForm: TTemplateMenuForm
  Height = 240
  Top = 199
  Width = 520
-  HorzScrollBar.Page = 519
-  VertScrollBar.Page = 239
  Caption = 'TemplateMenuForm'
  ClientHeight = 240
  ClientWidth = 520
@ -12,7 +10,9 @@ object TemplateMenuForm: TTemplateMenuForm
  Constraints.MinWidth = 350
  OnCreate = FormCreate
  OnResize = FormResize
+  ParentFont = False
  Position = poScreenCenter
+  LCLVersion = '0.9.25'
  object Label_template_description: TLabel
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
@ -43,7 +43,7 @@ object TemplateMenuForm: TTemplateMenuForm
    AnchorSideBottom.Control = ListBoxView
    AnchorSideBottom.Side = asrBottom
    Left = 6
-    Height = 176
+    Height = 179
    Top = 26
    Width = 244
    Anchors = [akTop, akLeft, akBottom]
@ -61,7 +61,7 @@ object TemplateMenuForm: TTemplateMenuForm
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = CancelBitBtn
    Left = 262
-    Height = 176
+    Height = 179
    Top = 26
    Width = 252
    Anchors = [akTop, akLeft, akRight, akBottom]
@ -77,7 +77,7 @@ object TemplateMenuForm: TTemplateMenuForm
    AnchorSideRight.Side = asrBottom
    Left = 6
    Height = 23
-    Top = 208
+    Top = 211
    Width = 244
    Anchors = [akTop, akLeft, akRight]
    BorderSpacing.Top = 6
@ -89,10 +89,10 @@ object TemplateMenuForm: TTemplateMenuForm
    AnchorSideRight.Control = CancelBitBtn
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 364
-    Height = 26
-    Top = 208
-    Width = 60
+    Left = 420
+    Height = 23
+    Top = 211
+    Width = 36
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Right = 6
@ -110,10 +110,10 @@ object TemplateMenuForm: TTemplateMenuForm
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 430
-    Height = 26
-    Top = 208
-    Width = 84
+    Left = 462
+    Height = 23
+    Top = 211
+    Width = 52
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Around = 6
--- a/designer/designermenu.lrs
+++ b/designer/designermenu.lrs
@ -2,48 +2,48 @@

 LazarusResources.Add('TTemplateMenuForm','FORMDATA',[
  'TPF0'#17'TTemplateMenuForm'#16'TemplateMenuForm'#4'Left'#3#25#2#6'Height'#3
-  +#240#0#3'Top'#3#199#0#5'Width'#3#8#2#18'HorzScrollBar.Page'#3#7#2#18'VertScr'
-  +'ollBar.Page'#3#239#0#7'Caption'#6#16'TemplateMenuForm'#12'ClientHeight'#3
-  +#240#0#11'ClientWidth'#3#8#2#21'Constraints.MinHeight'#2'd'#20'Constraints.M'
-  +'inWidth'#3'^'#1#8'OnCreate'#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#8
-  +'Position'#7#14'poScreenCenter'#0#6'TLabel'#26'Label_template_description'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'L'
-  +'eft'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#132#0#18'BorderSpacing.Left'#2
-  +#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'Label_template_description'#11
-  +'ParentColor'#8#0#0#6'TLabel'#19'Label_template_view'#22'AnchorSideLeft.Cont'
-  +'rol'#7#11'ListBoxView'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#3#6#1#6
-  +'Height'#2#14#3'Top'#2#6#5'Width'#2'f'#17'BorderSpacing.Top'#2#6#7'Caption'#6
-  +#19'Label_template_view'#11'ParentColor'#8#0#0#8'TListBox'#16'TemplatesListB'
-  +'ox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#26'La'
-  +'bel_template_description'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSi'
-  +'deBottom.Control'#7#11'ListBoxView'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#3#176#0#3'Top'#2#26#5'Width'#3#244#0#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
-  +'Top'#2#6#7'OnClick'#7#21'TemplatesListBoxClick'#8'TabOrder'#2#0#0#0#8'TList'
-  +'Box'#11'ListBoxView'#22'AnchorSideLeft.Control'#7#16'TemplatesListBox'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Label_tem'
-  +'plate_view'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contro'
-  +'l'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.C'
-  +'ontrol'#7#12'CancelBitBtn'#4'Left'#3#6#1#6'Height'#3#176#0#3'Top'#2#26#5'Wi'
-  +'dth'#3#252#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'B'
-  +'orderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#1#0#0#5'T'
-  +'Edit'#25'Edit_template_description'#22'AnchorSideLeft.Control'#7#16'Templat'
-  +'esListBox'#21'AnchorSideTop.Control'#7#16'TemplatesListBox'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#16'TemplatesListBox'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#208
-  +#0#5'Width'#3#244#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderS'
-  +'pacing.Top'#2#6#8'TabOrder'#2#2#4'Text'#6#25'Edit_template_description'#7'V'
-  +'isible'#8#0#0#7'TBitBtn'#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'Cance'
-  +'lBitBtn'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7
-  +#9'asrBottom'#4'Left'#3'l'#1#6'Height'#2#26#3'Top'#3#208#0#5'Width'#2'<'#7'A'
-  +'nchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2
-  +#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#3'&'#206#202#7'Default'#9#4'Kin'
-  +'d'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OKBitBtnC'
-  +'lick'#8'TabOrder'#2#3#0#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSideRight.Co'
-  +'ntrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBott'
-  +'om.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +#174#1#6'Height'#2#26#3'Top'#3#208#0#5'Width'#2'T'#7'Anchors'#11#7'akRight'#8
-  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Captio'
-  +'n'#6#6#206#242#236#229#237#224#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#17'CancelBitBtnClick'#8'TabOrder'#2#4#0#0#0
+  +#240#0#3'Top'#3#199#0#5'Width'#3#8#2#7'Caption'#6#16'TemplateMenuForm'#12'Cl'
+  +'ientHeight'#3#240#0#11'ClientWidth'#3#8#2#21'Constraints.MinHeight'#2'd'#20
+  +'Constraints.MinWidth'#3'^'#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.25'#0#6'TLabel'#26'Label_template_description'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height'
+  +#2#14#3'Top'#2#6#5'Width'#3#132#0#18'BorderSpacing.Left'#2#6#17'BorderSpacin'
+  +'g.Top'#2#6#7'Caption'#6#26'Label_template_description'#11'ParentColor'#8#0#0
+  +#6'TLabel'#19'Label_template_view'#22'AnchorSideLeft.Control'#7#11'ListBoxVi'
+  +'ew'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#3#6#1#6'Height'#2#14#3'Top'
+  +#2#6#5'Width'#2'f'#17'BorderSpacing.Top'#2#6#7'Caption'#6#19'Label_template_'
+  +'view'#11'ParentColor'#8#0#0#8'TListBox'#16'TemplatesListBox'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#26'Label_template_descr'
+  +'iption'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7
+  +#11'ListBoxView'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
+  +'ht'#3#179#0#3'Top'#2#26#5'Width'#3#244#0#7'Anchors'#11#5'akTop'#6'akLeft'#8
+  +'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'OnClick'
+  +#7#21'TemplatesListBoxClick'#8'TabOrder'#2#0#0#0#8'TListBox'#11'ListBoxView'
+  +#22'AnchorSideLeft.Control'#7#16'TemplatesListBox'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Label_template_view'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Ancho'
+  +'rSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'CancelBit'
+  +'Btn'#4'Left'#3#6#1#6'Height'#3#179#0#3'Top'#2#26#5'Width'#3#252#0#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#20
+  +'BorderSpacing.Around'#2#6#8'TabOrder'#2#1#0#0#5'TEdit'#25'Edit_template_des'
+  +'cription'#22'AnchorSideLeft.Control'#7#16'TemplatesListBox'#21'AnchorSideTo'
+  +'p.Control'#7#16'TemplatesListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
+  +'AnchorSideRight.Control'#7#16'TemplatesListBox'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#211#0#5'Width'#3#244#0#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#8'TabOrd'
+  +'er'#2#2#4'Text'#6#25'Edit_template_description'#7'Visible'#8#0#0#7'TBitBtn'
+  +#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'CancelBitBtn'#24'AnchorSideBot'
+  +'tom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#164#1#6'Height'#2#23#3'Top'#3#211#0#5'Width'#2'$'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bott'
+  +'om'#2#6#7'Caption'#6#5'&'#195#142#195#138#7'Default'#9#4'Kind'#7#4'bkOK'#11
+  +'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OKBitBtnClick'#8'TabOrder'
+  +#2#3#0#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSideRight.Control'#7#5'Owner'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Ow'
+  +'ner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#206#1#6'Height'#2#23
+  +#3'Top'#3#211#0#5'Width'#2'4'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoS'
+  +'ize'#9#20'BorderSpacing.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'NumGlyphs'#2#0#7'OnClick'#7#17'CancelBitBtnClick'#8'TabOrder'#2#4#0#0#0
 ]);
--- a/designer/designermenu.pp
+++ b/designer/designermenu.pp
@ -2010,6 +2010,8 @@ begin
  
  OKBitBtn.Caption:=lisOkBtn;
  CancelBitBtn.Caption:=dlgCancel;
+  OKBitBtn.LoadGlyphFromLazarusResource('btn_ok');
+  CancelBitBtn.LoadGlyphFromLazarusResource('btn_cancel');

  // Templates from menutemplates.xml
  i:=1;
--- a/designer/scalecompsdlg.lfm
+++ b/designer/scalecompsdlg.lfm
@ -3,14 +3,13 @@ object ScaleComponentsDialog: TScaleComponentsDialog
  Height = 82
  Top = 698
  Width = 258
-  HorzScrollBar.Page = 257
-  VertScrollBar.Page = 81
  ActiveControl = OKButton
  BorderIcons = [biSystemMenu, biMinimize]
  BorderStyle = bsToolWindow
  Caption = 'ScaleComponentsDialog'
  ClientHeight = 82
  ClientWidth = 258
+  ParentFont = False
  Position = poScreenCenter
  LCLVersion = '0.9.25'
  object PercentLabel: TLabel
@ -41,10 +40,10 @@ object ScaleComponentsDialog: TScaleComponentsDialog
    AnchorSideRight.Control = CancelButton
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 108
-    Height = 26
-    Top = 50
-    Width = 60
+    Left = 148
+    Height = 23
+    Top = 53
+    Width = 40
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Right = 6
@ -61,10 +60,10 @@ object ScaleComponentsDialog: TScaleComponentsDialog
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 174
-    Height = 26
-    Top = 50
-    Width = 78
+    Left = 194
+    Height = 23
+    Top = 53
+    Width = 58
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Right = 6
--- a/designer/scalecompsdlg.lrs
+++ b/designer/scalecompsdlg.lrs
@ -2,34 +2,34 @@

 LazarusResources.Add('TScaleComponentsDialog','FORMDATA',[
  'TPF0'#22'TScaleComponentsDialog'#21'ScaleComponentsDialog'#4'Left'#3't'#1#6
-  +'Height'#2'R'#3'Top'#3#186#2#5'Width'#3#2#1#18'HorzScrollBar.Page'#3#1#1#18
-  +'VertScrollBar.Page'#2'Q'#13'ActiveControl'#7#8'OKButton'#11'BorderIcons'#11
-  +#12'biSystemMenu'#10'biMinimize'#0#11'BorderStyle'#7#12'bsToolWindow'#7'Capt'
-  +'ion'#6#21'ScaleComponentsDialog'#12'ClientHeight'#2'R'#11'ClientWidth'#3#2#1
-  +#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#12
-  +'PercentLabel'#21'AnchorSideTop.Control'#7#11'PercentEdit'#18'AnchorSideTop.'
-  +'Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
-  +'ght.Side'#7#9'asrBottom'#4'Left'#3#189#0#6'Height'#2#14#3'Top'#2#10#5'Width'
-  +#2'?'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Capt'
-  +'ion'#6#12'PercentLabel'#11'ParentColor'#8#0#0#6'TLabel'#10'ScaleLabel'#21'A'
-  +'nchorSideTop.Control'#7#11'PercentEdit'#18'AnchorSideTop.Side'#7#9'asrCente'
-  +'r'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#10#5'Width'#2'3'#7'Caption'#6#10'Sca'
-  +'leLabel'#11'ParentColor'#8#0#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRight.Co'
-  +'ntrol'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anchor'
-  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#2'l'#6'Height'#2#26#3'Top'#2'2'#5'W'
-  +'idth'#2'<'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSp'
-  +'acing.Right'#2#6#20'BorderSpacing.Bottom'#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#0#0#0
-  +#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'Ancho'
-  +'rSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#174#0#6'Height'#2#26#3'Top'
-  +#2'2'#5'Width'#2'N'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19
-  +'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#6'Cancel'
-  +#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0
-  +#0#5'TEdit'#11'PercentEdit'#22'AnchorSideLeft.Control'#7#10'ScaleLabel'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23
-  +'AnchorSideRight.Control'#7#12'PercentLabel'#4'Left'#2'A'#6'Height'#2#23#3'T'
-  +'op'#2#6#5'Width'#2'v'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Bord'
-  +'erSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8
-  +'TabOrder'#2#2#4'Text'#6#11'PercentEdit'#0#0#0
+  +'Height'#2'R'#3'Top'#3#186#2#5'Width'#3#2#1#13'ActiveControl'#7#8'OKButton'
+  +#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#0#11'BorderStyle'#7#12'b'
+  +'sToolWindow'#7'Caption'#6#21'ScaleComponentsDialog'#12'ClientHeight'#2'R'#11
+  +'ClientWidth'#3#2#1#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'#10'LCL'
+  +'Version'#6#6'0.9.25'#0#6'TLabel'#12'PercentLabel'#21'AnchorSideTop.Control'
+  +#7#11'PercentEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.'
+  +'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#189#0
+  +#6'Height'#2#14#3'Top'#2#10#5'Width'#2'?'#7'Anchors'#11#5'akTop'#7'akRight'#0
+  +#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'PercentLabel'#11'ParentColor'#8
+  +#0#0#6'TLabel'#10'ScaleLabel'#21'AnchorSideTop.Control'#7#11'PercentEdit'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#10#5
+  +'Width'#2'3'#7'Caption'#6#10'ScaleLabel'#11'ParentColor'#8#0#0#7'TBitBtn'#8
+  +'OKButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBotto'
+  +'m.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#148
+  +#0#6'Height'#2#23#3'Top'#2'5'#5'Width'#2'('#7'Anchors'#11#7'akRight'#8'akBot'
+  +'tom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#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#0#0#0#7'TBitBtn'#12'CancelButton'#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#194#0#6'Height'#2#23#3'Top'#2'5'#5'Width'#2':'#7'Anchors'#11#7'akRi'
+  +'ght'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpaci'
+  +'ng.Bottom'#2#6#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'
+  +#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#5'TEdit'#11'PercentEdit'#22'Anchor'
+  +'SideLeft.Control'#7#10'ScaleLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#12'PercentL'
+  +'abel'#4'Left'#2'A'#6'Height'#2#23#3'Top'#2#6#5'Width'#2'v'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.T'
+  +'op'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#2#4'Text'#6#11'PercentEdi'
+  +'t'#0#0#0
 ]);
--- a/designer/scalecompsdlg.pp
+++ b/designer/scalecompsdlg.pp
@ -66,13 +66,15 @@ constructor TScaleComponentsDialog.Create(AOwner: TComponent);
 begin
  inherited Create(AOwner);

-  Caption:='Scale';
+  Caption:=fdmScaleWord;

  ScaleLabel.Caption:=lisScalingFactor;
  PercentLabel.Caption:='%';

  OkButton.Caption:=dlgButApply;
  CancelButton.Caption:=dlgCancel;
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
 end;

 initialization
--- a/designer/sizecompsdlg.lfm
+++ b/designer/sizecompsdlg.lfm
@ -3,8 +3,6 @@ object SizeComponentsDialog: TSizeComponentsDialog
  Height = 190
  Top = 745
  Width = 380
-  HorzScrollBar.Page = 379
-  VertScrollBar.Page = 189
  ActiveControl = OKButton
  BorderStyle = bsSizeToolWin
  Caption = 'SizeComponentsDialog'
@ -12,15 +10,17 @@ object SizeComponentsDialog: TSizeComponentsDialog
  ClientWidth = 380
  OnClose = FormClose
  OnResize = FormResize
+  ParentFont = False
  Position = poScreenCenter
+  LCLVersion = '0.9.25'
  object OKButton: TBitBtn
    AnchorSideRight.Control = CancelButton
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 230
-    Height = 26
-    Top = 158
-    Width = 60
+    Left = 270
+    Height = 23
+    Top = 161
+    Width = 40
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Right = 6
@ -37,10 +37,10 @@ object SizeComponentsDialog: TSizeComponentsDialog
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 296
-    Height = 26
-    Top = 158
-    Width = 78
+    Left = 316
+    Height = 23
+    Top = 161
+    Width = 58
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Right = 6
@ -56,7 +56,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
    AnchorSideBottom.Control = HeightRadioGroup
    AnchorSideBottom.Side = asrBottom
    Left = 6
-    Height = 146
+    Height = 149
    Top = 6
    Width = 181
    Anchors = [akTop, akLeft, akBottom]
@ -71,7 +71,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
    ChildSizing.ShrinkVertical = crsScaleChilds
    ChildSizing.Layout = cclLeftToRightThenTopToBottom
    ChildSizing.ControlsPerLine = 1
-    ClientHeight = 128
+    ClientHeight = 131
    ClientWidth = 177
    TabOrder = 2
    object WidthEdit: TEdit
@ -79,7 +79,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
      AnchorSideBottom.Side = asrBottom
      Left = 86
      Height = 23
-      Top = 99
+      Top = 102
      Width = 80
      Anchors = [akRight, akBottom]
      BorderSpacing.Around = 6
@ -92,7 +92,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = OKButton
    Left = 193
-    Height = 146
+    Height = 149
    Top = 6
    Width = 181
    Anchors = [akTop, akLeft, akRight, akBottom]
@ -107,7 +107,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
    ChildSizing.ShrinkVertical = crsScaleChilds
    ChildSizing.Layout = cclLeftToRightThenTopToBottom
    ChildSizing.ControlsPerLine = 1
-    ClientHeight = 128
+    ClientHeight = 131
    ClientWidth = 177
    TabOrder = 3
    object HeightEdit: TEdit
@ -115,7 +115,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
      AnchorSideBottom.Side = asrBottom
      Left = 87
      Height = 23
-      Top = 99
+      Top = 102
      Width = 80
      Anchors = [akRight, akBottom]
      BorderSpacing.Around = 6
--- a/designer/sizecompsdlg.lrs
+++ b/designer/sizecompsdlg.lrs
@ -2,50 +2,50 @@

 LazarusResources.Add('TSizeComponentsDialog','FORMDATA',[
  'TPF0'#21'TSizeComponentsDialog'#20'SizeComponentsDialog'#4'Left'#3'{'#1#6'He'
-  +'ight'#3#190#0#3'Top'#3#233#2#5'Width'#3'|'#1#18'HorzScrollBar.Page'#3'{'#1
-  +#18'VertScrollBar.Page'#3#189#0#13'ActiveControl'#7#8'OKButton'#11'BorderSty'
-  +'le'#7#13'bsSizeToolWin'#7'Caption'#6#20'SizeComponentsDialog'#12'ClientHeig'
-  +'ht'#3#190#0#11'ClientWidth'#3'|'#1#7'OnClose'#7#9'FormClose'#8'OnResize'#7
-  +#10'FormResize'#8'Position'#7#14'poScreenCenter'#0#7'TBitBtn'#8'OKButton'#23
-  +'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5
-  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#230#0#6'Height'#2
-  +#26#3'Top'#3#158#0#5'Width'#2'<'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Au'
-  +'toSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Captio'
-  +'n'#6#3'&OK'#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'#23'AnchorSideRight.Cont'
-  +'rol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom'
-  +'.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'('#1
-  +#6'Height'#2#26#3'Top'#3#158#0#5'Width'#2'N'#7'Anchors'#11#7'akRight'#8'akBo'
-  +'ttom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2
-  +#6#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGly'
-  +'phs'#2#0#8'TabOrder'#2#1#0#0#11'TRadioGroup'#15'WidthRadioGroup'#22'AnchorS'
-  +'ideLeft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#16'HeightRadioGr'
-  +'oup'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#146#0
-  +#3'Top'#2#6#5'Width'#3#181#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8
-  +'AutoFill'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#15'WidthRadioGroup'#28
-  +'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'C'
-  +'hildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing'
-  +'.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHoriz'
-  +'ontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChi'
-  +'lds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSiz'
-  +'ing.ControlsPerLine'#2#1#12'ClientHeight'#3#128#0#11'ClientWidth'#3#177#0#8
-  +'TabOrder'#2#2#0#5'TEdit'#9'WidthEdit'#24'AnchorSideBottom.Control'#7#15'Wid'
-  +'thRadioGroup'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'V'#6'Heigh'
-  +'t'#2#23#3'Top'#2'c'#5'Width'#2'P'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20
-  +'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#9'WidthEdit'#0#0#0#11'T'
-  +'RadioGroup'#16'HeightRadioGroup'#23'AnchorSideRight.Control'#7#5'Owner'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'OKBut'
-  +'ton'#4'Left'#3#193#0#6'Height'#3#146#0#3'Top'#2#6#5'Width'#3#181#0#7'Anchor'
-  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'BorderSp'
-  +'acing.Around'#2#6#7'Caption'#6#16'HeightRadioGroup'#28'ChildSizing.LeftRigh'
-  +'tSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHo'
-  +'rizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7
+  +'ight'#3#190#0#3'Top'#3#233#2#5'Width'#3'|'#1#13'ActiveControl'#7#8'OKButton'
+  +#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#20'SizeComponentsDialog'#12
+  +'ClientHeight'#3#190#0#11'ClientWidth'#3'|'#1#7'OnClose'#7#9'FormClose'#8'On'
+  +'Resize'#7#10'FormResize'#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'
+  +#10'LCLVersion'#6#6'0.9.25'#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRight.Cont'
+  +'rol'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSi'
+  +'deBottom.Side'#7#9'asrBottom'#4'Left'#3#14#1#6'Height'#2#23#3'Top'#3#161#0#5
+  +'Width'#2'('#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderS'
+  +'pacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#3'&OK'#7'Defaul'
+  +'t'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0
+  +#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'A'
+  +'nchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'<'#1#6'Height'#2#23#3'To'
+  +'p'#3#161#0#5'Width'#2':'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'
+  +#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#6'C'
+  +'ancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrde'
+  +'r'#2#1#0#0#11'TRadioGroup'#15'WidthRadioGroup'#22'AnchorSideLeft.Control'#7
+  +#5'Owner'#24'AnchorSideBottom.Control'#7#16'HeightRadioGroup'#21'AnchorSideB'
+  +'ottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#149#0#3'Top'#2#6#5'Width'
+  +#3#181#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#18'Bor'
+  +'derSpacing.Left'#2#6#7'Caption'#6#15'WidthRadioGroup'#28'ChildSizing.LeftRi'
+  +'ghtSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enlarge'
+  +'Horizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7
  +#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScale'
  +'Childs'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.'
  +'Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'
-  +#2#1#12'ClientHeight'#3#128#0#11'ClientWidth'#3#177#0#8'TabOrder'#2#3#0#5'TE'
-  +'dit'#10'HeightEdit'#24'AnchorSideBottom.Control'#7#16'HeightRadioGroup'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'W'#6'Height'#2#23#3'Top'#2
-  +'c'#5'Width'#2'P'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Ar'
-  +'ound'#2#6#8'TabOrder'#2#0#4'Text'#6#10'HeightEdit'#0#0#0#0
+  +#2#1#12'ClientHeight'#3#131#0#11'ClientWidth'#3#177#0#8'TabOrder'#2#2#0#5'TE'
+  +'dit'#9'WidthEdit'#24'AnchorSideBottom.Control'#7#15'WidthRadioGroup'#21'Anc'
+  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2'V'#6'Height'#2#23#3'Top'#2'f'#5
+  +'Width'#2'P'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'
+  +#2#6#8'TabOrder'#2#0#4'Text'#6#9'WidthEdit'#0#0#0#11'TRadioGroup'#16'HeightR'
+  +'adioGroup'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'OKButton'#4'Left'#3#193#0#6'H'
+  +'eight'#3#149#0#3'Top'#2#6#5'Width'#3#181#0#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#16'HeightRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSiz'
+  +'ing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogen'
+  +'ousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResi'
+  +'ze'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Sh'
+  +'rinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRig'
+  +'htThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#3
+  +#131#0#11'ClientWidth'#3#177#0#8'TabOrder'#2#3#0#5'TEdit'#10'HeightEdit'#24
+  +'AnchorSideBottom.Control'#7#16'HeightRadioGroup'#21'AnchorSideBottom.Side'#7
+  +#9'asrBottom'#4'Left'#2'W'#6'Height'#2#23#3'Top'#2'f'#5'Width'#2'P'#7'Anchor'
+  +'s'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0
+  +#4'Text'#6#10'HeightEdit'#0#0#0#0
 ]);
--- a/designer/sizecompsdlg.pp
+++ b/designer/sizecompsdlg.pp
@ -119,6 +119,9 @@ begin
  HeightEdit.Text:='';

  OkButton.Caption:=lisOkBtn;
+  CancelButton.Caption:= dlgCancel;
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
 end;

 initialization
--- a/designer/taborderdlg.lfm
+++ b/designer/taborderdlg.lfm
@ -3,8 +3,6 @@ object TabOrderDialog: TTabOrderDialog
  Height = 387
  Top = 167
  Width = 310
-  HorzScrollBar.Page = 309
-  VertScrollBar.Page = 386
  ActiveControl = ItemTreeview
  BorderStyle = bsSizeToolWin
  Caption = 'TabOrderDialog'
@ -12,12 +10,36 @@ object TabOrderDialog: TTabOrderDialog
  ClientWidth = 310
  OnClose = TabOrderDialogCLOSE
  OnCreate = TabOrderDialogCREATE
+  ParentFont = False
  Position = poScreenCenter
  LCLVersion = '0.9.25'
+  object ArrowUp: TSpeedButton
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 279
+    Height = 25
+    Top = 120
+    Width = 25
+    Anchors = [akTop, akRight]
+    BorderSpacing.Around = 6
+    Color = clBtnFace
+    NumGlyphs = 0
+  end
+  object ArrowDown: TSpeedButton
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 279
+    Height = 25
+    Top = 176
+    Width = 25
+    Anchors = [akTop, akRight]
+    BorderSpacing.Around = 6
+    Color = clBtnFace
+    NumGlyphs = 0
+  end
  object ItemTreeview: TTreeView
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = ArrowDown
    AnchorSideBottom.Control = ShowOldValuesCheckbox
    Left = 6
    Height = 318
@ -38,7 +60,7 @@ object TabOrderDialog: TTabOrderDialog
    Left = 6
    Height = 19
    Top = 330
-    Width = 149
+    Width = 146
    Anchors = [akLeft, akBottom]
    BorderSpacing.Around = 6
    Caption = 'ShowOldValuesCheckbox'
@ -49,10 +71,10 @@ object TabOrderDialog: TTabOrderDialog
    AnchorSideRight.Control = CancelButton
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 160
+    Left = 162
    Height = 26
    Top = 355
-    Width = 60
+    Width = 59
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Around = 6
@ -68,10 +90,10 @@ object TabOrderDialog: TTabOrderDialog
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 226
+    Left = 227
    Height = 26
    Top = 355
-    Width = 78
+    Width = 77
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Around = 6
@ -82,28 +104,4 @@ object TabOrderDialog: TTabOrderDialog
    NumGlyphs = 0
    TabOrder = 3
  end
-  object ArrowUp: TArrow
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 279
-    Height = 25
-    Top = 120
-    Width = 25
-    Anchors = [akTop, akRight]
-    ArrowType = atUp
-    BorderSpacing.Around = 6
-    OnClick = UpSpeedbuttonCLICK
-  end
-  object ArrowDown: TArrow
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 279
-    Height = 25
-    Top = 176
-    Width = 25
-    Anchors = [akTop, akRight]
-    ArrowType = atDown
-    BorderSpacing.Around = 6
-    OnClick = DownSpeedbuttonCLICK
-  end
 end
--- a/designer/taborderdlg.lrs
+++ b/designer/taborderdlg.lrs
@ -2,41 +2,40 @@

 LazarusResources.Add('TTabOrderDialog','FORMDATA',[
  'TPF0'#15'TTabOrderDialog'#14'TabOrderDialog'#4'Left'#3'}'#1#6'Height'#3#131#1
-  +#3'Top'#3#167#0#5'Width'#3'6'#1#18'HorzScrollBar.Page'#3'5'#1#18'VertScrollB'
-  +'ar.Page'#3#130#1#13'ActiveControl'#7#12'ItemTreeview'#11'BorderStyle'#7#13
-  +'bsSizeToolWin'#7'Caption'#6#14'TabOrderDialog'#12'ClientHeight'#3#131#1#11
-  +'ClientWidth'#3'6'#1#7'OnClose'#7#19'TabOrderDialogCLOSE'#8'OnCreate'#7#20'T'
-  +'abOrderDialogCREATE'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.'
-  +'9.25'#0#9'TTreeView'#12'ItemTreeview'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#9'ArrowD'
-  +'own'#24'AnchorSideBottom.Control'#7#21'ShowOldValuesCheckbox'#4'Left'#2#6#6
-  +'Height'#3'>'#1#3'Top'#2#6#5'Width'#3#11#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#17'DefaultItemHeight'#2
-  +#15#13'HideSelection'#8#11'ParentCtl3D'#8#16'RightClickSelect'#9#8'TabOrder'
-  +#2#0#7'Options'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#19'tvoRig'
-  +'htClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoTo'
-  +'olTips'#0#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'#22'AnchorSideLeft.Cont'
-  +'rol'#7#5'Owner'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'#2#6
-  +#6'Height'#2#19#3'Top'#3'J'#1#5'Width'#3#149#0#7'Anchors'#11#6'akLeft'#8'akB'
-  +'ottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ShowOldValuesCheckbox'
-  +#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#1#0#0#7'TBitBtn'#8
-  +'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBotto'
-  +'m.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#160
-  +#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2'<'#7'Anchors'#11#7'akRight'#8'akB'
-  +'ottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#4'K'
-  +'ind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButto'
-  +'nCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.'
-  +'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBo'
-  +'ttom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +#226#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2'N'#7'Anchors'#11#7'akRight'#8
-  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Captio'
-  +'n'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8
-  +'TabOrder'#2#3#0#0#6'TArrow'#7'ArrowUp'#23'AnchorSideRight.Control'#7#5'Owne'
-  +'r'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#23#1#6'Height'#2#25#3
-  +'Top'#2'x'#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#9'ArrowType'#7#4
-  +'atUp'#20'BorderSpacing.Around'#2#6#7'OnClick'#7#18'UpSpeedbuttonCLICK'#0#0#6
-  +'TArrow'#9'ArrowDown'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
-  +'ght.Side'#7#9'asrBottom'#4'Left'#3#23#1#6'Height'#2#25#3'Top'#3#176#0#5'Wid'
-  +'th'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#9'ArrowType'#7#6'atDown'#20'Bo'
-  +'rderSpacing.Around'#2#6#7'OnClick'#7#20'DownSpeedbuttonCLICK'#0#0#0
+  +#3'Top'#3#167#0#5'Width'#3'6'#1#13'ActiveControl'#7#12'ItemTreeview'#11'Bord'
+  +'erStyle'#7#13'bsSizeToolWin'#7'Caption'#6#14'TabOrderDialog'#12'ClientHeigh'
+  +'t'#3#131#1#11'ClientWidth'#3'6'#1#7'OnClose'#7#19'TabOrderDialogCLOSE'#8'On'
+  +'Create'#7#20'TabOrderDialogCREATE'#10'ParentFont'#8#8'Position'#7#14'poScre'
+  +'enCenter'#10'LCLVersion'#6#6'0.9.25'#0#12'TSpeedButton'#7'ArrowUp'#23'Ancho'
+  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#3#23#1#6'Height'#2#25#3'Top'#2'x'#5'Width'#2#25#7'Anchors'#11#5'akTop'#7
+  +'akRight'#0#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'
+  +#2#0#0#0#12'TSpeedButton'#9'ArrowDown'#23'AnchorSideRight.Control'#7#5'Owner'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#23#1#6'Height'#2#25#3'Top'
+  +#3#176#0#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.'
+  +'Around'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#0#0#9'TTreeView'#12'It'
+  +'emTreeview'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#5'Owner'#24'AnchorSideBottom.Control'#7#21'ShowOldValuesCheckbox'#4'Left'
+  +#2#6#6'Height'#3'>'#1#3'Top'#2#6#5'Width'#3#11#1#7'Anchors'#11#5'akTop'#6'ak'
+  +'Left'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#17'DefaultItemH'
+  +'eight'#2#15#13'HideSelection'#8#11'ParentCtl3D'#8#16'RightClickSelect'#9#8
+  +'TabOrder'#2#0#7'Options'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'
+  +#19'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'
+  +#11'tvoToolTips'#0#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'L'
+  +'eft'#2#6#6'Height'#2#19#3'Top'#3'J'#1#5'Width'#3#146#0#7'Anchors'#11#6'akLe'
+  +'ft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ShowOldValue'
+  +'sCheckbox'#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#1#0#0#7
+  +'TBitBtn'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'Anch'
+  +'orSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#162#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2';'#7'Anchors'#11#7'ak'
+  +'Right'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#3'&OK'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7
+  +#13'OkButtonCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#23'Anchor'
+  +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'An'
+  +'chorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'
+  +#4'Left'#3#227#0#6'Height'#2#26#3'Top'#3'c'#1#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'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGly'
+  +'phs'#2#0#8'TabOrder'#2#3#0#0#0
 ]);
--- a/designer/taborderdlg.pas
+++ b/designer/taborderdlg.pas
@ -40,8 +40,8 @@ type
  { TTabOrderDialog }

  TTabOrderDialog = class(TForm)
-    ArrowUp:      TArrow;
-    ArrowDown:    TArrow;
+    ArrowDown: TSpeedButton;
+    ArrowUp: TSpeedButton;
    CancelButton: TBitBtn;
    OkButton:     TBitBtn;
    ShowOldValuesCheckbox: TCheckBox;
@ -84,6 +84,13 @@ end;
 procedure TTabOrderDialog.TabOrderDialogCREATE(Sender: TObject);
 begin
  ShowOldValuesCheckbox.Caption:=lisShowOldTabOrder;
+  OkButton.Caption:= lisOkBtn;
+  CancelButton.Caption:= dlgCancel;
+
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  ArrowDown.LoadGlyphFromLazarusResource('arrow_down');
+  ArrowUp.LoadGlyphFromLazarusResource('arrow_up');
 end;

 procedure TTabOrderDialog.UpSpeedbuttonCLICK(Sender: TObject);