diff --git a/ide/runparamsopts.lfm b/ide/runparamsopts.lfm
index 6e6c8215d9..5ee53ad4f6 100644
--- a/ide/runparamsopts.lfm
+++ b/ide/runparamsopts.lfm
@@ -15,33 +15,36 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
   object OkButton: TButton
     Anchors = [akRight, akBottom]
     AutoSize = True
+    BorderSpacing.OnChange = nil
     BorderSpacing.Around = 6
     BorderSpacing.InnerBorder = 2
     Caption = 'OkButton'
     OnClick = OkButtonClick
     TabOrder = 0
     AnchorSideRight.Control = CancelButton
-    Left = 336
-    Height = 26
-    Top = 418
-    Width = 61
+    Left = 325
+    Height = 29
+    Top = 415
+    Width = 69
   end
   object CancelButton: TButton
     Anchors = [akRight, akBottom]
     AutoSize = True
+    BorderSpacing.OnChange = nil
     BorderSpacing.Around = 6
     BorderSpacing.InnerBorder = 2
     Caption = 'CancelButton'
     ModalResult = 2
     TabOrder = 1
-    Left = 403
-    Height = 26
-    Top = 418
-    Width = 85
+    Left = 400
+    Height = 29
+    Top = 415
+    Width = 88
   end
   object Notebook: TNotebook
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.OnChange = nil
     PageIndex = 0
     Height = 408
     Width = 500
@@ -53,7 +56,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
       Width = 492
       object DisplayGroupBox: TGroupBox
         Align = alTop
-        BorderSpacing.OnChange = nil
+        AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'DisplayGroupBox'
         ClientHeight = 54
@@ -66,18 +69,16 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         Width = 480
         object DisplayEdit: TEdit
           Align = alTop
-          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           TabOrder = 0
           Text = 'DisplayEdit'
           Left = 6
           Height = 23
-          Top = 36
+          Top = 25
           Width = 464
         end
         object UseDisplayCheckBox: TCheckBox
           Align = alTop
-          BorderSpacing.OnChange = nil
           BorderSpacing.Left = 6
           BorderSpacing.Top = 6
           BorderSpacing.Right = 6
@@ -85,13 +86,15 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
           Caption = 'UseDisplayCheckBox'
           TabOrder = 1
           Left = 6
-          Height = 24
+          Height = 13
           Top = 6
           Width = 464
         end
       end
       object CmdLineParametersGroupBox: TGroupBox
         Align = alTop
+        AutoSize = True
+        BorderSpacing.OnChange = nil
         BorderSpacing.Around = 6
         Caption = 'CmdLineParametersGroupBox'
         ClientHeight = 35
@@ -104,6 +107,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         Width = 480
         object CmdLineParametersEdit: TEdit
           Align = alTop
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           TabOrder = 0
           Text = 'CmdLineParametersEdit'
@@ -115,6 +119,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
       end
       object UseLaunchingApplicationGroupBox: TGroupBox
         Align = alTop
+        AutoSize = True
+        BorderSpacing.OnChange = nil
         BorderSpacing.Around = 6
         Caption = 'UseLaunchingApplicationGroupBox'
         ClientHeight = 52
@@ -127,6 +133,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         Width = 480
         object UseLaunchingApplicationCheckBox: TCheckBox
           Align = alTop
+          BorderSpacing.OnChange = nil
           BorderSpacing.Left = 6
           BorderSpacing.Top = 6
           BorderSpacing.Right = 6
@@ -134,26 +141,27 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
           Caption = 'UseLaunchingApplicationCheckBox'
           TabOrder = 0
           Left = 6
-          Height = 24
+          Height = 13
           Top = 6
           Width = 464
         end
         object UseLaunchingApplicationComboBox: TComboBox
           Align = alTop
           Anchors = [akTop]
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           MaxLength = 0
           TabOrder = 1
           Text = 'UseLaunchingApplicationComboBox'
           Left = 6
           Height = 21
-          Top = 36
+          Top = 25
           Width = 464
         end
       end
       object HostApplicationGroupBox: TGroupBox
         Align = alTop
-        BorderSpacing.OnChange = nil
+        AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'HostApplicationGroupBox'
         ClientHeight = 35
