diff --git a/designer/changeclassdialog.lfm b/designer/changeclassdialog.lfm
index 87e18a3474..a7a097bd29 100644
--- a/designer/changeclassdialog.lfm
+++ b/designer/changeclassdialog.lfm
@@ -1,22 +1,25 @@
 object ChangeClassDlg: TChangeClassDlg
   Left = 291
-  Height = 311
+  Height = 298
   Top = 163
   Width = 423
   HorzScrollBar.Page = 422
-  VertScrollBar.Page = 310
+  VertScrollBar.Page = 297
   ActiveControl = OldAncestorsListBox
+  BorderIcons = [biSystemMenu, biMinimize]
+  BorderStyle = bsToolWindow
   Caption = 'ChangeClassDlg'
-  ClientHeight = 311
+  ClientHeight = 298
   ClientWidth = 423
   OnCreate = ChangeClassDlgCreate
+  LCLVersion = '0.9.25'
   object OldGroupBox: TGroupBox
     Left = 8
     Height = 248
     Top = 8
     Width = 200
     Caption = 'OldGroupBox'
-    ClientHeight = 229
+    ClientHeight = 230
     ClientWidth = 196
     TabOrder = 0
     object OldClassLabel: TLabel
@@ -29,20 +32,19 @@ object ChangeClassDlg: TChangeClassDlg
     end
     object OldAncestorGroupBox: TGroupBox
       Height = 192
-      Top = 37
+      Top = 38
       Width = 196
       Align = alBottom
       Caption = 'OldAncestorGroupBox'
-      ClientHeight = 173
+      ClientHeight = 174
       ClientWidth = 192
       TabOrder = 0
       object OldAncestorsListBox: TListBox
-        Height = 173
+        Height = 174
         Width = 192
         Align = alClient
         ClickOnSelChange = False
         TabOrder = 0
-        TopIndex = -1
       end
     end
   end
@@ -52,15 +54,16 @@ object ChangeClassDlg: TChangeClassDlg
     Top = 8
     Width = 200
     Caption = 'NewGroupBox'
-    ClientHeight = 229
+    ClientHeight = 230
     ClientWidth = 196
     TabOrder = 1
     object NewClassComboBox: TComboBox
       Left = 14
-      Height = 25
+      Height = 21
       Top = 9
       Width = 174
       AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+      ItemHeight = 13
       MaxLength = 0
       OnEditingDone = NewClassComboBoxEditingDone
       TabOrder = 0
@@ -68,54 +71,56 @@ object ChangeClassDlg: TChangeClassDlg
     end
     object NewAncestorGroupBox: TGroupBox
       Height = 192
-      Top = 37
+      Top = 38
       Width = 196
       Align = alBottom
       Caption = 'NewAncestorGroupBox'
-      ClientHeight = 173
+      ClientHeight = 174
       ClientWidth = 192
       TabOrder = 1
       object NewAncestorsListBox: TListBox
-        Height = 173
+        Height = 174
         Width = 192
         Align = alClient
         ClickOnSelChange = False
         TabOrder = 0
-        TopIndex = -1
       end
     end
   end
-  object BtnPanel: TPanel
-    Height = 42
-    Top = 269
-    Width = 423
-    Align = alBottom
+  object OkButton: TBitBtn
+    AnchorSideRight.Control = CancelButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 273
+    Height = 26
+    Top = 266
+    Width = 60
+    Anchors = [akRight, akBottom]
     AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 42
-    ClientWidth = 423
+    BorderSpacing.Around = 6
+    Caption = '&OK'
+    Kind = bkOK
+    ModalResult = 1
+    NumGlyphs = 0
     TabOrder = 2