@@ -166,7 +174,6 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         Width = 480
         object HostApplicationBrowseBtn: TButton
           Align = alRight
-          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 2
           Caption = 'HostApplicationBrowseBtn'
@@ -179,7 +186,6 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         end
         object HostApplicationEdit: TEdit
           Align = alClient
-          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           TabOrder = 1
           Text = 'HostApplicationEdit'
@@ -191,6 +197,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
       end
       object WorkingDirectoryGroupBox: TGroupBox
         Align = alTop
+        AutoSize = True
+        BorderSpacing.OnChange = nil
         BorderSpacing.Around = 6
         Caption = 'WorkingDirectoryGroupBox'
         ClientHeight = 35
@@ -203,6 +211,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         Width = 480
         object WorkingDirectoryBtn: TButton
           Align = alRight
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 2
           Caption = 'WorkingDirectoryBtn'
@@ -215,6 +224,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         end
         object WorkingDirectoryEdit: TEdit
           Align = alClient
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           TabOrder = 1
           Text = 'WorkingDirectoryEdit'
@@ -233,17 +243,19 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
       Width = 492
       object IncludeSystemVariablesCheckBox: TCheckBox
         Align = alBottom
+        BorderSpacing.OnChange = nil
         BorderSpacing.Around = 6
         Caption = 'IncludeSystemVariablesCheckBox'
         Enabled = False
         TabOrder = 0
         Left = 6
-        Height = 24
-        Top = 352
+        Height = 13
+        Top = 363
         Width = 480
       end
       object UserOverridesGroupBox: TGroupBox
         Align = alBottom
+        BorderSpacing.OnChange = nil
         BorderSpacing.Around = 6
         Caption = 'UserOverridesGroupBox'
         ClientHeight = 143
@@ -252,52 +264,56 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         TabOrder = 1
         Left = 6
         Height = 161
-        Top = 185
+        Top = 196
         Width = 480
         object UserOverridesAddButton: TButton
           Anchors = [akLeft, akBottom]
           AutoSize = True
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 2
           Caption = 'UserOverridesAddButton'
           OnClick = UserOverridesAddButtonClick
           TabOrder = 0
           Left = 6
-          Height = 25
-          Top = 110
-          Width = 62
+          Height = 29
+          Top = 106
+          Width = 141
         end
         object UserOverridesEditButton: TButton
           Anchors = [akLeft, akBottom]
           AutoSize = True
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 2
           Caption = 'UserOverridesEditButton'
           OnClick = UserOverridesEditButtonClick
           TabOrder = 1
           AnchorSideLeft.Control = UserOverridesAddButton
-          Left = 74
-          Height = 25
-          Top = 110
-          Width = 62
+          Left = 153
+          Height = 29
+          Top = 106
+          Width = 140
         end
         object UserOverridesDeleteButton: TButton
           Anchors = [akLeft, akBottom]
           AutoSize = True
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 2
           Caption = 'UserOverridesDeleteButton'
           OnClick = UserOverridesDeleteButtonClick
           TabOrder = 2
           AnchorSideLeft.Control = UserOverridesEditButton
-          Left = 142
-          Height = 25
-          Top = 110
-          Width = 62
+          Left = 299
+          Height = 29
+          Top = 106
+          Width = 153
         end
         object UserOverridesListView: TListView
           Align = alTop
           Anchors = [akTop, akLeft, akRight, akBottom]
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           Columns = <          
             item
@@ -321,18 +337,20 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
       end
       object SystemVariablesGroupBox: TGroupBox
         Align = alClient
+        BorderSpacing.OnChange = nil
         BorderSpacing.Around = 6
         Caption = 'SystemVariablesGroupBox'
-        ClientHeight = 155
+        ClientHeight = 166
         ClientWidth = 476
         ParentColor = True
         TabOrder = 2
         Left = 6
-        Height = 173
+        Height = 184
         Top = 6
         Width = 480
         object SystemVariablesListView: TListView
           Align = alClient
+          BorderSpacing.OnChange = nil
           BorderSpacing.Around = 6
           Columns = <          
             item
@@ -349,7 +367,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
           SortType = stText
           ViewStyle = vsReport
           Left = 6