-    object OkButton: TButton
-      Left = 228
-      Height = 28
-      Top = 7
-      Width = 91
-      Align = alRight
-      BorderSpacing.Around = 6
-      Caption = 'Ok'
-      ModalResult = 1
-      TabOrder = 0
-    end
-    object CancelButton: TButton
-      Left = 325
-      Height = 28
-      Top = 7
-      Width = 91
-      Align = alRight
-      BorderSpacing.Around = 6
-      Caption = 'Cancel'
-      ModalResult = 2
-      TabOrder = 1
-    end
+  end
+  object CancelButton: TBitBtn
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 339
+    Height = 26
+    Top = 266
+    Width = 78
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Cancel = True
+    Caption = 'Cancel'
+    Kind = bkCancel
+    ModalResult = 2
+    NumGlyphs = 0
+    TabOrder = 3
   end
 end
diff --git a/designer/changeclassdialog.lrs b/designer/changeclassdialog.lrs
index df81c9f25e..89da532479 100644
--- a/designer/changeclassdialog.lrs
+++ b/designer/changeclassdialog.lrs
@@ -1,37 +1,41 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TChangeClassDlg','FORMDATA',[
-  'TPF0'#15'TChangeClassDlg'#14'ChangeClassDlg'#4'Left'#3'#'#1#6'Height'#3'7'#1
+  'TPF0'#15'TChangeClassDlg'#14'ChangeClassDlg'#4'Left'#3'#'#1#6'Height'#3'*'#1
   +#3'Top'#3#163#0#5'Width'#3#167#1#18'HorzScrollBar.Page'#3#166#1#18'VertScrol'