-          Height = 143
+          Height = 154
           Top = 6
           Width = 464
         end
diff --git a/ide/runparamsopts.lrs b/ide/runparamsopts.lrs
index 2e8fecd670..236724a418 100644
--- a/ide/runparamsopts.lrs
+++ b/ide/runparamsopts.lrs
@@ -7,100 +7,107 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[
   +'tion'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#243#1#18'VertScrollBar.'
   +'Page'#3#193#1#4'Left'#3#198#1#6'Height'#3#194#1#3'Top'#3#176#0#5'Width'#3
   +#244#1#0#7'TButton'#8'OkButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut'
-  +'oSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'C'
-  +'aption'#6#8'OkButton'#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#0#23'Anc'
-  +'horSideRight.Control'#7#12'CancelButton'#4'Left'#3'P'#1#6'Height'#2#26#3'To'
-  +'p'#3#162#1#5'Width'#2'='#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#7'ak'
-  +'Right'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSp'
-  +'acing.InnerBorder'#2#2#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#8
-  +'TabOrder'#2#1#4'Left'#3#147#1#6'Height'#2#26#3'Top'#3#162#1#5'Width'#2'U'#0
-  +#0#9'TNotebook'#8'Notebook'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#0#6'Height'#3#152#1#5'Width'#3
-  +#244#1#0#5'TPage'#5'Page1'#7'Caption'#6#5'Page1'#11'ClientWidth'#3#236#1#12
-  +'ClientHeight'#3'~'#1#6'Height'#3'~'#1#5'Width'#3#236#1#0#9'TGroupBox'#15'Di'
-  +'splayGroupBox'#5'Align'#7#5'alTop'#22'BorderSpacing.OnChange'#13#20'BorderS'
-  +'pacing.Around'#2#6#7'Caption'#6#15'DisplayGroupBox'#12'ClientHeight'#2'6'#11
-  +'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOrder'#2#3#4'Left'#2#6#6'Height'
-  +#2'H'#3'Top'#3#3#1#5'Width'#3#224#1#0#5'TEdit'#11'DisplayEdit'#5'Align'#7#5
-  +'alTop'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#8'TabOrde'
-  +'r'#2#0#4'Text'#6#11'DisplayEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'$'#5'W'
-  +'idth'#3#208#1#0#0#9'TCheckBox'#18'UseDisplayCheckBox'#5'Align'#7#5'alTop'#22
-  +'BorderSpacing.OnChange'#13#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'
-  +#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#18
-  +'UseDisplayCheckBox'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#24#3'Top'#2#6#5
-  +'Width'#3#208#1#0#0#0#9'TGroupBox'#25'CmdLineParametersGroupBox'#5'Align'#7#5
-  +'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#25'CmdLineParametersGroupB'
-  +'ox'#12'ClientHeight'#2'#'#11'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOr'
-  +'der'#2#0#4'Left'#2#6#6'Height'#2'5'#3'Top'#2'A'#5'Width'#3#224#1#0#5'TEdit'
-  +#21'CmdLineParametersEdit'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8
-  +'TabOrder'#2#0#4'Text'#6#21'CmdLineParametersEdit'#4'Left'#2#6#6'Height'#2#23
-  +#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#31'UseLaunchingApplicationGr'
-  +'oupBox'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#31'Us'
-  +'eLaunchingApplicationGroupBox'#12'ClientHeight'#2'4'#11'ClientWidth'#3#220#1
-  +#11'ParentColor'#9#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2'F'#3'Top'#2'|'#5
-  +'Width'#3#224#1#0#9'TCheckBox'#31'UseLaunchingApplicationCheckBox'#5'Align'#7
-  +#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpac'
-  +'ing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#31'UseLaunchingApp'
-  +'licationCheckBox'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#24#3'Top'#2#6#5'W'
-  +'idth'#3#208#1#0#0#9'TComboBox'#31'UseLaunchingApplicationComboBox'#5'Align'
-  +#7#5'alTop'#7'Anchors'#11#5'akTop'#0#20'BorderSpacing.Around'#2#6#9'MaxLengt'
-  +'h'#2#0#8'TabOrder'#2#1#4'Text'#6#31'UseLaunchingApplicationComboBox'#4'Left'
-  +#2#6#6'Height'#2#21#3'Top'#2'$'#5'Width'#3#208#1#0#0#0#9'TGroupBox'#23'HostA'
-  +'pplicationGroupBox'#5'Align'#7#5'alTop'#22'BorderSpacing.OnChange'#13#20'Bo'
-  +'rderSpacing.Around'#2#6#7'Caption'#6#23'HostApplicationGroupBox'#12'ClientH'
-  +'eight'#2'#'#11'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOrder'#2#2#4'Lef'
-  +'t'#2#6#6'Height'#2'5'#3'Top'#2#6#5'Width'#3#224#1#0#7'TButton'#24'HostAppli'
-  +'cationBrowseBtn'#5'Align'#7#7'alRight'#22'BorderSpacing.OnChange'#13#20'Bor'
-  +'derSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#24'Ho'
-  +'stApplicationBrowseBtn'#7'OnClick'#7#29'HostApplicationBrowseBtnClick'#8'Ta'
-  +'bOrder'#2#0#4'Left'#3#191#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2#23#0#0#5'T'
-  +'Edit'#19'HostApplicationEdit'#5'Align'#7#8'alClient'#22'BorderSpacing.OnCha'
-  +'nge'#13#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#19'HostAppli'
-  +'cationEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#179#1#0#0#0#9
-  +'TGroupBox'#24'WorkingDirectoryGroupBox'#5'Align'#7#5'alTop'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#24'WorkingDirectoryGroupBox'#12'ClientHeight'#2
-  +'#'#11'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOrder'#2#4#4'Left'#2#6#6
+  +'oSize'#9#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#25'Bord'
+  +'erSpacing.InnerBorder'#2#2#7'Caption'#6#8'OkButton'#7'OnClick'#7#13'OkButto'
+  +'nClick'#8'TabOrder'#2#0#23'AnchorSideRight.Control'#7#12'CancelButton'#4'Le'
+  +'ft'#3'E'#1#6'Height'#2#29#3'Top'#3#159#1#5'Width'#2'E'#0#0#7'TButton'#12'Ca'
+  +'ncelButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#22'BorderS'
+  +'pacing.OnChange'#13#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBord'
+  +'er'#2#2#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#8'TabOrder'#2#1#4
+  +'Left'#3#144#1#6'Height'#2#29#3'Top'#3#159#1#5'Width'#2'X'#0#0#9'TNotebook'#8
+  +'Notebook'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#22'BorderSpacing.OnChange'#13#9'PageIndex'#2#0#6'Height'#3#152#1
+  +#5'Width'#3#244#1#0#5'TPage'#5'Page1'#7'Caption'#6#5'Page1'#11'ClientWidth'#3
+  +#236#1#12'ClientHeight'#3'~'#1#6'Height'#3'~'#1#5'Width'#3#236#1#0#9'TGroupB'
+  +'ox'#15'DisplayGroupBox'#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6#15'DisplayGroupBox'#12'ClientHeight'#2'6'#11'Clien'
+  +'tWidth'#3#220#1#11'ParentColor'#9#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2'H'
+  +#3'Top'#3#3#1#5'Width'#3#224#1#0#5'TEdit'#11'DisplayEdit'#5'Align'#7#5'alTop'
+  +#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'DisplayEdit'#4'Le'
+  +'ft'#2#6#6'Height'#2#23#3'Top'#2#25#5'Width'#3#208#1#0#0#9'TCheckBox'#18'Use'
+  +'DisplayCheckBox'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'C'
+  +'aption'#6#18'UseDisplayCheckBox'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#13
+  +#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#25'CmdLineParametersGroupBox'
+  +#5'Align'#7#5'alTop'#8'AutoSize'#9#22'BorderSpacing.OnChange'#13#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#25'CmdLineParametersGroupBox'#12'ClientHeigh'
+  +'t'#2'#'#11'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOrder'#2#0#4'Left'#2
+  +#6#6'Height'#2'5'#3'Top'#2'A'#5'Width'#3#224#1#0#5'TEdit'#21'CmdLineParamete'
+  +'rsEdit'#5'Align'#7#5'alTop'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.'
+  +'Around'#2#6#8'TabOrder'#2#0#4'Text'#6#21'CmdLineParametersEdit'#4'Left'#2#6
+  +#6'Height'#2#23#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#31'UseLaunchi'
+  +'ngApplicationGroupBox'#5'Align'#7#5'alTop'#8'AutoSize'#9#22'BorderSpacing.O'
+  +'nChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#31'UseLaunchingApplic'
+  +'ationGroupBox'#12'ClientHeight'#2'4'#11'ClientWidth'#3#220#1#11'ParentColor'
+  +#9#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2'F'#3'Top'#2'|'#5'Width'#3#224#1#0
+  +#9'TCheckBox'#31'UseLaunchingApplicationCheckBox'#5'Align'#7#5'alTop'#22'Bor'
+  +'derSpacing.OnChange'#13#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6
+  +#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#31'Us'
+  +'eLaunchingApplicationCheckBox'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#13#3
+  +'Top'#2#6#5'Width'#3#208#1#0#0#9'TComboBox'#31'UseLaunchingApplicationComboB'
+  +'ox'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#0#22'BorderSpacing.OnChange'
+  +#13#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#1#4'Text'#6
+  +#31'UseLaunchingApplicationComboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#25#5
+  +'Width'#3#208#1#0#0#0#9'TGroupBox'#23'HostApplicationGroupBox'#5'Align'#7#5
+  +'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'HostAppli'
+  +'cationGroupBox'#12'ClientHeight'#2'#'#11'ClientWidth'#3#220#1#11'ParentColo'
+  +'r'#9#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2'5'#3'Top'#2#6#5'Width'#3#224#1
+  +#0#7'TButton'#24'HostApplicationBrowseBtn'#5'Align'#7#7'alRight'#20'BorderSp'
+  +'acing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#24'HostApp'
+  +'licationBrowseBtn'#7'OnClick'#7#29'HostApplicationBrowseBtnClick'#8'TabOrde'
+  +'r'#2#0#4'Left'#3#191#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2#23#0#0#5'TEdit'
+  +#19'HostApplicationEdit'#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6
+  +#8'TabOrder'#2#1#4'Text'#6#19'HostApplicationEdit'#4'Left'#2#6#6'Height'#2#23
+  +#3'Top'#2#6#5'Width'#3#179#1#0#0#0#9'TGroupBox'#24'WorkingDirectoryGroupBox'
+  +#5'Align'#7#5'alTop'#8'AutoSize'#9#22'BorderSpacing.OnChange'#13#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#24'WorkingDirectoryGroupBox'#12'ClientHeight'
+  +#2'#'#11'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOrder'#2#4#4'Left'#2#6#6
   +'Height'#2'5'#3'Top'#3#200#0#5'Width'#3#224#1#0#7'TButton'#19'WorkingDirecto'
-  +'ryBtn'#5'Align'#7#7'alRight'#20'BorderSpacing.Around'#2#6#25'BorderSpacing.'
-  +'InnerBorder'#2#2#7'Caption'#6#19'WorkingDirectoryBtn'#7'OnClick'#7#24'Worki'
-  +'ngDirectoryBtnClick'#8'TabOrder'#2#0#4'Left'#3#191#1#6'Height'#2#23#3'Top'#2
-  +#6#5'Width'#2#23#0#0#5'TEdit'#20'WorkingDirectoryEdit'#5'Align'#7#8'alClient'
-  ,#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#20'WorkingDirectoryE'
-  +'dit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#179#1#0#0#0#0#5'TPage'
-  +#5'Page2'#7'Caption'#6#5'Page2'#11'ClientWidth'#3#236#1#12'ClientHeight'#3'~'
-  +#1#6'Height'#3'~'#1#5'Width'#3#236#1#0#9'TCheckBox'#30'IncludeSystemVariable'
-  +'sCheckBox'#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#30'IncludeSystemVariablesCheckBox'#7'Enabled'#8#8'TabOrder'#2#0#4'Left'#2#6
-  +#6'Height'#2#24#3'Top'#3'`'#1#5'Width'#3#224#1#0#0#9'TGroupBox'#21'UserOverr'
-  +'idesGroupBox'#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#21'UserOverridesGroupBox'#12'ClientHeight'#3#143#0#11'ClientWidth'#3#220#1
-  +#11'ParentColor'#9#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#3#161#0#3'Top'#3#185
-  +#0#5'Width'#3#224#1#0#7'TButton'#22'UserOverridesAddButton'#7'Anchors'#11#6
-  +'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderS'
-  +'pacing.InnerBorder'#2#2#7'Caption'#6#22'UserOverridesAddButton'#7'OnClick'#7
-  +#27'UserOverridesAddButtonClick'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#25#3
-  +'Top'#2'n'#5'Width'#2'>'#0#0#7'TButton'#23'UserOverridesEditButton'#7'Anchor'
-  +'s'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25
-  +'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#23'UserOverridesEditButton'#7'O'
-  +'nClick'#7#28'UserOverridesEditButtonClick'#8'TabOrder'#2#1#22'AnchorSideLef'
-  +'t.Control'#7#22'UserOverridesAddButton'#4'Left'#2'J'#6'Height'#2#25#3'Top'#2
-  +'n'#5'Width'#2'>'#0#0#7'TButton'#25'UserOverridesDeleteButton'#7'Anchors'#11
-  +#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'Borde'
-  +'rSpacing.InnerBorder'#2#2#7'Caption'#6#25'UserOverridesDeleteButton'#7'OnCl'
-  +'ick'#7#30'UserOverridesDeleteButtonClick'#8'TabOrder'#2#2#22'AnchorSideLeft'
-  +'.Control'#7#23'UserOverridesEditButton'#4'Left'#3#142#0#6'Height'#2#25#3'To'
-  +'p'#2'n'#5'Width'#2'>'#0#0#9'TListView'#21'UserOverridesListView'#5'Align'#7
-  +#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'Borde'
-  +'rSpacing.Around'#2#6#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5
-  +'Width'#2'*'#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#0#9'R'
-  +'owSelect'#9#8'SortType'#7#6'stText'#9'ViewStyle'#7#8'vsReport'#4'Left'#2#6#6
-  +'Height'#2'`'#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#23'SystemVariab'
-  +'lesGroupBox'#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#23'SystemVariablesGroupBox'#12'ClientHeight'#3#155#0#11'ClientWidth'#3#220
-  +#1#11'ParentColor'#9#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#3#173#0#3'Top'#2#6
-  +#5'Width'#3#224#1#0#9'TListView'#23'SystemVariablesListView'#5'Align'#7#8'al'
-  +'Client'#20'BorderSpacing.Around'#2#6#7'Columns'#14#1#8'AutoSize'#9#7'Captio'
-  +'n'#6#7'Caption'#5'Width'#2'*'#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'W'
-  +'idth'#2'*'#0#0#9'RowSelect'#9#8'SortType'#7#6'stText'#9'ViewStyle'#7#8'vsRe'
-  +'port'#4'Left'#2#6#6'Height'#3#143#0#3'Top'#2#6#5'Width'#3#208#1#0#0#0#0#0#0
+  +'ryBtn'#5'Align'#7#7'alRight'#22'BorderSpacing.OnChange'#13#20'BorderSpacing'
+  +'.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#19'WorkingDirec'
+  ,'toryBtn'#7'OnClick'#7#24'WorkingDirectoryBtnClick'#8'TabOrder'#2#0#4'Left'#3
+  +#191#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2#23#0#0#5'TEdit'#20'WorkingDirect'
+  +'oryEdit'#5'Align'#7#8'alClient'#22'BorderSpacing.OnChange'#13#20'BorderSpac'
+  +'ing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#20'WorkingDirectoryEdit'#4'Left'#2
+  +#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#179#1#0#0#0#0#5'TPage'#5'Page2'#7'Ca'
+  +'ption'#6#5'Page2'#11'ClientWidth'#3#236#1#12'ClientHeight'#3'~'#1#6'Height'
+  +#3'~'#1#5'Width'#3#236#1#0#9'TCheckBox'#30'IncludeSystemVariablesCheckBox'#5
+  +'Align'#7#8'alBottom'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#30'IncludeSystemVariablesCheckBox'#7'Enabled'#8#8'TabOrder'
+  +#2#0#4'Left'#2#6#6'Height'#2#13#3'Top'#3'k'#1#5'Width'#3#224#1#0#0#9'TGroupB'
+  +'ox'#21'UserOverridesGroupBox'#5'Align'#7#8'alBottom'#22'BorderSpacing.OnCha'
+  +'nge'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'UserOverridesGroupBox'
+  +#12'ClientHeight'#3#143#0#11'ClientWidth'#3#220#1#11'ParentColor'#9#8'TabOrd'
+  +'er'#2#1#4'Left'#2#6#6'Height'#3#161#0#3'Top'#3#196#0#5'Width'#3#224#1#0#7'T'
+  +'Button'#22'UserOverridesAddButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
+  +'AutoSize'#9#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#25'B'
+  +'orderSpacing.InnerBorder'#2#2#7'Caption'#6#22'UserOverridesAddButton'#7'OnC'
+  +'lick'#7#27'UserOverridesAddButtonClick'#8'TabOrder'#2#0#4'Left'#2#6#6'Heigh'
+  +'t'#2#29#3'Top'#2'j'#5'Width'#3#141#0#0#0#7'TButton'#23'UserOverridesEditBut'
+  +'ton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacing.O'
+  +'nChange'#13#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7
+  +'Caption'#6#23'UserOverridesEditButton'#7'OnClick'#7#28'UserOverridesEditBut'
+  +'tonClick'#8'TabOrder'#2#1#22'AnchorSideLeft.Control'#7#22'UserOverridesAddB'
+  +'utton'#4'Left'#3#153#0#6'Height'#2#29#3'Top'#2'j'#5'Width'#3#140#0#0#0#7'TB'
+  +'utton'#25'UserOverridesDeleteButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
+  +'AutoSize'#9#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#25'B'
+  +'orderSpacing.InnerBorder'#2#2#7'Caption'#6#25'UserOverridesDeleteButton'#7
+  +'OnClick'#7#30'UserOverridesDeleteButtonClick'#8'TabOrder'#2#2#22'AnchorSide'
+  +'Left.Control'#7#23'UserOverridesEditButton'#4'Left'#3'+'#1#6'Height'#2#29#3
+  +'Top'#2'j'#5'Width'#3#153#0#0#0#9'TListView'#21'UserOverridesListView'#5'Ali'
+  +'gn'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22
+  +'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Columns'#14#1#8'A'
+  +'utoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#1#8'AutoSize'#9#7'Captio'
+  +'n'#6#7'Caption'#5'Width'#2'*'#0#0#9'RowSelect'#9#8'SortType'#7#6'stText'#9
+  +'ViewStyle'#7#8'vsReport'#4'Left'#2#6#6'Height'#2'`'#3'Top'#2#6#5'Width'#3
+  +#208#1#0#0#0#9'TGroupBox'#23'SystemVariablesGroupBox'#5'Align'#7#8'alClient'
+  +#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Caption'#6#23
+  +'SystemVariablesGroupBox'#12'ClientHeight'#3#166#0#11'ClientWidth'#3#220#1#11
+  +'ParentColor'#9#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#3#184#0#3'Top'#2#6#5'W'
+  +'idth'#3#224#1#0#9'TListView'#23'SystemVariablesListView'#5'Align'#7#8'alCli'
+  +'ent'#22'BorderSpacing.OnChange'#13#20'BorderSpacing.Around'#2#6#7'Columns'
+  +#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#1#8'AutoSize'#9#7
+  +'Caption'#6#7'Caption'#5'Width'#2'*'#0#0#9'RowSelect'#9#8'SortType'#7#6'stTe'
+  +'xt'#9'ViewStyle'#7#8'vsReport'#4'Left'#2#6#6'Height'#3#154#0#3'Top'#2#6#5'W'
+  +'idth'#3#208#1#0#0#0#0#0#0
 ]);
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index f8f83760c1..e8315187b6 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -162,6 +162,7 @@ type
   published
     property Align;
     property Anchors;
+    property AutoSize;
     property BorderSpacing;
     property Caption;
     property ChildSizing;