-  +'lBar.Page'#3'6'#1#13'ActiveControl'#7#19'OldAncestorsListBox'#7'Caption'#6
-  +#14'ChangeClassDlg'#12'ClientHeight'#3'7'#1#11'ClientWidth'#3#167#1#8'OnCrea'
-  +'te'#7#20'ChangeClassDlgCreate'#0#9'TGroupBox'#11'OldGroupBox'#4'Left'#2#8#6
-  +'Height'#3#248#0#3'Top'#2#8#5'Width'#3#200#0#7'Caption'#6#11'OldGroupBox'#12
-  +'ClientHeight'#3#229#0#11'ClientWidth'#3#196#0#8'TabOrder'#2#0#0#6'TLabel'#13
-  +'OldClassLabel'#4'Left'#2#6#6'Height'#2' '#3'Top'#2#2#5'Width'#3#185#0#7'Cap'
-  +'tion'#6#13'OldClassLabel'#11'ParentColor'#8#0#0#9'TGroupBox'#19'OldAncestor'
-  +'GroupBox'#6'Height'#3#192#0#3'Top'#2'%'#5'Width'#3#196#0#5'Align'#7#8'alBot'
-  +'tom'#7'Caption'#6#19'OldAncestorGroupBox'#12'ClientHeight'#3#173#0#11'Clien'
-  +'tWidth'#3#192#0#8'TabOrder'#2#0#0#8'TListBox'#19'OldAncestorsListBox'#6'Hei'
-  +'ght'#3#173#0#5'Width'#3#192#0#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8
-  +#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#0#0#9'TGroupBox'#11'NewGroupBox'#4'Le'
-  +'ft'#3#216#0#6'Height'#3#248#0#3'Top'#2#8#5'Width'#3#200#0#7'Caption'#6#11'N'
-  +'ewGroupBox'#12'ClientHeight'#3#229#0#11'ClientWidth'#3#196#0#8'TabOrder'#2#1
-  +#0#9'TComboBox'#16'NewClassComboBox'#4'Left'#2#14#6'Height'#2#25#3'Top'#2#9#5
-  +'Width'#3#174#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactS'
-  +'earchAscending'#0#9'MaxLength'#2#0#13'OnEditingDone'#7#27'NewClassComboBoxE'
-  +'ditingDone'#8'TabOrder'#2#0#4'Text'#6#16'NewClassComboBox'#0#0#9'TGroupBox'
-  +#19'NewAncestorGroupBox'#6'Height'#3#192#0#3'Top'#2'%'#5'Width'#3#196#0#5'Al'
-  +'ign'#7#8'alBottom'#7'Caption'#6#19'NewAncestorGroupBox'#12'ClientHeight'#3
-  +#173#0#11'ClientWidth'#3#192#0#8'TabOrder'#2#1#0#8'TListBox'#19'NewAncestors'
-  +'ListBox'#6'Height'#3#173#0#5'Width'#3#192#0#5'Align'#7#8'alClient'#16'Click'
-  +'OnSelChange'#8#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#0#0#6'TPanel'#8'BtnPan'
-  +'el'#6'Height'#2'*'#3'Top'#3#13#1#5'Width'#3#167#1#5'Align'#7#8'alBottom'#8
-  +'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'*'#11'ClientWidth'
-  +#3#167#1#8'TabOrder'#2#2#0#7'TButton'#8'OkButton'#4'Left'#3#228#0#6'Height'#2
-  +#28#3'Top'#2#7#5'Width'#2'['#5'Align'#7#7'alRight'#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#2'Ok'#11'ModalResult'#2#1#8'TabOrder'#2#0#0#0#7'TButton'#12
-  +'CancelButton'#4'Left'#3'E'#1#6'Height'#2#28#3'Top'#2#7#5'Width'#2'['#5'Alig'
-  +'n'#7#7'alRight'#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'#11'Moda'
-  +'lResult'#2#2#8'TabOrder'#2#1#0#0#0#0
+  +'lBar.Page'#3')'#1#13'ActiveControl'#7#19'OldAncestorsListBox'#11'BorderIcon'
+  +'s'#11#12'biSystemMenu'#10'biMinimize'#0#11'BorderStyle'#7#12'bsToolWindow'#7
+  +'Caption'#6#14'ChangeClassDlg'#12'ClientHeight'#3'*'#1#11'ClientWidth'#3#167
+  +#1#8'OnCreate'#7#20'ChangeClassDlgCreate'#10'LCLVersion'#6#6'0.9.25'#0#9'TGr'
+  +'oupBox'#11'OldGroupBox'#4'Left'#2#8#6'Height'#3#248#0#3'Top'#2#8#5'Width'#3
+  +#200#0#7'Caption'#6#11'OldGroupBox'#12'ClientHeight'#3#230#0#11'ClientWidth'
+  +#3#196#0#8'TabOrder'#2#0#0#6'TLabel'#13'OldClassLabel'#4'Left'#2#6#6'Height'
+  +#2' '#3'Top'#2#2#5'Width'#3#185#0#7'Caption'#6#13'OldClassLabel'#11'ParentCo'
+  +'lor'#8#0#0#9'TGroupBox'#19'OldAncestorGroupBox'#6'Height'#3#192#0#3'Top'#2
+  +'&'#5'Width'#3#196#0#5'Align'#7#8'alBottom'#7'Caption'#6#19'OldAncestorGroup'
+  +'Box'#12'ClientHeight'#3#174#0#11'ClientWidth'#3#192#0#8'TabOrder'#2#0#0#8'T'
+  +'ListBox'#19'OldAncestorsListBox'#6'Height'#3#174#0#5'Width'#3#192#0#5'Align'
+  +#7#8'alClient'#16'ClickOnSelChange'#8#8'TabOrder'#2#0#0#0#0#0#9'TGroupBox'#11
+  +'NewGroupBox'#4'Left'#3#216#0#6'Height'#3#248#0#3'Top'#2#8#5'Width'#3#200#0#7
+  +'Caption'#6#11'NewGroupBox'#12'ClientHeight'#3#230#0#11'ClientWidth'#3#196#0
+  +#8'TabOrder'#2#1#0#9'TComboBox'#16'NewClassComboBox'#4'Left'#2#14#6'Height'#2
+  +#21#3'Top'#2#9#5'Width'#3#174#0#16'AutoCompleteText'#11#22'cbactEndOfLineCom'
+  +'plete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'MaxLength'#2#0#13'O'
+  +'nEditingDone'#7#27'NewClassComboBoxEditingDone'#8'TabOrder'#2#0#4'Text'#6#16
+  +'NewClassComboBox'#0#0#9'TGroupBox'#19'NewAncestorGroupBox'#6'Height'#3#192#0
+  +#3'Top'#2'&'#5'Width'#3#196#0#5'Align'#7#8'alBottom'#7'Caption'#6#19'NewAnce'
+  +'storGroupBox'#12'ClientHeight'#3#174#0#11'ClientWidth'#3#192#0#8'TabOrder'#2
+  +#1#0#8'TListBox'#19'NewAncestorsListBox'#6'Height'#3#174#0#5'Width'#3#192#0#5
+  +'Align'#7#8'alClient'#16'ClickOnSelChange'#8#8'TabOrder'#2#0#0#0#0#0#7'TBitB'
+  +'tn'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSid'
+  +'eBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +#3#17#1#6'Height'#2#26#3'Top'#3#10#1#5'Width'#2'<'#7'Anchors'#11#7'akRight'#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#8'TabOrder'#2#2#0#0#7
+  +'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorS'
+  +'ideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'An'
+  +'chorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'S'#1#6'Height'#2#26#3'Top'#3
+  +#10#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'Caption'#6#6'Cancel'#4'Kind'#7#8'bk'
+  +'Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#0
 ]);
diff --git a/designer/changeclassdialog.pas b/designer/changeclassdialog.pas
index 9536049572..00d5c32129 100644
--- a/designer/changeclassdialog.pas
+++ b/designer/changeclassdialog.pas
@@ -46,17 +46,16 @@ type
   { TChangeClassDlg }
 
   TChangeClassDlg = class(TForm)
+    OkButton: TBitBtn;
+    CancelButton: TBitBtn;
     NewClassComboBox: TComboBox;
     NewAncestorGroupBox: TGroupBox;
     NewAncestorsListBox: TListBox;
     OldAncestorGroupBox: TGroupBox;
     OldAncestorsListBox: TListBox;
     OldClassLabel: TLabel;
-    OkButton: TButton;
-    CancelButton: TButton;
     NewGroupBox: TGroupBox;
     OldGroupBox: TGroupBox;
-    BtnPanel: TPanel;
     procedure ChangeClassDlgCreate(Sender: TObject);
     procedure NewClassComboBoxEditingDone(Sender: TObject);
   private
diff --git a/designer/scalecompsdlg.lfm b/designer/scalecompsdlg.lfm
index ec7263b030..339399c2e2 100644
--- a/designer/scalecompsdlg.lfm
+++ b/designer/scalecompsdlg.lfm
@@ -1,85 +1,94 @@
 object ScaleComponentsDialog: TScaleComponentsDialog
+  Left = 372
+  Height = 82
+  Top = 698
+  Width = 258
+  HorzScrollBar.Page = 257
+  VertScrollBar.Page = 81
   ActiveControl = OKButton
-  BorderStyle = bsSizeToolWin
+  BorderIcons = [biSystemMenu, biMinimize]
+  BorderStyle = bsToolWindow
   Caption = 'ScaleComponentsDialog'
   ClientHeight = 82
   ClientWidth = 258
-  PixelsPerInch = 96
   Position = poScreenCenter
-  HorzScrollBar.Page = 257
-  VertScrollBar.Page = 81
-  Left = 319
-  Height = 82
-  Top = 881
-  Width = 258
+  LCLVersion = '0.9.25'
   object PercentLabel: TLabel
-    Anchors = [akTop, akRight]
-    BorderSpacing.Right = 6
-    Caption = 'PercentLabel'
-    Color = clNone
-    ParentColor = False
+    AnchorSideTop.Control = PercentEdit
+    AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 189
     Height = 14
-    Top = 8
+    Top = 10
     Width = 63
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 6
+    Caption = 'PercentLabel'
+    ParentColor = False
   end
   object ScaleLabel: TLabel
-    Caption = 'ScaleLabel'
-    Color = clNone
-    ParentColor = False
+    AnchorSideTop.Control = PercentEdit
+    AnchorSideTop.Side = asrCenter
     Left = 8
     Height = 14
-    Top = 8
+    Top = 10
     Width = 51
+    Caption = 'ScaleLabel'
+    ParentColor = False
   end
   object OKButton: TBitBtn
+    AnchorSideRight.Control = CancelButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 108
+    Height = 26
+    Top = 50
+    Width = 60
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Right = 6
-    
+    BorderSpacing.Bottom = 6
     Caption = '&OK'
     Default = True
     Kind = bkOK
     ModalResult = 1
     NumGlyphs = 0
     TabOrder = 0
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 184
-    Height = 34
-    Top = 40
-    Width = 68
   end
   object CancelButton: TBitBtn
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 174
+    Height = 26
+    Top = 50
+    Width = 78
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Right = 6
-    
+    BorderSpacing.Bottom = 6
     Caption = 'Cancel'
     Kind = bkCancel
     ModalResult = 2
     NumGlyphs = 0
     TabOrder = 1
-    AnchorSideRight.Control = OKButton
-    Left = 98
-    Height = 34
-    Top = 40
-    Width = 80
   end
   object PercentEdit: TEdit
-    Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 6
-    BorderSpacing.Right = 6
-    TabOrder = 2
-    Text = 'PercentEdit'
     AnchorSideLeft.Control = ScaleLabel
     AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Owner
     AnchorSideRight.Control = PercentLabel
     Left = 65
     Height = 23
-    Top = 8
+    Top = 6
     Width = 118
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    TabOrder = 2
+    Text = 'PercentEdit'
   end
 end
diff --git a/designer/scalecompsdlg.lrs b/designer/scalecompsdlg.lrs
index ab5be80003..983951a1e1 100644
--- a/designer/scalecompsdlg.lrs
+++ b/designer/scalecompsdlg.lrs
@@ -1,27 +1,35 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TScaleComponentsDialog','FORMDATA',[
-  'TPF0'#22'TScaleComponentsDialog'#21'ScaleComponentsDialog'#13'ActiveControl'
-  +#7#8'OKButton'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'ScaleComp'
-  +'onentsDialog'#12'ClientHeight'#2'R'#11'ClientWidth'#3#2#1#13'PixelsPerInch'
-  +#2'`'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#1#1#18'VertS'
-  +'crollBar.Page'#2'Q'#4'Left'#3'?'#1#6'Height'#2'R'#3'Top'#3'q'#3#5'Width'#3#2
-  +#1#0#6'TLabel'#12'PercentLabel'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'Borde'
-  +'rSpacing.Right'#2#6#7'Caption'#6#12'PercentLabel'#5'Color'#7#6'clNone'#11'P'
-  +'arentColor'#8#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Sid'
-  +'e'#7#9'asrBottom'#4'Left'#3#189#0#6'Height'#2#14#3'Top'#2#8#5'Width'#2'?'#0
-  +#0#6'TLabel'#10'ScaleLabel'#7'Caption'#6#10'ScaleLabel'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#4'Left'#2#8#6'Height'#2#14#3'Top'#2#8#5'Width'#2'3'#0#0#7
-  +'TBitBtn'#8'OKButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19
-  +'BorderSpacing.Right'#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#23'AnchorSideRight.Con'
-  +'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#184#0#6
-  +'Height'#2'"'#3'Top'#2'('#5'Width'#2'D'#0#0#7'TBitBtn'#12'CancelButton'#7'An'
-  +'chors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6
-  +#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyph'
-  +'s'#2#0#8'TabOrder'#2#1#23'AnchorSideRight.Control'#7#8'OKButton'#4'Left'#2
-  +'b'#6'Height'#2'"'#3'Top'#2'('#5'Width'#2'P'#0#0#5'TEdit'#11'PercentEdit'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'B'
-  +'orderSpacing.Right'#2#6#8'TabOrder'#2#2#4'Text'#6#11'PercentEdit'#22'Anchor'
-  +'SideLeft.Control'#7#10'ScaleLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23
+  '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#8#5'Width'#2'v'#0#0#0
+  +'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
 ]);
diff --git a/designer/taborderdlg.lfm b/designer/taborderdlg.lfm
index 89e6de3839..742ab667d5 100644
--- a/designer/taborderdlg.lfm
+++ b/designer/taborderdlg.lfm
@@ -1,4 +1,10 @@
 object TabOrderDialog: TTabOrderDialog
+  Left = 381
+  Height = 387
+  Top = 167
+  Width = 310
+  HorzScrollBar.Page = 309
+  VertScrollBar.Page = 386
   ActiveControl = ItemTreeview
   BorderStyle = bsSizeToolWin
   Caption = 'TabOrderDialog'
@@ -6,15 +12,17 @@ object TabOrderDialog: TTabOrderDialog
   ClientWidth = 310
   OnClose = TabOrderDialogCLOSE
   OnCreate = TabOrderDialogCREATE
-  PixelsPerInch = 96
   Position = poScreenCenter
-  HorzScrollBar.Page = 309
-  VertScrollBar.Page = 386
-  Left = 381
-  Height = 387
-  Top = 167
-  Width = 310
+  LCLVersion = '0.9.25'
   object ItemTreeview: TTreeView
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = ArrowDown
+    AnchorSideBottom.Control = ShowOldValuesCheckbox
+    Left = 6
+    Height = 318
+    Top = 6
+    Width = 267
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     DefaultItemHeight = 15
@@ -23,89 +31,79 @@ object TabOrderDialog: TTabOrderDialog
     RightClickSelect = True
     TabOrder = 0
     Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = ArrowDown
-    AnchorSideBottom.Control = ShowOldValuesCheckbox
-    Left = 6
-    Height = 316
-    Top = 6
-    Width = 267
   end
   object ShowOldValuesCheckbox: TCheckBox
+    AnchorSideLeft.Control = Owner
+    AnchorSideBottom.Control = CancelButton
+    Left = 6
+    Height = 19
+    Top = 330
+    Width = 149
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'ShowOldValuesCheckbox'
     OnClick = ShowOldValuesCheckboxCLICK
     TabOrder = 1
-    AnchorSideLeft.Control = Owner
-    AnchorSideBottom.Control = CancelButton
-    Left = 6
-    Height = 13
-    Top = 328
-    Width = 143
   end
   object OkButton: TBitBtn
+    AnchorSideRight.Control = CancelButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 160
+    Height = 26
+    Top = 355
+    Width = 60
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
-
     Caption = '&OK'
     Kind = bkOK
     ModalResult = 1
     NumGlyphs = 0
     OnClick = OkButtonCLICK
     TabOrder = 2
+  end
+  object CancelButton: TBitBtn
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 236
-    Height = 34
-    Top = 347
-    Width = 68
-  end
-  object CancelButton: TBitBtn
+    Left = 226
+    Height = 26
+    Top = 355
+    Width = 78
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
-
     Cancel = True
     Caption = 'Cancel'
     Kind = bkCancel
     ModalResult = 2
     NumGlyphs = 0
     TabOrder = 3
-    AnchorSideRight.Control = OkButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 150
-    Height = 34
-    Top = 347
-    Width = 80
   end
   object ArrowUp: TArrow
-    Anchors = [akTop, akRight]
-    ArrowType = atUp
-    BorderSpacing.Around = 6
-    OnClick = UpSpeedbuttonCLICK
     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
-    Anchors = [akTop, akRight]
-    ArrowType = atDown
-    BorderSpacing.Around = 6
-    OnClick = DownSpeedbuttonCLICK
     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
diff --git a/designer/taborderdlg.lrs b/designer/taborderdlg.lrs
index 015bb5d281..1e425fab8e 100644
--- a/designer/taborderdlg.lrs
+++ b/designer/taborderdlg.lrs
@@ -1,40 +1,42 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TTabOrderDialog','FORMDATA',[
-  'TPF0'#15'TTabOrderDialog'#14'TabOrderDialog'#13'ActiveControl'#7#12'ItemTree'
-  +'view'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#14'TabOrderDialog'#12
-  +'ClientHeight'#3#131#1#11'ClientWidth'#3'6'#1#7'OnClose'#7#19'TabOrderDialog'
-  +'CLOSE'#8'OnCreate'#7#20'TabOrderDialogCREATE'#13'PixelsPerInch'#2'`'#8'Posi'
-  +'tion'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3'5'#1#18'VertScrollBar.P'
-  +'age'#3#130#1#4'Left'#3'}'#1#6'Height'#3#131#1#3'Top'#3#167#0#5'Width'#3'6'#1
-  +#0#9'TTreeView'#12'ItemTreeview'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#17'DefaultItemHeight'#2#15#13'Hi'
-  +'deSelection'#8#11'ParentCtl3D'#8#16'RightClickSelect'#9#8'TabOrder'#2#0#7'O'
-  +'ptions'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#19'tvoRightClick'
-  +'Select'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'
-  +#0#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'
-  +#23'AnchorSideRight.Control'#7#9'ArrowDown'#24'AnchorSideBottom.Control'#7#21
-  +'ShowOldValuesCheckbox'#4'Left'#2#6#6'Height'#3'<'#1#3'Top'#2#6#5'Width'#3#11
-  +#1#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'#7'Anchors'#11#6'akLeft'#8'akBo'
-  +'ttom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ShowOldValuesCheckbox'
-  +#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#1#22'AnchorSideLe'
-  +'ft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Le'
-  +'ft'#2#6#6'Height'#2#13#3'Top'#3'H'#1#5'Width'#3#143#0#0#0#7'TBitBtn'#8'OkBu'
-  +'tton'#7'Anchors'#11#7'akRight'#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'Nu'
-  +'mGlyphs'#2#0#7'OnClick'#7#13'OkButtonCLICK'#8'TabOrder'#2#2#23'AnchorSideRi'
-  +'ght.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSi'
-  +'deBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3#236#0#6'Height'#2'"'#3'Top'#3'['#1#5'Width'#2'D'#0#0#7'TBitBtn'#12'Can'
-  +'celButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSp'
-  +'acing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'
-  +#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#23'AnchorSideRight.Con'
-  +'trol'#7#8'OkButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBo'
-  +'ttom.Side'#7#9'asrBottom'#4'Left'#3#150#0#6'Height'#2'"'#3'Top'#3'['#1#5'Wi'
-  +'dth'#2'P'#0#0#6'TArrow'#7'ArrowUp'#7'Anchors'#11#5'akTop'#7'akRight'#0#9'Ar'
-  +'rowType'#7#4'atUp'#20'BorderSpacing.Around'#2#6#7'OnClick'#7#18'UpSpeedbutt'
-  +'onCLICK'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#3#23#1#6'Height'#2#25#3'Top'#2'x'#5'Width'#2#25#0#0#6'TA'
-  +'rrow'#9'ArrowDown'#7'Anchors'#11#5'akTop'#7'akRight'#0#9'ArrowType'#7#6'atD'
-  +'own'#20'BorderSpacing.Around'#2#6#7'OnClick'#7#20'DownSpeedbuttonCLICK'#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#0#0#0
+  '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
 ]);