diff --git a/ide/newdialog.lfm b/ide/newdialog.lfm
index 957a3cf02d..f4584a3180 100644
--- a/ide/newdialog.lfm
+++ b/ide/newdialog.lfm
@@ -94,52 +94,16 @@ object NewOtherDialog: TNewOtherDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 361
-    Height = 26
-    Top = 363
-    Width = 109
+    Left = 380
+    Height = 25
+    Top = 364
+    Width = 90
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'CancelButton'
     Constraints.MinHeight = 25
     Constraints.MinWidth = 75
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF003F3DED413B38EB08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00211FE3081E1CE241FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004A47F0414F4CF2FF403EEDFD3C39EB08FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF002725E5082422E4FC312FEAFF1F1DE241FFFFFF00FFFFFF00FFFFFF005451
-      F3415856F5FF6361FAFF5855F6FF413FEDFC3D3AEC08FFFFFF00FFFFFF00302D
-      E7082C2AE6FC413FF1FF4C4AF6FF312FEAFF1F1DE241FFFFFF00FFFFFF005956
-      F52B5B58F6FF6562FAFF7170FFFF5956F6FF4240EEFC3E3BEC083937EB083532
-      E9FC4745F2FF6362FFFF4A48F4FF2F2DE9FF2220E32BFFFFFF00FFFFFF00FFFF
-      FF005A57F52B5B59F6FF6663FAFF7471FFFF5A58F6FF4341EEFC3E3CECFD504D
-      F4FF6867FFFF504EF5FF3634EBFF2A27E52BFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF005B58F62B5C5AF6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6C
-      FFFF5755F7FF3F3DEEFF3230E82BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF005C59F62B5D5BF7FF7976FFFF5956FFFF5754FFFF7270
-      FFFF4846F0FF3C39EB2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00615EF8085D5AF6FD7D79FFFF5E5BFFFF5B58FFFF7674
-      FFFF4643EFFD413FED08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006967FB086663F9FC706DFBFF807EFFFF7E7BFFFF7C79FFFF7977
-      FFFF5E5CF7FF4744EFFC4240EE08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00716EFD086E6BFCFC7774FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6A
-      FAFF7B79FFFF605DF7FF4845EFFC4341EE08FFFFFF00FFFFFF00FFFFFF007673
-      FF087471FEFD7D7AFEFF8A87FFFF7C79FDFF6C69FBFF6361F92B5F5CF72B615E
-      F8FF6E6CFAFF7D7AFFFF615FF7FF4946F0FC4441EE05FFFFFF00FFFFFF007774
-      FF1F7A77FFFF817EFFFF817EFEFF7471FDFF6C69FB2BFFFFFF00FFFFFF00605D
-      F72B625FF8FF6F6DFBFF7E7CFFFF625FF8FF4A47F06F4542EE02FFFFFF00FFFF
-      FF007774FF1F7A77FFFF7976FEFF726FFD2BFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00615EF82B6461F8FF6A68F9FF5451F3A84F4DF229FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF007774FF1F7774FF2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00625FF82B5D5BF76F5956F53EFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF006360F80AFFFFFF00FFFFFF00FFFFFF00
-    }
     ModalResult = 2
     NumGlyphs = 0
     TabOrder = 1
@@ -148,10 +112,10 @@ object NewOtherDialog: TNewOtherDialog
     AnchorSideRight.Control = CancelButton
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 265
-    Height = 26
-    Top = 363
-    Width = 90
+    Left = 299
+    Height = 25
+    Top = 364
+    Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -159,42 +123,6 @@ object NewOtherDialog: TNewOtherDialog
     Constraints.MinHeight = 25
     Constraints.MinWidth = 75
     Enabled = False
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00317A360A2D753207FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF003985400A37833DFF317B37FB2E763307FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004292490A408E47FF54A35CFF4F9F57FF327C38FE2E773408FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004B9E530A499A51FF5BAC64FF77CA82FF74C87EFF51A059FF337D39FE2F78
-      3508FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0053A9
-      5C0A51A65AFF63B56DFF7ECE89FF7BCC87FF76CA81FF76C981FF52A25AFF347E
-      3AFE30793508FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF005AB4650959B0
-      63FF6BBD76FF84D290FF7AC985FF60B26AFF63B46DFF78C983FF78CB82FF53A3
-      5CFF347F3AFD317A3608FFFFFF00FFFFFF00FFFFFF00FFFFFF005EB969465BB5
-      66E479C986FF80CE8DFF51A65AFC4DA1566F499C518B5CAD67FF7CCC86FF79CB
-      85FF54A45DFF35803BFC317B3708FFFFFF00FFFFFF00FFFFFF00FFFFFF005FBA
-      6A3C5CB666E66DC079FF55AC5F6FFFFFFF00FFFFFF004A9D52915EAE68FF7DCD
-      89FF7CCD87FF56A55FFF36813CFC327C3808FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF005FBB6A435CB76765FFFFFF00FFFFFF00FFFFFF00FFFFFF004B9E53915FAF
-      69FF7FCE8AFF7ECE89FF57A660FF37823DFC337D3908FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF004B9F
-      549160B06AFF81CF8DFF7FCF8BFF58A761FF398540FF347E3A08FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004CA0559162B26CFF82D18FFF7AC885FF57A660FF38843F7BFFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004DA1569163B36DFF5FAF69FF41914979FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF004EA257914A9D527FFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-    }
     NumGlyphs = 0
     OnClick = OkButtonClick
     TabOrder = 2
@@ -204,51 +132,15 @@ object NewOtherDialog: TNewOtherDialog
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 26
-    Top = 363
-    Width = 98
+    Height = 25
+    Top = 364
+    Width = 79
     Anchors = [akLeft, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'HelpButton'
     Constraints.MinHeight = 25
     Constraints.MinWidth = 75
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00AD744423AC72417DAA703FDBA86D3CF3A76B3AF3A569
-      37DBA468357DA3663323FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00B57E5153B37C4EE6D7BBA3FFE9DACAFFECE0D1FFECE0D1FFE8D8
-      C8FFD3B59CFFA76C3AE6A66A3853FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00BD895F53BB875BF4E7D5C4FFE5D2BFFFC9A685FFB88E67FFB68A65FFC5A1
-      80FFE0CCBAFFE3D0BEFFAB7040F4A96E3D53FFFFFF00FFFFFF00FFFFFF00C695
-      6D22C3926AE5EAD8C9FFE3CDBAFFC0946BFFBA8C62FFCFB094FFCFB094FFB789
-      5FFFB28761FFDAC0AAFFE4D1C0FFAE7546E5AD734322FFFFFF00FFFFFF00CC9E
-      787EE4CCB9FFEAD6C5FFC79971FFBF9066FFBF9066FFF7F1ECFFF6F0EAFFB789
-      5FFFB7895FFFB58963FFE2CEBBFFD9BDA6FFB27B4D7EFFFFFF00FFFFFF00D3A7
-      84DBEFE1D3FFD9B595FFC7986CFFC39569FFC19367FFBF9066FFBF9066FFBB8B
-      63FFB98A63FFB88A62FFCBA786FFEADCCCFFB88357DBFFFFFF00FFFFFF00D9B0
-      8FF6F2E4D9FFD1A57AFFC5996BFFC4976AFFC49669FFFAF6F2FFF3EAE1FFC295
-      6DFFBE8F65FFBE8F64FFC0956DFFEFE3D5FFBF8C61F6FFFFFF00FFFFFF00E0B9
-      99F6F2E5DAFFD1A67EFFCC9D71FFC79A6CFFC5986BFFE2CCB6FFF8F3EEFFF6EE
-      E8FFD9BDA1FFC29468FFC59B71FFF0E2D6FFC5956CF6FFFFFF00FFFFFF00E6C1
-      A3DBF3E5D9FFDFBB9EFFCFA075FFCD9E72FFF5EBE3FFE4CBB4FFE7D3BFFFFBF8
-      F6FFE5D3BFFFC4986BFFD6B491FFEEE0D2FFCC9E78DBFFFFFF00FFFFFF00EBC9
-      AD7EF4E3D4FFEFDCCDFFD5A87EFFD0A077FFFBF8F5FFFCF8F5FFFCF8F5FFFBF8
-      F5FFD1A881FFCFA47BFFEAD5C3FFEAD4C2FFD2A7837EFFFFFF00FFFFFF00F1D0
-      B522EFCEB3E5F6E9DDFFECD8C6FFD7AC81FFDCBB9AFFF6ECE3FFF5ECE2FFE4C8
-      AEFFD2A77BFFE6CEBAFFF1E2D5FFDBB391E5D9B08E22FFFFFF00FFFFFF00FFFF
-      FF00F4D4BB53F2D2B8F4F7EADFFFEEDED0FFE3C1A7FFD8AE89FFD7AC86FFDDBB
-      9CFFEBD6C7FFF3E6D9FFE3BE9FF4E1BB9C53FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00F6D8BF53F5D6BDE6F9E9DCFFF6E8DDFFF3E5DAFFF3E5DAFFF5E7
-      DCFFF5E4D6FFEBC8ACE6E9C6A953FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00F9DBC423F8DAC27DF7D8C0DBF6D7BEF3F4D5BCF3F3D3
-      B9DBF1D1B77DF0CFB423FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-    }
     NumGlyphs = 0
     OnClick = HelpButtonClick
     TabOrder = 3
diff --git a/ide/newdialog.lrs b/ide/newdialog.lrs
index 8297bf5729..023404ef86 100644
--- a/ide/newdialog.lrs
+++ b/ide/newdialog.lrs
@@ -30,165 +30,20 @@ LazarusResources.Add('TNewOtherDialog','FORMDATA',[
   +'Align'#7#7'alRight'#12'ResizeAnchor'#7#7'akRight'#0#0#0#7'TBitBtn'#12'Cance'
   +'lButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
   +'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
-  +#7#9'asrBottom'#4'Left'#3'i'#1#6'Height'#2#26#3'Top'#3'k'#1#5'Width'#2'm'#7
+  +#7#9'asrBottom'#4'Left'#3'|'#1#6'Height'#2#25#3'Top'#3'l'#1#5'Width'#2'Z'#7
   +'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6#12'CancelButton'#21'Constraints.MinHeight'#2#25#20'Constra'
-  +'ints.MinWidth'#2'K'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0
-  +'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0
-  +#0#0#0#0#0#0#0#0#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'?='#237'A;8'
-  +#235#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'!'#31#227#8#30#28#226'A'#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'JG'#240'AOL'#242#255'@>'#237#253'<9'#235#8
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'''%'#229#8'$"'#228
-  +#252'1/'#234#255#31#29#226'A'#255#255#255#0#255#255#255#0#255#255#255#0'TQ'
-  +#243'AXV'#245#255'ca'#250#255'XU'#246#255'A?'#237#252'=:'#236#8#255#255#255#0
-  +#255#255#255#0'0-'#231#8',*'#230#252'A?'#241#255'LJ'#246#255'1/'#234#255#31
-  +#29#226'A'#255#255#255#0#255#255#255#0'YV'#245'+[X'#246#255'eb'#250#255'qp'
-  +#255#255'YV'#246#255'B@'#238#252'>;'#236#8'97'#235#8'52'#233#252'GE'#242#255
-  +'cb'#255#255'JH'#244#255'/-'#233#255'" '#227'+'#255#255#255#0#255#255#255#0
-  +#255#255#255#0'ZW'#245'+[Y'#246#255'fc'#250#255'tq'#255#255'ZX'#246#255'CA'
-  +#238#252'><'#236#253'PM'#244#255'hg'#255#255'PN'#245#255'64'#235#255'*'''#229
-  +'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'[X'
-  +#246'+\Z'#246#255'gd'#250#255'tr'#255#255'sp'#255#255'pn'#255#255'nl'#255#255
-  +'WU'#247#255'?='#238#255'20'#232'+'#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'\Y'#246'+]['#247#255
-  +'yv'#255#255'YV'#255#255'WT'#255#255'rp'#255#255'HF'#240#255'<9'#235'+'#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'a^'#248#8']Z'#246#253'}y'#255#255'^['#255
-  +#255'[X'#255#255'vt'#255#255'FC'#239#253'A?'#237#8#255#255#255#0#255#255#255
-  +#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'ig'
-  +#251#8'fc'#249#252'pm'#251#255#128'~'#255#255'~{'#255#255'|y'#255#255'yw'#255
-  +#255'^\'#247#255'GD'#239#252'B@'#238#8#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'qn'#253#8'nk'#252#252'wt'#253#255#134#130
-  +#255#255'vs'#252#255'db'#248#255'`]'#247#255'mj'#250#255'{y'#255#255'`]'#247
-  +#255'HE'#239#252'CA'#238#8#255#255#255#0#255#255#255#0#255#255#255#0'vs'#255
-  ,#8'tq'#254#253'}z'#254#255#138#135#255#255'|y'#253#255'li'#251#255'ca'#249'+'
-  +'_\'#247'+a^'#248#255'nl'#250#255'}z'#255#255'a_'#247#255'IF'#240#252'DA'#238
-  +#5#255#255#255#0#255#255#255#0'wt'#255#31'zw'#255#255#129'~'#255#255#129'~'
-  +#254#255'tq'#253#255'li'#251'+'#255#255#255#0#255#255#255#0'`]'#247'+b_'#248
-  +#255'om'#251#255'~|'#255#255'b_'#248#255'JG'#240'oEB'#238#2#255#255#255#0#255
-  +#255#255#0'wt'#255#31'zw'#255#255'yv'#254#255'ro'#253'+'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'a^'#248'+da'#248#255'jh'#249#255'TQ'
-  +#243#168'OM'#242')'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'wt'#255#31'wt'#255'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255
-  +#0#255#255#255#0#255#255#255#0'b_'#248'+]['#247'oYV'#245'>'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0'c`'#248#10#255#255#255#0#255#255#255#0#255#255
-  +#255#0#11'ModalResult'#2#2#9'NumGlyphs'#2#0#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#9#1
-  +#6'Height'#2#26#3'Top'#3'k'#1#5'Width'#2'Z'#7'Anchors'#11#7'akRight'#8'akBot'
-  +'tom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#8'OkButton'
-  +#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Enabled'#8#10
-  +'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0
-  +#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'1z6'#10'-'
-  +'u2'#7#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'9'#133'@'#10'7'#131'='#255'1{7'#251'.'
-  +'v3'#7#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0'B'#146'I'#10'@'#142'G'#255'T'#163'\'#255'O'#159'W'#255'2|8'#254'.'
-  +'w4'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'K'#158'S'#10'I'#154
-  +'Q'#255'['#172'd'#255'w'#202#130#255't'#200'~'#255'Q'#160'Y'#255'3}9'#254'/x'
-  +'5'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0'S'#169'\'#10'Q'#166'Z'#255'c'#181'm'#255'~'#206
-  +#137#255'{'#204#135#255'v'#202#129#255'v'#201#129#255'R'#162'Z'#255'4~:'#254
-  +'0y5'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'Z'#180'e'#9'Y'#176'c'#255'k'#189'v'#255#132#210#144#255'z'#201#133#255'`'
-  +#178'j'#255'c'#180'm'#255'x'#201#131#255'x'#203#130#255'S'#163'\'#255'4:'
-  +#253'1z6'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'^'#185'i'
-  +'F['#181'f'#228'y'#201#134#255#128#206#141#255'Q'#166'Z'#252'M'#161'VoI'#156
-  +'Q'#139'\'#173'g'#255'|'#204#134#255'y'#203#133#255'T'#164']'#255'5'#128';'
-  +#252'1{7'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'_'#186'j'
-  +'<\'#182'f'#230'm'#192'y'#255'U'#172'_o'#255#255#255#0#255#255#255#0'J'#157
-  +'R'#145'^'#174'h'#255'}'#205#137#255'|'#205#135#255'V'#165'_'#255'6'#129'<'
-  +#252'2|8'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'_'#187'j'
-  +'C\'#183'ge'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'K'#158
-  +'S'#145'_'#175'i'#255''#206#138#255'~'#206#137#255'W'#166'`'#255'7'#130'='
-  +#252'3}9'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'K'#159'T'#145'`'#176'j'#255#129#207#141#255''#207#139#255'X'#167'a'#255'9'
-  +#133'@'#255'4~:'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0'L'#160'U'#145'b'#178'l'#255#130#209#143#255'z'#200#133#255'W'#166
-  +'`'#255'8'#132'?{'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0'M'#161'V'#145'c'#179'm'#255'_'#175'i'#255'A'#145'Iy'
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'N'#162'W'#145'J'#157'R'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  ,#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#2#0
+  +'ints.MinWidth'#2'K'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0
+  +#7'TBitBtn'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'An'
+  +'chorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'
+  +#4'Left'#3'+'#1#6'Height'#2#25#3'Top'#3'l'#1#5'Width'#2'K'#7'Anchors'#11#7'a'
+  +'kRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#8'OkButton'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7
+  +'Enabled'#8#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#2#0
   +#0#7'TBitBtn'#10'HelpButton'#22'AnchorSideLeft.Control'#7#5'Owner'#24'Anchor'
   +'SideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L'
-  +'eft'#2#6#6'Height'#2#26#3'Top'#3'k'#1#5'Width'#2'b'#7'Anchors'#11#6'akLeft'
+  +'eft'#2#6#6'Height'#2#25#3'Top'#3'l'#1#5'Width'#2'O'#7'Anchors'#11#6'akLeft'
   +#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'He'
-  +'lpButton'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#10'G'
-  +'lyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0
-  +#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#173'tD#'#172'rA}'#170'p'
-  +'?'#219#168'm<'#243#167'k:'#243#165'i7'#219#164'h5}'#163'f3#'#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#181'~QS'#179'|N'#230#215#187#163#255#233#218#202#255#236#224#209
-  +#255#236#224#209#255#232#216#200#255#211#181#156#255#167'l:'#230#166'j8S'#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#189#137'_'
-  +'S'#187#135'['#244#231#213#196#255#229#210#191#255#201#166#133#255#184#142'g'
-  +#255#182#138'e'#255#197#161#128#255#224#204#186#255#227#208#190#255#171'p@'
-  +#244#169'n=S'#255#255#255#0#255#255#255#0#255#255#255#0#198#149'm"'#195#146
-  +'j'#229#234#216#201#255#227#205#186#255#192#148'k'#255#186#140'b'#255#207#176
-  +#148#255#207#176#148#255#183#137'_'#255#178#135'a'#255#218#192#170#255#228
-  +#209#192#255#174'uF'#229#173'sC"'#255#255#255#0#255#255#255#0#204#158'x~'#228
-  +#204#185#255#234#214#197#255#199#153'q'#255#191#144'f'#255#191#144'f'#255#247
-  +#241#236#255#246#240#234#255#183#137'_'#255#183#137'_'#255#181#137'c'#255#226
-  +#206#187#255#217#189#166#255#178'{M~'#255#255#255#0#255#255#255#0#211#167#132
-  +#219#239#225#211#255#217#181#149#255#199#152'l'#255#195#149'i'#255#193#147'g'
-  +#255#191#144'f'#255#191#144'f'#255#187#139'c'#255#185#138'c'#255#184#138'b'
-  +#255#203#167#134#255#234#220#204#255#184#131'W'#219#255#255#255#0#255#255#255
-  +#0#217#176#143#246#242#228#217#255#209#165'z'#255#197#153'k'#255#196#151'j'
-  +#255#196#150'i'#255#250#246#242#255#243#234#225#255#194#149'm'#255#190#143'e'
-  +#255#190#143'd'#255#192#149'm'#255#239#227#213#255#191#140'a'#246#255#255#255
-  +#0#255#255#255#0#224#185#153#246#242#229#218#255#209#166'~'#255#204#157'q'
-  +#255#199#154'l'#255#197#152'k'#255#226#204#182#255#248#243#238#255#246#238
-  +#232#255#217#189#161#255#194#148'h'#255#197#155'q'#255#240#226#214#255#197
-  +#149'l'#246#255#255#255#0#255#255#255#0#230#193#163#219#243#229#217#255#223
-  +#187#158#255#207#160'u'#255#205#158'r'#255#245#235#227#255#228#203#180#255
-  +#231#211#191#255#251#248#246#255#229#211#191#255#196#152'k'#255#214#180#145
-  +#255#238#224#210#255#204#158'x'#219#255#255#255#0#255#255#255#0#235#201#173
-  +'~'#244#227#212#255#239#220#205#255#213#168'~'#255#208#160'w'#255#251#248#245
-  +#255#252#248#245#255#252#248#245#255#251#248#245#255#209#168#129#255#207#164
-  +'{'#255#234#213#195#255#234#212#194#255#210#167#131'~'#255#255#255#0#255#255
-  +#255#0#241#208#181'"'#239#206#179#229#246#233#221#255#236#216#198#255#215#172
-  +#129#255#220#187#154#255#246#236#227#255#245#236#226#255#228#200#174#255#210
-  +#167'{'#255#230#206#186#255#241#226#213#255#219#179#145#229#217#176#142'"'
-  +#255#255#255#0#255#255#255#0#255#255#255#0#244#212#187'S'#242#210#184#244#247
-  +#234#223#255#238#222#208#255#227#193#167#255#216#174#137#255#215#172#134#255
-  +#221#187#156#255#235#214#199#255#243#230#217#255#227#190#159#244#225#187#156
-  +'S'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#246
-  +#216#191'S'#245#214#189#230#249#233#220#255#246#232#221#255#243#229#218#255
-  +#243#229#218#255#245#231#220#255#245#228#214#255#235#200#172#230#233#198#169
-  +'S'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#249#219#196'#'#248#218#194'}'#247#216#192#219#246
-  +#215#190#243#244#213#188#243#243#211#185#219#241#209#183'}'#240#207#180'#'
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#9'NumGlyphs'#2#0#7
-  +'OnClick'#7#15'HelpButtonClick'#8'TabOrder'#2#3#0#0#0
+  +'lpButton'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#9'Nu'
+  +'mGlyphs'#2#0#7'OnClick'#7#15'HelpButtonClick'#8'TabOrder'#2#3#0#0#0
 ]);
diff --git a/ide/newdialog.pas b/ide/newdialog.pas
index aa6e9a4aff..83670337e8 100644
--- a/ide/newdialog.pas
+++ b/ide/newdialog.pas
@@ -349,6 +349,10 @@ begin
   HelpButton.Caption := lisPckEditHelp;
   DefaultControl := OkButton;
   CancelControl  := CancelButton;
+
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
+  HelpButton.LoadGlyphFromLazarusResource('btn_help');
 end;
 
 procedure TNewOtherDialog.UpdateDescription;
diff --git a/ide/patheditordlg.lfm b/ide/patheditordlg.lfm
index a55987ec8b..85b50426e1 100644
--- a/ide/patheditordlg.lfm
+++ b/ide/patheditordlg.lfm
@@ -11,6 +11,7 @@ object PathEditorDialog: TPathEditorDialog
   Constraints.MinWidth = 500
   OnCreate = FormCreate
   OnResize = FormResize
+  ParentFont = False
   Position = poScreenCenter
   LCLVersion = '0.9.25'
   object PathGroupBox: TGroupBox
@@ -27,7 +28,7 @@ object PathEditorDialog: TPathEditorDialog
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
     Caption = 'PathGroupBox'
-    ClientHeight = 175
+    ClientHeight = 176
     ClientWidth = 484
     TabOrder = 0
     object PathEdit: TSynEdit
@@ -35,20 +36,20 @@ object PathEditorDialog: TPathEditorDialog
       AnchorSideTop.Control = PathGroupBox
       AnchorSideRight.Control = PathGroupBox
       AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = MoveUpButton
       Left = 6
-      Height = 128
+      Height = 129
       Top = 6
       Width = 472
       BorderSpacing.Around = 6
       Anchors = [akTop, akLeft, akRight, akBottom]
       Font.Height = -16
       Font.Name = 'courier'
+      Font.Pitch = fpFixed
       ParentColor = False
+      ParentFont = False
       TabOrder = 0
       BookMarkOptions.Xoffset = -18
       Gutter.Visible = False
-      Gutter.CodeFoldingWidth = 14
       Keystrokes = <      
         item
           Command = 3
@@ -375,66 +376,67 @@ object PathEditorDialog: TPathEditorDialog
       )
       Options = [eoDragDropEditing, eoHalfPageScroll, eoScrollByOneLess, eoScrollPastEol, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces, eoBracketHighlight, eoHideRightMargin]
     end
-    object MoveUpButton: TButton
+    object MoveUpButton: TBitBtn
       AnchorSideLeft.Control = PathGroupBox
       AnchorSideBottom.Control = PathGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 29
-      Top = 140
-      Width = 107
-      Anchors = [akLeft, akBottom]
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'MoveUpButton'
-      OnClick = MoveUpButtonClick
-      TabOrder = 1
-    end
-    object MoveDownButton: TButton
-      AnchorSideLeft.Control = MoveUpButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideBottom.Control = PathGroupBox
-      AnchorSideBottom.Side = asrBottom
-      Left = 119
-      Height = 29
-      Top = 140
-      Width = 124
-      Anchors = [akLeft, akBottom]
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'MoveDownButton'
-      OnClick = MoveDownButtonClick
-      TabOrder = 2
-    end
-    object BrowseButton: TButton
-      AnchorSideLeft.Control = MoveDownButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideBottom.Control = PathGroupBox
-      AnchorSideBottom.Side = asrBottom
-      Left = 249
-      Height = 29
-      Top = 140
-      Width = 101
-      Anchors = [akLeft, akBottom]
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'BrowseButton'
-      OnClick = BrowseButtonClick
-      TabOrder = 3
-    end
-    object DeleteButton: TButton
-      AnchorSideLeft.Control = BrowseButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideBottom.Control = PathGroupBox
-      AnchorSideBottom.Side = asrBottom
-      Left = 356
-      Height = 29
-      Top = 140
+      Height = 23
+      Top = 147
       Width = 97
       Anchors = [akLeft, akBottom]
       AutoSize = True
       BorderSpacing.Around = 6
+      Caption = 'MoveUpButton'
+      NumGlyphs = 0
+      OnClick = MoveUpButtonClick
+      TabOrder = 1
+    end
+    object MoveDownButton: TBitBtn
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideBottom.Control = PathGroupBox
+      AnchorSideBottom.Side = asrBottom
+      Left = 119
+      Height = 23
+      Top = 147
+      Width = 111
+      Anchors = [akLeft, akBottom]
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = 'MoveDownButton'
+      NumGlyphs = 0
+      OnClick = MoveDownButtonClick
+      TabOrder = 2
+    end
+    object BrowseButton: TBitBtn
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideBottom.Control = PathGroupBox
+      AnchorSideBottom.Side = asrBottom
+      Left = 249
+      Height = 23
+      Top = 147
+      Width = 93
+      Anchors = [akLeft, akBottom]
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = 'BrowseButton'
+      NumGlyphs = 0
+      OnClick = BrowseButtonClick
+      TabOrder = 3
+    end
+    object DeleteButton: TBitBtn
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideBottom.Control = PathGroupBox
+      AnchorSideBottom.Side = asrBottom
+      Left = 356
+      Height = 23
+      Top = 147
+      Width = 89
+      Anchors = [akLeft, akBottom]
+      AutoSize = True
+      BorderSpacing.Around = 6
       Caption = 'DeleteButton'
+      NumGlyphs = 0
       OnClick = DeleteButtonClick
       TabOrder = 4
     end
@@ -447,13 +449,13 @@ object PathEditorDialog: TPathEditorDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = OKBitBtn
     Left = 6
-    Height = 152
+    Height = 159
     Top = 206
     Width = 488
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     Caption = 'TemplateGroupBox'
-    ClientHeight = 133
+    ClientHeight = 141
     ClientWidth = 484
     TabOrder = 1
     object TemplatesListBox: TListBox
@@ -461,9 +463,8 @@ object PathEditorDialog: TPathEditorDialog
       AnchorSideTop.Control = TemplateGroupBox
       AnchorSideRight.Control = TemplateGroupBox
       AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = AddTemplateButton
       Left = 6
-      Height = 86
+      Height = 94
       Top = 6
       Width = 472
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -471,20 +472,20 @@ object PathEditorDialog: TPathEditorDialog
       MultiSelect = True
       OnDblClick = TemplatesListBoxDblClick
       TabOrder = 0
-      TopIndex = -1
     end
-    object AddTemplateButton: TButton
+    object AddTemplateButton: TBitBtn
       AnchorSideLeft.Control = TemplateGroupBox
       AnchorSideBottom.Control = TemplateGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 29
-      Top = 98
-      Width = 138
+      Height = 23
+      Top = 112
+      Width = 121
       Anchors = [akLeft, akBottom]
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'AddTemplateButton'
+      NumGlyphs = 0
       OnClick = AddTemplateButtonClick
       TabOrder = 1
     end
@@ -493,11 +494,12 @@ object PathEditorDialog: TPathEditorDialog
     AnchorSideRight.Control = CancelBitBtn
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 308
-    Height = 30
-    Top = 364
-    Width = 90
+    Left = 400
+    Height = 23
+    Top = 371
+    Width = 36
     Anchors = [akRight, akBottom]
+    AutoSize = True
     BorderSpacing.Around = 6
     Caption = '&ÎÊ'
     Default = True
@@ -511,11 +513,12 @@ object PathEditorDialog: TPathEditorDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 404
-    Height = 30
-    Top = 364
-    Width = 90
+    Left = 442
+    Height = 23
+    Top = 371
+    Width = 52
     Anchors = [akRight, akBottom]
+    AutoSize = True
     BorderSpacing.Around = 6
     Cancel = True
     Caption = 'Îòìåíà'
diff --git a/ide/patheditordlg.lrs b/ide/patheditordlg.lrs
index f23bb5e825..578bb4055b 100644
--- a/ide/patheditordlg.lrs
+++ b/ide/patheditordlg.lrs
@@ -5,141 +5,21 @@ LazarusResources.Add('TPathEditorDialog','FORMDATA',[
   +#144#1#3'Top'#3#158#0#5'Width'#3#244#1#13'ActiveControl'#7#16'TemplatesListB'
   +'ox'#7'Caption'#6#16'PathEditorDialog'#12'ClientHeight'#3#144#1#11'ClientWid'
   +'th'#3#244#1#21'Constraints.MinHeight'#3#144#1#20'Constraints.MinWidth'#3#244
-  +#1#8'OnCreate'#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#8'Position'#7#14
-  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#12'PathGroupBox'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#232#1#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
-  +'.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'PathGroupBox'#12'Clie'
-  +'ntHeight'#3#175#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TSynEdit'#8'P'
-  +'athEdit'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#21'AnchorSideTop.Con'
-  +'trol'#7#12'PathGroupBox'#23'AnchorSideRight.Control'#7#12'PathGroupBox'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'Move'
-  +'UpButton'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2#6#5'Width'#3#216#1#20'Bord'
-  +'erSpacing.Around'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
-  +'m'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'Ta'
-  +'bOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutte'
-  +'r.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'
-  +#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3
-  +'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'('
-  +' '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2
-  +'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%'
-  +'@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
-  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
-  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
-  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
-  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
-  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
-  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
-  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
-  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
-  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
-  +'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
-  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
-  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
-  +'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
-  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
-  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
-  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
-  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
-  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
-  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
-  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
-  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
-  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
-  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
-  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
-  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
-  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
-  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
-  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
-  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
-  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
-  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
-  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
-  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
-  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
-  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
-  +#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
-  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#8'PathEdit'#0#7'Opt'
-  +'ions'#11#17'eoDragDropEditing'#16'eoHalfPageScroll'#17'eoScrollByOneLess'#15
-  +'eoScrollPastEol'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'
-  ,#18'eoBracketHighlight'#17'eoHideRightMargin'#0#0#0#7'TButton'#12'MoveUpButt'
-  +'on'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#24'AnchorSideBottom.Contr'
-  +'ol'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'k'#7'Anchors'#11#6'akLeft'#8'akBot'
-  +'tom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'MoveUpBut'
-  +'ton'#7'OnClick'#7#17'MoveUpButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#14'M'
-  +'oveDownButton'#22'AnchorSideLeft.Control'#7#12'MoveUpButton'#19'AnchorSideL'
-  +'eft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'w'#6'Height'#2#29#3'Top'#3
-  +#140#0#5'Width'#2'|'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#14'MoveDownButton'#7'OnClick'#7#19'M'
-  +'oveDownButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'BrowseButton'#22'Anch'
-  +'orSideLeft.Control'#7#14'MoveDownButton'#19'AnchorSideLeft.Side'#7#9'asrBot'
-  +'tom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Si'
-  +'de'#7#9'asrBottom'#4'Left'#3#249#0#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2
-  +'e'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Aro'
-  +'und'#2#6#7'Caption'#6#12'BrowseButton'#7'OnClick'#7#17'BrowseButtonClick'#8
-  +'TabOrder'#2#3#0#0#7'TButton'#12'DeleteButton'#22'AnchorSideLeft.Control'#7
-  +#12'BrowseButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom'
-  +'.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3'd'#1#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'a'#7'Anchors'#11#6'akLef'
-  +'t'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12
-  +'DeleteButton'#7'OnClick'#7#17'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TG'
-  +'roupBox'#16'TemplateGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#12'PathGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#24'AnchorSideBottom.Control'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#152#0
-  +#3'Top'#3#206#0#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'
-  +#12'ClientHeight'#3#133#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListB'
-  +'ox'#16'TemplatesListBox'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'
-  +#21'AnchorSideTop.Control'#7#16'TemplateGroupBox'#23'AnchorSideRight.Control'
-  +#7#16'TemplateGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
-  +'eBottom.Control'#7#17'AddTemplateButton'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2
-  +#6#5'Width'#3#216#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
-  +#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#10'OnDblClick'#7#24'Template'
-  +'sListBoxDblClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#17'AddTe'
-  +'mplateButton'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSi'
-  +'deBottom.Control'#7#16'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'b'#5'Width'#3#138#0#7'Anchors'#11
-  +#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Captio'
-  +'n'#6#17'AddTemplateButton'#7'OnClick'#7#22'AddTemplateButtonClick'#8'TabOrd'
-  +'er'#2#1#0#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'4'#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'An'
-  +'chors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#5'&'#195#142#195#138#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'N'
-  +'umGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSide'
-  +'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anchor'
-  +'SideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L'
-  +'eft'#3#148#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'Anchors'#11#7'akR'
-  +'ight'#8'akBottom'#0#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'Mo'
-  +'dalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#22'TSelectDirectoryDial'
-  +'og'#12'BrowseDialog'#7'Options'#11#15'ofFileMustExist'#14'ofEnableSizing'#12
-  +'ofViewDetail'#0#4'left'#3#184#1#3'top'#3#168#0#0#0#0#17'TPathEditorDialog'
-  +#16'PathEditorDialog'#4'Left'#3''''#1#6'Height'#3#144#1#3'Top'#3#158#0#5'Wid'
-  +'th'#3#244#1#13'ActiveControl'#7#16'TemplatesListBox'#7'Caption'#6#16'PathEd'
-  +'itorDialog'#12'ClientHeight'#3#144#1#11'ClientWidth'#3#244#1#21'Constraints'
-  +'.MinHeight'#3#144#1#20'Constraints.MinWidth'#3#244#1#8'OnCreate'#7#10'FormC'
-  +'reate'#8'OnResize'#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#10'LCL'
-  +'Version'#6#6'0.9.25'#0#9'TGroupBox'#12'PathGroupBox'#22'AnchorSideLeft.Cont'
-  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Con'
-  +'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
-  ,'ht'#3#194#0#3'Top'#2#6#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSp'
-  +'acing.Right'#2#6#7'Caption'#6#12'PathGroupBox'#12'ClientHeight'#3#175#0#11
-  +'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TSynEdit'#8'PathEdit'#22'AnchorSid'
-  +'eLeft.Control'#7#12'PathGroupBox'#21'AnchorSideTop.Control'#7#12'PathGroupB'
-  +'ox'#23'AnchorSideRight.Control'#7#12'PathGroupBox'#20'AnchorSideRight.Side'
-  +#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'MoveUpButton'#4'Left'#2#6#6
-  +'Height'#3#128#0#3'Top'#2#6#5'Width'#3#216#1#20'BorderSpacing.Around'#2#6#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2
-  +#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMark'
-  +'Options.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidth'#2#14
+  +#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#9'TGroupBox'
+  +#12'PathGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
+  +'trol'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#232
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6
+  +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'PathG'
+  +'roupBox'#12'ClientHeight'#3#176#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0
+  +#8'TSynEdit'#8'PathEdit'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#21'An'
+  +'chorSideTop.Control'#7#12'PathGroupBox'#23'AnchorSideRight.Control'#7#12'Pa'
+  +'thGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3
+  +#129#0#3'Top'#2#6#5'Width'#3#216#1#20'BorderSpacing.Around'#2#6#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Na'
+  +'me'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#10'ParentFon'
+  +'t'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8
   +#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'S'
   +'hortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8
   +'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0
@@ -185,60 +65,58 @@ LazarusResources.Add('TPathEditorDialog','FORMDATA',[
   +#0#0#13'Lines.Strings'#1#6#8'PathEdit'#0#7'Options'#11#17'eoDragDropEditing'
   +#16'eoHalfPageScroll'#17'eoScrollByOneLess'#15'eoScrollPastEol'#11'eoSmartTa'
   +'bs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'#18'eoBracketHighlight'#17'e'
-  +'oHideRightMargin'#0#0#0#7'TButton'#12'MoveUpButton'#22'AnchorSideLeft.Contr'
+  ,'oHideRightMargin'#0#0#0#7'TBitBtn'#12'MoveUpButton'#22'AnchorSideLeft.Contr'
   +'ol'#7#12'PathGroupBox'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'A'
-  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#3#140
-  +#0#5'Width'#2'k'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#12'MoveUpButton'#7'OnClick'#7#17'MoveUpB'
-  +'uttonClick'#8'TabOrder'#2#1#0#0#7'TButton'#14'MoveDownButton'#22'AnchorSide'
-  +'Left.Control'#7#12'MoveUpButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9
-  ,'asrBottom'#4'Left'#2'w'#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'|'#7'Ancho'
-  +'rs'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#14'MoveDownButton'#7'OnClick'#7#19'MoveDownButtonClick'#8'TabOrd'
-  +'er'#2#2#0#0#7'TButton'#12'BrowseButton'#22'AnchorSideLeft.Control'#7#14'Mov'
-  +'eDownButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Con'
-  +'trol'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +#249#0#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'e'#7'Anchors'#11#6'akLeft'#8
-  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Brow'
-  +'seButton'#7'OnClick'#7#17'BrowseButtonClick'#8'TabOrder'#2#3#0#0#7'TButton'
-  +#12'DeleteButton'#22'AnchorSideLeft.Control'#7#12'BrowseButton'#19'AnchorSid'
-  +'eLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'd'#1#6'Height'#2#29#3'To'
-  +'p'#3#140#0#5'Width'#2'a'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'DeleteButton'#7'OnClick'#7#17
+  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#147
+  +#0#5'Width'#2'a'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'Bord'
+  +'erSpacing.Around'#2#6#7'Caption'#6#12'MoveUpButton'#9'NumGlyphs'#2#0#7'OnCl'
+  +'ick'#7#17'MoveUpButtonClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#14'MoveDownButt'
+  +'on'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12
+  +'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'w'#6'Heigh'
+  +'t'#2#23#3'Top'#3#147#0#5'Width'#2'o'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
+  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'MoveDownButton'#9
+  +'NumGlyphs'#2#0#7'OnClick'#7#19'MoveDownButtonClick'#8'TabOrder'#2#2#0#0#7'T'
+  +'BitBtn'#12'BrowseButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSi'
+  +'deBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBotto'
+  +'m'#4'Left'#3#249#0#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2']'#7'Anchors'#11
+  +#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Captio'
+  +'n'#6#12'BrowseButton'#9'NumGlyphs'#2#0#7'OnClick'#7#17'BrowseButtonClick'#8
+  +'TabOrder'#2#3#0#0#7'TBitBtn'#12'DeleteButton'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBott'
+  +'om.Side'#7#9'asrBottom'#4'Left'#3'd'#1#6'Height'#2#23#3'Top'#3#147#0#5'Widt'
+  +'h'#2'Y'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#12'DeleteButton'#9'NumGlyphs'#2#0#7'OnClick'#7#17
   +'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#16'TemplateGroupBox'
   +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#12'PathGr'
   +'oupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
   +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
-  +'l'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#152#0#3'Top'#3#206#0#5'Width'#3#232
+  +'l'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#3#206#0#5'Width'#3#232
   +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'#12'ClientHeight'#3#133#0#11
+  +'g.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'#12'ClientHeight'#3#141#0#11
   +'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListBox'#16'TemplatesListBox'#22
   +'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#21'AnchorSideTop.Control'#7
   +#16'TemplateGroupBox'#23'AnchorSideRight.Control'#7#16'TemplateGroupBox'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'AddT'
-  +'emplateButton'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3#216#1#7'Anc'
-  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Aroun'
-  +'d'#2#6#11'MultiSelect'#9#10'OnDblClick'#7#24'TemplatesListBoxDblClick'#8'Ta'
-  +'bOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#17'AddTemplateButton'#22'Ancho'
-  +'rSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSideBottom.Control'#7#16
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'^'#3'Top'#2#6#5
+  +'Width'#3#216#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20
+  +'BorderSpacing.Around'#2#6#11'MultiSelect'#9#10'OnDblClick'#7#24'TemplatesLi'
+  +'stBoxDblClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#17'AddTemplateButton'#22'Anch'
+  +'orSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSideBottom.Control'#7#16
   +'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
-  +'ight'#2#29#3'Top'#2'b'#5'Width'#3#138#0#7'Anchors'#11#6'akLeft'#8'akBottom'
-  +#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'AddTemplateBut'
-  +'ton'#7'OnClick'#7#22'AddTemplateButtonClick'#8'TabOrder'#2#1#0#0#0#7'TBitBt'
-  +'n'#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'CancelBitBtn'#24'AnchorSide'
-  +'Bottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
-  +#3'4'#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'Anchors'#11#7'akRight'#8
-  +'akBottom'#0#20'BorderSpacing.Around'#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#8'TabOrde'
-  +'r'#2#2#0#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSideRight.Control'#7#5'Owne'
-  +'r'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5
-  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#148#1#6'Height'#2
-  +#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'Bo'
-  +'rderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#12#195#142#195#178#195#172
-  +#195#165#195#173#195#160#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyp'
-  +'hs'#2#0#8'TabOrder'#2#3#0#0#22'TSelectDirectoryDialog'#12'BrowseDialog'#7'O'
-  +'ptions'#11#15'ofFileMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'
-  +#3#184#1#3'top'#3#168#0#0#0#0
+  +'ight'#2#23#3'Top'#2'p'#5'Width'#2'y'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
+  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'AddTemplateButton'
+  +#9'NumGlyphs'#2#0#7'OnClick'#7#22'AddTemplateButtonClick'#8'TabOrder'#2#1#0#0
+  +#0#7'TBitBtn'#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'CancelBitBtn'#24
+  +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto'
+  +'m'#4'Left'#3#144#1#6'Height'#2#23#3'Top'#3's'#1#5'Width'#2'$'#7'Anchors'#11
+  +#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#5'&'#195#142#195#138#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2
+  +#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelBitBtn'#23'Ancho'
+  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'A'
+  +'nchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'
+  +#4'Left'#3#186#1#6'Height'#2#23#3'Top'#3's'#1#5'Width'#2'4'#7'Anchors'#11#7
+  +'akRight'#8'akBottom'#0#8'AutoSize'#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#8'TabOrder'#2#3#0#0#22'TSe'
+  +'lectDirectoryDialog'#12'BrowseDialog'#7'Options'#11#15'ofFileMustExist'#14
+  +'ofEnableSizing'#12'ofViewDetail'#0#4'left'#3#184#1#3'top'#3#168#0#0#0#0
 ]);
diff --git a/ide/patheditordlg.pas b/ide/patheditordlg.pas
index f82feb7de6..67ca2334d7 100644
--- a/ide/patheditordlg.pas
+++ b/ide/patheditordlg.pas
@@ -36,15 +36,15 @@ type
   { TPathEditorDialog }
 
   TPathEditorDialog = class(TForm)
-    AddTemplateButton: TButton;
+    AddTemplateButton: TBitBtn;
+    BrowseButton: TBitBtn;
+    DeleteButton: TBitBtn;
+    MoveDownButton: TBitBtn;
+    MoveUpButton: TBitBtn;
     OKBitBtn: TBitBtn;
     CancelBitBtn: TBitBtn;
     TemplatesListBox: TListBox;
     TemplateGroupBox: TGroupBox;
-    MoveUpButton: TButton;
-    MoveDownButton: TButton;
-    BrowseButton: TButton;
-    DeleteButton: TButton;
     PathGroupBox: TGroupBox;
     PathEdit: TSynEdit;
     BrowseDialog: TSelectDirectoryDialog;
@@ -154,6 +154,12 @@ begin
 
   OKBitBtn.Caption:=lisOkBtn;
   CancelBitBtn.Caption:=dlgCancel;
+  OKBitBtn.LoadGlyphFromLazarusResource('btn_ok');
+  CancelBitBtn.LoadGlyphFromLazarusResource('btn_cancel');
+  AddTemplateButton.LoadGlyphFromLazarusResource('add');
+  MoveUpButton.LoadGlyphFromLazarusResource('arrow_up');
+  MoveDownButton.LoadGlyphFromLazarusResource('arrow_down');
+  DeleteButton.LoadGlyphFromLazarusResource('delete');
 
   PathEdit.Font.BeginUpdate;
   PathEdit.Font.Name:=SynDefaultFontName;
diff --git a/ide/progressdlg.lfm b/ide/progressdlg.lfm
index 359d4e9a81..1d79755054 100644
--- a/ide/progressdlg.lfm
+++ b/ide/progressdlg.lfm
@@ -1,47 +1,45 @@
 object IDEProgressDialog: TIDEProgressDialog
-  ActiveControl = AbortButton
+  Left = 286
+  Height = 132
+  Top = 202
+  Width = 400
   Caption = 'IDEProgressDialog'
   ClientHeight = 132
   ClientWidth = 400
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  PixelsPerInch = 112
+  ParentFont = False
   Position = poScreenCenter
-  HorzScrollBar.Page = 399
-  VertScrollBar.Page = 131
-  Left = 286
-  Height = 132
-  Top = 202
-  Width = 400
+  LCLVersion = '0.9.25'
   object DescriptionLabel: TLabel
-    Anchors = [akTop]
-    AutoSize = False
-    Caption = 'DescriptionLabel'
-    Color = clNone
-    ParentColor = False
-    WordWrap = True
     Left = 152
     Height = 13
     Top = 16
     Width = 95
-  end
-  object AbortButton: TButton
-    Anchors = [akBottom]
-    
-    Caption = 'AbortButton'
-    ModalResult = 3
-    TabOrder = 0
-    Left = 130
-    Height = 33
-    Top = 92
-    Width = 139
+    Anchors = [akTop]
+    AutoSize = False
+    Caption = 'DescriptionLabel'
+    ParentColor = False
+    WordWrap = True
   end
   object ProgressBar: TProgressBar
-    Anchors = [akTop]
-    Max = 100
     Left = 15
     Height = 20
     Top = 64
     Width = 370
+    Anchors = [akTop]
+    Max = 100
+    TabOrder = 0
+  end
+  object AbortButton: TBitBtn
+    Left = 130
+    Height = 33
+    Top = 92
+    Width = 139
+    Anchors = [akBottom]
+    Caption = 'AbortButton'
+    ModalResult = 3
+    NumGlyphs = 0
+    TabOrder = 1
   end
 end
diff --git a/ide/progressdlg.lrs b/ide/progressdlg.lrs
index 7dd83e73ea..a84d5fbe03 100644
--- a/ide/progressdlg.lrs
+++ b/ide/progressdlg.lrs
@@ -1,15 +1,16 @@
+{ Ceci est un fichier ressource généré automatiquement par Lazarus }
+
 LazarusResources.Add('TIDEProgressDialog','FORMDATA',[
-  'TPF0'#18'TIDEProgressDialog'#17'IDEProgressDialog'#13'ActiveControl'#7#11'Ab'
-  +'ortButton'#7'Caption'#6#17'IDEProgressDialog'#12'ClientHeight'#3#132#0#11'C'
-  +'lientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDest'
-  +'roy'#13'PixelsPerInch'#2'p'#8'Position'#7#14'poScreenCenter'#18'HorzScrollB'
-  +'ar.Page'#3#143#1#18'VertScrollBar.Page'#3#131#0#4'Left'#3#30#1#6'Height'#3
-  +#132#0#3'Top'#3#202#0#5'Width'#3#144#1#0#6'TLabel'#16'DescriptionLabel'#7'An'
-  +'chors'#11#5'akTop'#0#8'AutoSize'#8#7'Caption'#6#16'DescriptionLabel'#5'Colo'
-  +'r'#7#6'clNone'#11'ParentColor'#8#8'WordWrap'#9#4'Left'#3#152#0#6'Height'#2
-  +#13#3'Top'#2#16#5'Width'#2'_'#0#0#7'TButton'#11'AbortButton'#7'Anchors'#11#8
-  +'akBottom'#0#7'Caption'#6#11'AbortButton'#11'ModalResult'#2#3#8'TabOrder'#2#0
-  +#4'Left'#3#130#0#6'Height'#2'!'#3'Top'#2'\'#5'Width'#3#139#0#0#0#12'TProgres'
-  +'sBar'#11'ProgressBar'#7'Anchors'#11#5'akTop'#0#3'Max'#2'd'#4'Left'#2#15#6'H'
-  +'eight'#2#20#3'Top'#2'@'#5'Width'#3'r'#1#0#0#0
+  'TPF0'#18'TIDEProgressDialog'#17'IDEProgressDialog'#4'Left'#3#30#1#6'Height'#3
+  +#132#0#3'Top'#3#202#0#5'Width'#3#144#1#7'Caption'#6#17'IDEProgressDialog'#12
+  +'ClientHeight'#3#132#0#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#9
+  +'OnDestroy'#7#11'FormDestroy'#10'ParentFont'#8#8'Position'#7#14'poScreenCent'
+  +'er'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#16'DescriptionLabel'#4'Left'#3
+  +#152#0#6'Height'#2#13#3'Top'#2#16#5'Width'#2'_'#7'Anchors'#11#5'akTop'#0#8'A'
+  +'utoSize'#8#7'Caption'#6#16'DescriptionLabel'#11'ParentColor'#8#8'WordWrap'#9
+  +#0#0#12'TProgressBar'#11'ProgressBar'#4'Left'#2#15#6'Height'#2#20#3'Top'#2'@'
+  +#5'Width'#3'r'#1#7'Anchors'#11#5'akTop'#0#3'Max'#2'd'#8'TabOrder'#2#0#0#0#7
+  +'TBitBtn'#11'AbortButton'#4'Left'#3#130#0#6'Height'#2'!'#3'Top'#2'\'#5'Width'
+  +#3#139#0#7'Anchors'#11#8'akBottom'#0#7'Caption'#6#11'AbortButton'#11'ModalRe'
+  +'sult'#2#3#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0
 ]);
diff --git a/ide/progressdlg.pas b/ide/progressdlg.pas
index 3c9d3f16f0..c78b5bc327 100644
--- a/ide/progressdlg.pas
+++ b/ide/progressdlg.pas
@@ -38,7 +38,7 @@ type
   { TIDEProgressDialog }
 
   TIDEProgressDialog = class(TForm)
-    AbortButton: TButton;
+    AbortButton: TBitBtn;
     DescriptionLabel: TLabel;
     ProgressBar: TProgressBar;
     procedure FormCreate(Sender: TObject);
@@ -130,7 +130,8 @@ begin
   Caption:=lisPDProgress;
   DescriptionLabel.Caption:='...';
   AbortButton.Caption:=lisPDAbort;
-  
+  AbortButton.LoadGlyphFromLazarusResource('btn_cancel');
+
   Application.AddOnIdleHandler(@ApplicationIdle);
 end;
 
diff --git a/ide/projectopts.lfm b/ide/projectopts.lfm
index 90b49a24ad..1861f8e470 100644
--- a/ide/projectopts.lfm
+++ b/ide/projectopts.lfm
@@ -16,11 +16,11 @@ object ProjectOptionsDialog: TProjectOptionsDialog
   LCLVersion = '0.9.25'
   object Notebook: TNotebook
     AnchorSideBottom.Control = PODBtnPanel
-    Height = 394
+    Height = 395
     Width = 473
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 1
+    PageIndex = 5
     TabOrder = 0
     object ApplicationPage: TPage
       Caption = 'ApplicationPage'
@@ -64,7 +64,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           Left = 6
           Height = 24
           Top = 52
-          Width = 437
+          Width = 429
           Anchors = [akTop, akLeft, akRight]
           AutoSize = False
           Caption = 'UseAppBundleCheckBox'
@@ -74,19 +74,20 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           Left = 6
           Height = 24
           Top = 118
-          Width = 437
+          Width = 429
           Anchors = [akTop, akLeft, akRight]
           AutoSize = False
           Caption = 'UseXPManifestCheckBox'
           TabOrder = 2
         end
-        object CreateAppBundleButton: TButton
+        object CreateAppBundleButton: TBitBtn
           Left = 6
           Height = 23
           Top = 82
           Width = 142
           AutoSize = True
           Caption = 'CreateAppBundleButton'
+          NumGlyphs = 0
           OnClick = CreateAppBundleButtonClick
           TabOrder = 3
         end
@@ -325,100 +326,99 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     end
     object LazDocPage: TPage
       Caption = 'LazDocPage'
-      ClientWidth = 469
-      ClientHeight = 355
+      ClientWidth = 465
+      ClientHeight = 368
       object LazDocPathsGroupBox: TGroupBox
         Left = 6
-        Height = 203
+        Height = 167
         Top = 6
-        Width = 457
+        Width = 453
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'LazDocPathsGroupBox'
-        ClientHeight = 203
-        ClientWidth = 457
+        ClientHeight = 167
+        ClientWidth = 453
         TabOrder = 0
         object LazDocListBox: TListBox
           AnchorSideRight.Side = asrBottom
           Left = 6
           Height = 108
           Top = 6
-          Width = 441
+          Width = 437
           Align = alTop
           BorderSpacing.Around = 6
           TabOrder = 0
-          TopIndex = -1
-        end
-        object LazDocAddPathButton: TButton
-          AnchorSideLeft.Control = LazDocPathsGroupBox
-          AnchorSideTop.Control = LazDocListBox
-          AnchorSideTop.Side = asrBottom
-          Left = 6
-          Height = 29
-          Top = 120
-          Width = 155
-          AutoSize = True
-          BorderSpacing.Around = 6
-          Caption = 'LazDocAddPathButton'
-          OnClick = LazDocAddPathButtonClick
-          TabOrder = 1
-        end
-        object LazDocDeletePathButton: TButton
-          AnchorSideLeft.Control = LazDocAddPathButton
-          AnchorSideLeft.Side = asrBottom
-          AnchorSideTop.Control = LazDocListBox
-          AnchorSideTop.Side = asrBottom
-          Left = 167
-          Height = 29
-          Top = 120
-          Width = 172
-          AutoSize = True
-          BorderSpacing.Around = 6
-          Caption = 'LazDocDeletePathButton'
-          OnClick = LazDocDeletePathButtonClick
-          TabOrder = 2
         end
         object LazDocPathEdit: TEdit
           AnchorSideLeft.Control = LazDocPathsGroupBox
-          AnchorSideTop.Control = LazDocAddPathButton
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = LazDocBrowseButton
           Left = 6
           Height = 23
-          Top = 155
-          Width = 411
+          Top = 6
+          Width = 407
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 6
-          TabOrder = 3
+          TabOrder = 1
           Text = 'LazDocPathEdit'
         end
         object LazDocBrowseButton: TButton
-          AnchorSideTop.Control = LazDocAddPathButton
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = LazDocPathsGroupBox
           AnchorSideRight.Side = asrBottom
-          Left = 423
+          Left = 419
           Height = 23
-          Top = 155
+          Top = 6
           Width = 24
           Anchors = [akTop, akRight]
           BorderSpacing.Around = 6
           Caption = '...'
           OnClick = LazDocBrowseButtonClick
+          TabOrder = 2
+        end
+        object LazDocAddPathButton: TBitBtn
+          AnchorSideLeft.Control = LazDocPathsGroupBox
+          AnchorSideTop.Control = LazDocListBox
+          AnchorSideTop.Side = asrBottom
+          Left = 6
+          Height = 23
+          Top = 120
+          Width = 133
+          AutoSize = True
+          BorderSpacing.Around = 6
+          Caption = 'LazDocAddPathButton'
+          NumGlyphs = 0
+          OnClick = LazDocAddPathButtonClick
+          TabOrder = 3
+        end
+        object LazDocDeletePathButton: TBitBtn
+          AnchorSideLeft.Control = LazDocAddPathButton
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = LazDocListBox
+          AnchorSideTop.Side = asrBottom
+          Left = 145
+          Height = 23
+          Top = 120
+          Width = 145
+          AutoSize = True
+          BorderSpacing.Around = 6
+          Caption = 'LazDocDeletePathButton'
+          NumGlyphs = 0
+          OnClick = LazDocDeletePathButtonClick
           TabOrder = 4
         end
       end
     end
     object SavePage: TPage
       Caption = 'SavePage'
-      ClientWidth = 469
-      ClientHeight = 355
+      ClientWidth = 465
+      ClientHeight = 368
       object SaveClosedUnitInfoCheckBox: TCheckBox
         Left = 6
-        Height = 22
+        Height = 19
         Top = 6
-        Width = 457
+        Width = 453
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'SaveClosedUnitInfoCheckBox'
@@ -428,9 +428,9 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AnchorSideTop.Control = SaveClosedUnitInfoCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 22
-        Top = 34
-        Width = 457
+        Height = 19
+        Top = 31
+        Width = 453
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'SaveOnlyProjectUnitInfoCheckBox'
@@ -443,8 +443,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AnchorSideRight.Side = asrBottom
         Left = 6
         Height = 117
-        Top = 68
-        Width = 457
+        Top = 62
+        Width = 453
         Align = alTop
         AutoFill = True
         BorderSpacing.Top = 6
@@ -464,7 +464,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     object VersionInfoPage: TPage
       Caption = 'VersionInfoPage'
       ClientWidth = 465
-      ClientHeight = 368
+      ClientHeight = 369
       object VersionInfoGroupBox: TGroupBox
         AnchorSideLeft.Control = LanguageSettingsGroupBox
         AnchorSideTop.Side = asrBottom
@@ -477,8 +477,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Version Numbering'
-        ClientHeight = 101
-        ClientWidth = 453
+        ClientHeight = 83
+        ClientWidth = 449
         TabOrder = 0
         object VersionLabel: TLabel
           AnchorSideLeft.Control = VersionInfoGroupBox
@@ -607,8 +607,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Language Options'
-        ClientHeight = 71
-        ClientWidth = 453
+        ClientHeight = 53
+        ClientWidth = 449
         TabOrder = 2
         object LanguageSelectionLabel: TLabel
           AnchorSideLeft.Control = LanguageSettingsGroupBox
@@ -675,8 +675,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Other Info'
-        ClientHeight = 101
-        ClientWidth = 453
+        ClientHeight = 83
+        ClientWidth = 449
         TabOrder = 3
         object DescriptionEdit: TEdit
           AnchorSideLeft.Control = PanelOtherLabels
@@ -706,23 +706,6 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           BorderSpacing.Right = 6
           TabOrder = 1
         end
-        object AdditionalInfoButton: TButton
-          AnchorSideTop.Control = CopyrightEdit
-          AnchorSideTop.Side = asrBottom
-          AnchorSideRight.Control = OtherInfoGroupBox
-          AnchorSideRight.Side = asrBottom
-          AnchorSideBottom.Side = asrBottom
-          Left = 347
-          Height = 23
-          Top = 54
-          Width = 96
-          Anchors = [akTop, akRight]
-          AutoSize = True
-          BorderSpacing.Around = 6
-          Caption = 'Additional Info'
-          OnClick = AdditionalInfoButtonClick
-          TabOrder = 2
-        end
         object PanelOtherLabels: TPanel
           Height = 40
           Width = 64
@@ -730,7 +713,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           BevelOuter = bvNone
           ClientHeight = 40
           ClientWidth = 64
-          TabOrder = 3
+          TabOrder = 2
           object CopyrightLabel: TLabel
             AnchorSideLeft.Control = DescriptionLabel
             AnchorSideTop.Side = asrCenter
@@ -751,12 +734,30 @@ object ProjectOptionsDialog: TProjectOptionsDialog
             ParentColor = False
           end
         end
+        object AdditionalInfoButton: TBitBtn
+          AnchorSideTop.Control = CopyrightEdit
+          AnchorSideTop.Side = asrBottom
+          AnchorSideRight.Control = OtherInfoGroupBox
+          AnchorSideRight.Side = asrBottom
+          AnchorSideBottom.Side = asrBottom
+          Left = 347
+          Height = 23
+          Top = 54
+          Width = 96
+          Anchors = [akTop, akRight]
+          AutoSize = True
+          BorderSpacing.Around = 6
+          Caption = 'Additional Info'
+          NumGlyphs = 0
+          OnClick = AdditionalInfoButtonClick
+          TabOrder = 3
+        end
       end
     end
     object i18nPage: TPage
       Caption = 'i18n'
-      ClientWidth = 469
-      ClientHeight = 355
+      ClientWidth = 465
+      ClientHeight = 369
       object I18NGroupBox: TGroupBox
         AnchorSideLeft.Control = OtherInfoGroupBox
         AnchorSideTop.Control = VersionInfoGroupBox
@@ -764,21 +765,21 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AnchorSideRight.Control = OtherInfoGroupBox
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 80
-        Top = 34
-        Width = 457
+        Height = 73
+        Top = 31
+        Width = 453
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'i18n Options'
-        ClientHeight = 80
-        ClientWidth = 457
+        ClientHeight = 73
+        ClientWidth = 453
         TabOrder = 0
         object PoOutDirLabel: TLabel
           Left = 6
-          Height = 20
+          Height = 14
           Top = 6
-          Width = 132
+          Width = 103
           BorderSpacing.Around = 6
           Caption = 'PO Output Directory:'
           ParentColor = False
@@ -790,8 +791,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           AnchorSideRight.Control = POOutDirButton
           Left = 6
           Height = 23
-          Top = 32
-          Width = 411
+          Top = 26
+          Width = 407
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -803,9 +804,9 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           AnchorSideRight.Control = I18NGroupBox
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Side = asrBottom
-          Left = 423
+          Left = 419
           Height = 23
-          Top = 32
+          Top = 26
           Width = 24
           Anchors = [akTop, akRight]
           BorderSpacing.Around = 6
@@ -816,9 +817,9 @@ object ProjectOptionsDialog: TProjectOptionsDialog
       end
       object EnableI18NCheckBox: TCheckBox
         Left = 6
-        Height = 22
+        Height = 19
         Top = 6
-        Width = 457
+        Width = 453
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Enable i18n'
@@ -828,19 +829,19 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     end
   end
   object PODBtnPanel: TPanel
-    Height = 38
-    Top = 394
+    Height = 37
+    Top = 395
     Width = 473
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 38
+    ClientHeight = 37
     ClientWidth = 473
     TabOrder = 1
     object OKButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 309
-      Height = 26
+      Left = 311
+      Height = 25
       Top = 6
       Width = 75
       Align = alRight
@@ -858,10 +859,10 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     object CancelButton: TBitBtn
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Side = asrBottom
-      Left = 390
-      Height = 26
+      Left = 392
+      Height = 25
       Top = 6
-      Width = 77
+      Width = 75
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
@@ -877,7 +878,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     object HelpButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 26
+      Height = 25
       Top = 6
       Width = 75
       Align = alLeft
diff --git a/ide/projectopts.lrs b/ide/projectopts.lrs
index b2629b6e9c..1d299d3216 100644
--- a/ide/projectopts.lrs
+++ b/ide/projectopts.lrs
@@ -8,8 +8,8 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'ght'#3#144#1#20'Constraints.MinWidth'#3#144#1#7'OnClose'#7#19'ProjectOption'
   +'sClose'#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6
   +'0.9.25'#0#9'TNotebook'#8'Notebook'#24'AnchorSideBottom.Control'#7#11'PODBtn'
-  +'Panel'#6'Height'#3#138#1#5'Width'#3#217#1#5'Align'#7#5'alTop'#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#1#8'TabOrder'#2#0
+  +'Panel'#6'Height'#3#139#1#5'Width'#3#217#1#5'Align'#7#5'alTop'#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#5#8'TabOrder'#2#0
   +#0#5'TPage'#15'ApplicationPage'#7'Caption'#6#15'ApplicationPage'#11'ClientWi'
   +'dth'#3#209#1#12'ClientHeight'#3'p'#1#0#9'TGroupBox'#19'AppSettingsGroupBox'
   +#4'Left'#2#6#6'Height'#3#166#0#3'Top'#2#6#5'Width'#3#197#1#5'Align'#7#5'alTo'
@@ -21,282 +21,281 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'TitleEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#3#181#1#5'Align'
   +#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrde'
   +'r'#2#0#4'Text'#6#9'TitleEdit'#0#0#9'TCheckBox'#20'UseAppBundleCheckBox'#4'L'
-  +'eft'#2#6#6'Height'#2#24#3'Top'#2'4'#5'Width'#3#181#1#7'Anchors'#11#5'akTop'
+  +'eft'#2#6#6'Height'#2#24#3'Top'#2'4'#5'Width'#3#173#1#7'Anchors'#11#5'akTop'
   +#6'akLeft'#7'akRight'#0#8'AutoSize'#8#7'Caption'#6#20'UseAppBundleCheckBox'#8
   +'TabOrder'#2#1#0#0#9'TCheckBox'#21'UseXPManifestCheckBox'#4'Left'#2#6#6'Heig'
-  +'ht'#2#24#3'Top'#2'v'#5'Width'#3#181#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'ht'#2#24#3'Top'#2'v'#5'Width'#3#173#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
   +'Right'#0#8'AutoSize'#8#7'Caption'#6#21'UseXPManifestCheckBox'#8'TabOrder'#2
-  +#2#0#0#7'TButton'#21'CreateAppBundleButton'#4'Left'#2#6#6'Height'#2#23#3'Top'
-  +#2'R'#5'Width'#3#142#0#8'AutoSize'#9#7'Caption'#6#21'CreateAppBundleButton'#7
-  +'OnClick'#7#26'CreateAppBundleButtonClick'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'
-  +#22'OutputSettingsGroupBox'#4'Left'#2#6#6'Height'#2'C'#3'Top'#3#178#0#5'Widt'
-  +'h'#3#197#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#22'OutputSettingsGroupBox'#12'ClientHeight'#2'C'#11'ClientWidth'
-  +#3#197#1#8'TabOrder'#2#1#0#6'TLabel'#15'TargetFileLabel'#4'Left'#2#6#6'Heigh'
-  +'t'#2#14#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#18'BorderSpacing.Le'
-  +'ft'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6
-  +#15'TargetFileLabel'#11'ParentColor'#8#0#0#5'TEdit'#14'TargetFileEdit'#4'Lef'
-  +'t'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#3#181#1#5'Align'#7#5'alTop'#18'B'
-  +'orderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'
-  +#2#6#8'TabOrder'#2#0#4'Text'#6#14'TargetFileEdit'#0#0#0#0#5'TPage'#9'FormsPa'
-  +'ge'#7'Caption'#6#9'FormsPage'#11'ClientWidth'#3#209#1#12'ClientHeight'#3'p'
-  +#1#14'OnContextPopup'#7#21'FormsPageContextPopup'#8'OnResize'#7#15'FormsPage'
-  +'Resize'#0#6'TLabel'#21'FormsAutoCreatedLabel'#4'Left'#2'$'#6'Height'#2#14#3
-  +'Top'#2#10#5'Width'#2'u'#7'Caption'#6#21'FormsAutoCreatedLabel'#11'ParentCol'
-  +'or'#8#0#0#6'TLabel'#20'FormsAvailFormsLabel'#22'AnchorSideLeft.Control'#7#22
-  +'FormsAvailFormsListBox'#4'Left'#3#10#1#6'Height'#2#14#3'Top'#2#10#5'Width'#2
-  +'k'#7'Caption'#6#20'FormsAvailFormsLabel'#11'ParentColor'#8#0#0#12'TSpeedBut'
-  +'ton'#29'FormsMoveAutoCreatedFormUpBtn'#22'AnchorSideLeft.Control'#7#9'Forms'
-  +'Page'#21'AnchorSideTop.Control'#7#23'FormsAutoCreatedListBox'#4'Left'#2#6#6
-  +'Height'#2#24#3'Top'#2'$'#5'Width'#2#24#20'BorderSpacing.Around'#2#6#5'Color'
-  +#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7'"FormsMoveAutoCreatedFormUpBtn'
-  +'Click'#0#0#12'TSpeedButton FormsMoveAutoCreatedFormsDownBtn'#22'AnchorSideL'
-  +'eft.Control'#7#29'FormsMoveAutoCreatedFormUpBtn'#21'AnchorSideTop.Control'#7
-  +#29'FormsMoveAutoCreatedFormUpBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
-  +'eft'#2#6#6'Height'#2#24#3'Top'#2'B'#5'Width'#2#24#5'Color'#7#9'clBtnFace'#9
-  +'NumGlyphs'#2#0#7'OnClick'#7'$FormsMoveAutoCreatedFormDownBtnClick'#0#0#12'T'
-  +'SpeedButton"FormsRemoveFromAutoCreatedFormsBtn'#22'AnchorSideLeft.Control'#7
-  +#23'FormsAutoCreatedListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
-  +'rSideTop.Control'#7#23'FormsAutoCreatedListBox'#4'Left'#3#236#0#6'Height'#2
-  +#24#3'Top'#2'$'#5'Width'#2#24#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBt'
-  +'nFace'#9'NumGlyphs'#2#0#7'OnClick'#7'''FormsRemoveFromAutoCreatedFormsBtnCl'
-  +'ick'#0#0#12'TSpeedButton'#29'FormsAddToAutoCreatedFormsBtn'#22'AnchorSideLe'
-  +'ft.Control'#7#23'FormsAutoCreatedListBox'#19'AnchorSideLeft.Side'#7#9'asrBo'
-  +'ttom'#21'AnchorSideTop.Control'#7'"FormsRemoveFromAutoCreatedFormsBtn'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#24#3'Top'#2'B'
-  +#5'Width'#2#24#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7'"FormsA'
-  ,'ddToAutoCreatedFormsBtnClick'#0#0#8'TListBox'#23'FormsAutoCreatedListBox'#22
-  +'AnchorSideLeft.Control'#7' FormsMoveAutoCreatedFormsDownBtn'#19'AnchorSideL'
-  +'eft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21'FormsAutoCreatedLab'
-  +'el'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#31
-  +'FormsAutoCreateNewFormsCheckBox'#4'Left'#2'$'#6'Height'#3'3'#1#3'Top'#2#30#5
-  +'Width'#3#194#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpac'
-  +'ing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0#0#0#8'TListBox'#22'FormsA'
-  +'vailFormsListBox'#22'AnchorSideLeft.Control'#7#29'FormsAddToAutoCreatedForm'
-  +'sBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#20
-  +'FormsAvailFormsLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRi'
-  +'ght.Control'#7#9'FormsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anch'
-  +'orSideBottom.Control'#7#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#3#10#1#6
-  +'Height'#3'3'#1#3'Top'#2#30#5'Width'#3#193#0#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'T'
-  +'abOrder'#2#1#0#0#9'TCheckBox'#31'FormsAutoCreateNewFormsCheckBox'#22'Anchor'
-  +'SideLeft.Control'#7#29'FormsAddToAutoCreatedFormsBtn'#21'AnchorSideTop.Cont'
-  +'rol'#7#23'FormsAutoCreatedListBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#3'W'#1
-  +#5'Width'#3#197#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Capt'
-  +'ion'#6#31'FormsAutoCreateNewFormsCheckBox'#8'TabOrder'#2#2#0#0#0#5'TPage'#8
-  +'MiscPage'#7'Caption'#6#8'MiscPage'#11'ClientWidth'#3#209#1#12'ClientHeight'
-  +#3'p'#1#0#9'TCheckBox)MainUnitHasUsesSectionForAllUnitsCheckBox'#21'AnchorSi'
-  +'deTop.Control'#7#30'MainUnitIsPascalSourceCheckBox'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#31#5'Width'#3#197#1#5'Alig'
-  +'n'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6')MainUnitHasUsesSec'
-  +'tionForAllUnitsCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox''MainUnitHasCreate'
-  +'FormStatementsCheckBox'#21'AnchorSideTop.Control'#7')MainUnitHasUsesSection'
-  +'ForAllUnitsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
-  +'ight'#2#19#3'Top'#2'8'#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6'''MainUnitHasCreateFormStatementsCheckBox'#8'Tab'
-  +'Order'#2#1#0#0#9'TCheckBox'#30'MainUnitIsPascalSourceCheckBox'#4'Left'#2#6#6
-  +'Height'#2#19#3'Top'#2#6#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#30'MainUnitIsPascalSourceCheckBox'#8'TabOrder'#2
-  +#2#0#0#9'TCheckBox!MainUnitHasTitleStatementCheckBox'#21'AnchorSideTop.Contr'
-  +'ol'#7'''MainUnitHasCreateFormStatementsCheckBox'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'Q'#5'Width'#3#197#1#5'Align'
-  +#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'!MainUnitHasTitleState'
-  +'mentCheckBox'#8'TabOrder'#2#5#0#0#9'TCheckBox'#16'RunnableCheckBox'#21'Anch'
-  +'orSideTop.Control'#7'!MainUnitHasTitleStatementCheckBox'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'p'#5'Width'#3#197#1
-  +#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#16'RunnableCheckBox'#8'TabOrder'#2#3#0#0#9'TCheckBox'#19'AlwaysB'
-  +'uildCheckBox'#21'AnchorSideTop.Control'#7#16'RunnableCheckBox'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#137#0#5'Width'
-  +#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Al'
-  +'waysBuildCheckBox'#8'TabOrder'#2#4#0#0#0#5'TPage'#10'LazDocPage'#7'Caption'
-  +#6#10'LazDocPage'#11'ClientWidth'#3#213#1#12'ClientHeight'#3'c'#1#0#9'TGroup'
-  +'Box'#19'LazDocPathsGroupBox'#4'Left'#2#6#6'Height'#3#203#0#3'Top'#2#6#5'Wid'
-  +'th'#3#201#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#19'LazDocPathsGroupBox'#12'ClientHeight'#3#203#0#11'ClientWidth'
-  +#3#201#1#8'TabOrder'#2#0#0#8'TListBox'#13'LazDocListBox'#20'AnchorSideRight.'
-  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'l'#3'Top'#2#6#5'Width'#3#185#1
-  +#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#8'TopIndex'
-  +#2#255#0#0#7'TButton'#19'LazDocAddPathButton'#22'AnchorSideLeft.Control'#7#19
-  +'LazDocPathsGroupBox'#21'AnchorSideTop.Control'#7#13'LazDocListBox'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'x'#5'Widt'
-  +'h'#3#155#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'LazDo'
-  +'cAddPathButton'#7'OnClick'#7#24'LazDocAddPathButtonClick'#8'TabOrder'#2#1#0
-  +#0#7'TButton'#22'LazDocDeletePathButton'#22'AnchorSideLeft.Control'#7#19'Laz'
-  +'DocAddPathButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.C'
-  +'ontrol'#7#13'LazDocListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
-  +#167#0#6'Height'#2#29#3'Top'#2'x'#5'Width'#3#172#0#8'AutoSize'#9#20'BorderSp'
-  +'acing.Around'#2#6#7'Caption'#6#22'LazDocDeletePathButton'#7'OnClick'#7#27'L'
-  +'azDocDeletePathButtonClick'#8'TabOrder'#2#2#0#0#5'TEdit'#14'LazDocPathEdit'
-  +#22'AnchorSideLeft.Control'#7#19'LazDocPathsGroupBox'#21'AnchorSideTop.Contr'
-  ,'ol'#7#19'LazDocAddPathButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
+  +#2#0#0#7'TBitBtn'#21'CreateAppBundleButton'#4'Left'#2#6#6'Height'#2#23#3'Top'
+  +#2'R'#5'Width'#3#142#0#8'AutoSize'#9#7'Caption'#6#21'CreateAppBundleButton'#9
+  +'NumGlyphs'#2#0#7'OnClick'#7#26'CreateAppBundleButtonClick'#8'TabOrder'#2#3#0
+  +#0#0#9'TGroupBox'#22'OutputSettingsGroupBox'#4'Left'#2#6#6'Height'#2'C'#3'To'
+  +'p'#3#178#0#5'Width'#3#197#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpac'
+  +'ing.Around'#2#6#7'Caption'#6#22'OutputSettingsGroupBox'#12'ClientHeight'#2
+  +'C'#11'ClientWidth'#3#197#1#8'TabOrder'#2#1#0#6'TLabel'#15'TargetFileLabel'#4
+  +'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
+  +#6#7'Caption'#6#15'TargetFileLabel'#11'ParentColor'#8#0#0#5'TEdit'#14'Target'
+  +'FileEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#3#181#1#5'Align'#7
+  +#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSp'
+  +'acing.Bottom'#2#6#8'TabOrder'#2#0#4'Text'#6#14'TargetFileEdit'#0#0#0#0#5'TP'
+  +'age'#9'FormsPage'#7'Caption'#6#9'FormsPage'#11'ClientWidth'#3#209#1#12'Clie'
+  +'ntHeight'#3'p'#1#14'OnContextPopup'#7#21'FormsPageContextPopup'#8'OnResize'
+  +#7#15'FormsPageResize'#0#6'TLabel'#21'FormsAutoCreatedLabel'#4'Left'#2'$'#6
+  +'Height'#2#14#3'Top'#2#10#5'Width'#2'u'#7'Caption'#6#21'FormsAutoCreatedLabe'
+  +'l'#11'ParentColor'#8#0#0#6'TLabel'#20'FormsAvailFormsLabel'#22'AnchorSideLe'
+  +'ft.Control'#7#22'FormsAvailFormsListBox'#4'Left'#3#10#1#6'Height'#2#14#3'To'
+  +'p'#2#10#5'Width'#2'k'#7'Caption'#6#20'FormsAvailFormsLabel'#11'ParentColor'
+  +#8#0#0#12'TSpeedButton'#29'FormsMoveAutoCreatedFormUpBtn'#22'AnchorSideLeft.'
+  +'Control'#7#9'FormsPage'#21'AnchorSideTop.Control'#7#23'FormsAutoCreatedList'
+  +'Box'#4'Left'#2#6#6'Height'#2#24#3'Top'#2'$'#5'Width'#2#24#20'BorderSpacing.'
+  +'Around'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7'"FormsMov'
+  +'eAutoCreatedFormUpBtnClick'#0#0#12'TSpeedButton FormsMoveAutoCreatedFormsDo'
+  +'wnBtn'#22'AnchorSideLeft.Control'#7#29'FormsMoveAutoCreatedFormUpBtn'#21'An'
+  +'chorSideTop.Control'#7#29'FormsMoveAutoCreatedFormUpBtn'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#24#3'Top'#2'B'#5'Width'#2#24#5
+  +'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7'$FormsMoveAutoCreatedFo'
+  +'rmDownBtnClick'#0#0#12'TSpeedButton"FormsRemoveFromAutoCreatedFormsBtn'#22
+  +'AnchorSideLeft.Control'#7#23'FormsAutoCreatedListBox'#19'AnchorSideLeft.Sid'
+  +'e'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'FormsAutoCreatedListBox'#4
+  +'Left'#3#236#0#6'Height'#2#24#3'Top'#2'$'#5'Width'#2#24#20'BorderSpacing.Aro'
+  +'und'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7'''FormsRemov'
+  +'eFromAutoCreatedFormsBtnClick'#0#0#12'TSpeedButton'#29'FormsAddToAutoCreate'
+  +'dFormsBtn'#22'AnchorSideLeft.Control'#7#23'FormsAutoCreatedListBox'#19'Anch'
+  +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7'"FormsRemoveFro'
+  +'mAutoCreatedFormsBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0
+  +#6'Height'#2#24#3'Top'#2'B'#5'Width'#2#24#5'Color'#7#9'clBtnFace'#9'NumGlyph'
+  ,'s'#2#0#7'OnClick'#7'"FormsAddToAutoCreatedFormsBtnClick'#0#0#8'TListBox'#23
+  +'FormsAutoCreatedListBox'#22'AnchorSideLeft.Control'#7' FormsMoveAutoCreated'
+  +'FormsDownBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contr'
+  +'ol'#7#21'FormsAutoCreatedLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'An'
+  +'chorSideBottom.Control'#7#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#2'$'#6
+  +'Height'#3'3'#1#3'Top'#2#30#5'Width'#3#194#0#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0
+  +#0#0#8'TListBox'#22'FormsAvailFormsListBox'#22'AnchorSideLeft.Control'#7#29
+  +'FormsAddToAutoCreatedFormsBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'An'
+  +'chorSideTop.Control'#7#20'FormsAvailFormsLabel'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#9'FormsPage'#20'AnchorSideRight.Si'
+  +'de'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#31'FormsAutoCreateNewForm'
+  +'sCheckBox'#4'Left'#3#10#1#6'Height'#3'3'#1#3'Top'#2#30#5'Width'#3#193#0#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Aro'
+  +'und'#2#6#11'MultiSelect'#9#8'TabOrder'#2#1#0#0#9'TCheckBox'#31'FormsAutoCre'
+  +'ateNewFormsCheckBox'#22'AnchorSideLeft.Control'#7#29'FormsAddToAutoCreatedF'
+  +'ormsBtn'#21'AnchorSideTop.Control'#7#23'FormsAutoCreatedListBox'#4'Left'#2#6
+  +#6'Height'#2#19#3'Top'#3'W'#1#5'Width'#3#197#1#5'Align'#7#8'alBottom'#20'Bor'
+  +'derSpacing.Around'#2#6#7'Caption'#6#31'FormsAutoCreateNewFormsCheckBox'#8'T'
+  +'abOrder'#2#2#0#0#0#5'TPage'#8'MiscPage'#7'Caption'#6#8'MiscPage'#11'ClientW'
+  +'idth'#3#209#1#12'ClientHeight'#3'p'#1#0#9'TCheckBox)MainUnitHasUsesSectionF'
+  +'orAllUnitsCheckBox'#21'AnchorSideTop.Control'#7#30'MainUnitIsPascalSourceCh'
+  +'eckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3
+  +'Top'#2#31#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6')MainUnitHasUsesSectionForAllUnitsCheckBox'#8'TabOrder'#2#0#0#0
+  +#9'TCheckBox''MainUnitHasCreateFormStatementsCheckBox'#21'AnchorSideTop.Cont'
+  +'rol'#7')MainUnitHasUsesSectionForAllUnitsCheckBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'8'#5'Width'#3#197#1#5'Alig'
+  +'n'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'''MainUnitHasCreate'
+  +'FormStatementsCheckBox'#8'TabOrder'#2#1#0#0#9'TCheckBox'#30'MainUnitIsPasca'
+  +'lSourceCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#197#1#5'A'
+  +'lign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#30'MainUnitIsPas'
+  +'calSourceCheckBox'#8'TabOrder'#2#2#0#0#9'TCheckBox!MainUnitHasTitleStatemen'
+  +'tCheckBox'#21'AnchorSideTop.Control'#7'''MainUnitHasCreateFormStatementsChe'
+  +'ckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'T'
+  +'op'#2'Q'#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6'!MainUnitHasTitleStatementCheckBox'#8'TabOrder'#2#5#0#0#9'TCheck'
+  +'Box'#16'RunnableCheckBox'#21'AnchorSideTop.Control'#7'!MainUnitHasTitleStat'
+  +'ementCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#19#3'Top'#2'p'#5'Width'#3#197#1#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2
+  +#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'RunnableCheckBox'#8'TabOrder'
+  +#2#3#0#0#9'TCheckBox'#19'AlwaysBuildCheckBox'#21'AnchorSideTop.Control'#7#16
+  +'RunnableCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heigh'
+  +'t'#2#19#3'Top'#3#137#0#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#19'AlwaysBuildCheckBox'#8'TabOrder'#2#4#0#0#0#5
+  +'TPage'#10'LazDocPage'#7'Caption'#6#10'LazDocPage'#11'ClientWidth'#3#209#1#12
+  +'ClientHeight'#3'p'#1#0#9'TGroupBox'#19'LazDocPathsGroupBox'#4'Left'#2#6#6'H'
+  +'eight'#3#167#0#3'Top'#2#6#5'Width'#3#197#1#5'Align'#7#5'alTop'#8'AutoSize'#9
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'LazDocPathsGroupBox'#12'Client'
+  +'Height'#3#167#0#11'ClientWidth'#3#197#1#8'TabOrder'#2#0#0#8'TListBox'#13'La'
+  +'zDocListBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +'l'#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
+  +#2#6#8'TabOrder'#2#0#0#0#5'TEdit'#14'LazDocPathEdit'#22'AnchorSideLeft.Contr'
+  +'ol'#7#19'LazDocPathsGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
   +'orSideRight.Control'#7#18'LazDocBrowseButton'#4'Left'#2#6#6'Height'#2#23#3
-  +'Top'#3#155#0#5'Width'#3#155#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#3#4'Text'#6#14'LazDocPathEdit'#0
-  +#0#7'TButton'#18'LazDocBrowseButton'#21'AnchorSideTop.Control'#7#19'LazDocAd'
-  +'dPathButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr'
-  +'ol'#7#19'LazDocPathsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3#167#1#6'Height'#2#23#3'Top'#3#155#0#5'Width'#2#24#7'Anchors'#11#5'akTo'
-  +'p'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'...'#7'OnClick'
-  +#7#23'LazDocBrowseButtonClick'#8'TabOrder'#2#4#0#0#0#0#5'TPage'#8'SavePage'#7
-  +'Caption'#6#8'SavePage'#11'ClientWidth'#3#213#1#12'ClientHeight'#3'c'#1#0#9
-  +'TCheckBox'#26'SaveClosedUnitInfoCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'
-  +#2#6#5'Width'#3#201#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#26'SaveClosedUnitInfoCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#31
-  +'SaveOnlyProjectUnitInfoCheckBox'#21'AnchorSideTop.Control'#7#26'SaveClosedU'
-  +'nitInfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2#22#3'Top'#2'"'#5'Width'#3#201#1#5'Align'#7#5'alTop'#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#31'SaveOnlyProjectUnitInfoCheckBox'#8'TabOrder'#2#1#0#0
-  +#11'TRadioGroup'#29'SaveSessionLocationRadioGroup'#21'AnchorSideTop.Control'
-  +#7#31'SaveOnlyProjectUnitInfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#23'AnchorSideRight.Control'#7#8'SavePage'#20'AnchorSideRight.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#6#6'Height'#2'u'#3'Top'#2'D'#5'Width'#3#201#1#5'Align'#7#5
-  +'alTop'#8'AutoFill'#9#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#29'SaveSessionLocationRadioGroup'#28'ChildSizing.LeftRightSpac'
-  +'ing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizon'
-  +'tal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'cr'
-  +'sHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChild'
-  +'s'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layou'
-  +'t'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8
-  +'TabOrder'#2#2#0#0#0#5'TPage'#15'VersionInfoPage'#7'Caption'#6#15'VersionInf'
-  +'oPage'#11'ClientWidth'#3#209#1#12'ClientHeight'#3'p'#1#0#9'TGroupBox'#19'Ve'
-  +'rsionInfoGroupBox'#22'AnchorSideLeft.Control'#7#24'LanguageSettingsGroupBox'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBotto'
-  +'m'#4'Left'#2#6#6'Height'#2'e'#3'Top'#2#31#5'Width'#3#197#1#5'Align'#7#5'alT'
-  +'op'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Version Numb'
-  +'ering'#12'ClientHeight'#2'e'#11'ClientWidth'#3#197#1#8'TabOrder'#2#0#0#6'TL'
-  +'abel'#12'VersionLabel'#22'AnchorSideLeft.Control'#7#19'VersionInfoGroupBox'
-  +#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#4'Left'#2#6#6'Height'#2
-  +#14#3'Top'#2#6#5'Width'#2'('#20'BorderSpacing.Around'#2#6#7'Caption'#6#8'Ver'
-  +'sion:'#11'ParentColor'#8#0#0#6'TLabel'#18'MajorRevisionLabel'#22'AnchorSide'
-  +'Left.Control'#7#15'VersionSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#4'Left'#2'j'#6'Height'#2
-  +#14#3'Top'#2#6#5'Width'#2'K'#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Ar'
-  +'ound'#2#6#7'Caption'#6#15'Major Revision:'#11'ParentColor'#8#0#0#6'TLabel'
-  +#18'MinorRevisionLabel'#22'AnchorSideLeft.Control'#7#21'MajorRevisionSpinEdi'
-  +'t'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Ve'
-  +'rsionInfoGroupBox'#4'Left'#3#206#0#6'Height'#2#14#3'Top'#2#6#5'Width'#2'J'
-  +#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'Mi'
-  +'nor Revision:'#11'ParentColor'#8#0#0#6'TLabel'#10'BuildLabel'#22'AnchorSide'
-  +'Left.Control'#7#21'MinorRevisionSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBo'
-  +'ttom'#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#4'Left'#3'2'#1#6
-  +'Height'#2#14#3'Top'#2#6#5'Width'#2#27#18'BorderSpacing.Left'#2#24#20'Border'
-  +'Spacing.Around'#2#6#7'Caption'#6#6'Build:'#11'ParentColor'#8#0#0#5'TEdit'#9
-  +'BuildEdit'#22'AnchorSideLeft.Control'#7#10'BuildLabel'#21'AnchorSideTop.Con'
-  +'trol'#7#10'BuildLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3'2'#1
-  +#6'Height'#2#20#3'Top'#2#26#5'Width'#2'F'#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0
-  +#9'TSpinEdit'#15'VersionSpinEdit'#22'AnchorSideLeft.Control'#7#12'VersionLab'
-  +'el'#21'AnchorSideTop.Control'#7#12'VersionLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#26#5'Width'#2'F'#8'TabOrder'
-  +#2#1#0#0#9'TSpinEdit'#21'MajorRevisionSpinEdit'#22'AnchorSideLeft.Control'#7
-  +#18'MajorRevisionLabel'#21'AnchorSideTop.Control'#7#18'MajorRevisionLabel'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'j'#6'Height'#2#20#3'Top'#2#26#5
-  +'Width'#2'F'#8'TabOrder'#2#2#0#0#9'TSpinEdit'#21'MinorRevisionSpinEdit'#22'A'
-  +'nchorSideLeft.Control'#7#18'MinorRevisionLabel'#21'AnchorSideTop.Control'#7
-  ,#18'MinorRevisionLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#206#0
-  +#6'Height'#2#20#3'Top'#2#26#5'Width'#2'F'#8'TabOrder'#2#3#0#0#9'TCheckBox"Au'
-  +'tomaticallyIncreaseBuildCheckBox'#22'AnchorSideLeft.Control'#7#19'VersionIn'
-  +'foGroupBox'#21'AnchorSideTop.Control'#7#15'VersionSpinEdit'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2':'#5'Width'#3#158
-  +#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#28'Au'
-  +'tomatically increase Build'#8'TabOrder'#2#4#0#0#0#9'TCheckBox'#22'UseVersio'
-  +'nInfoCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#197#1#5'Ali'
-  +'gn'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'"Include Version I'
-  +'nfo in executable'#8'OnChange'#7#28'UseVersionInfoCheckBoxChange'#8'TabOrde'
-  +'r'#2#1#0#0#9'TGroupBox'#24'LanguageSettingsGroupBox'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2'G'#3'Top'#3#138#0#5'Width'#3#197#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'B'
-  +'orderSpacing.Around'#2#6#7'Caption'#6#16'Language Options'#12'ClientHeight'
-  +#2'G'#11'ClientWidth'#3#197#1#8'TabOrder'#2#2#0#6'TLabel'#22'LanguageSelecti'
-  +'onLabel'#22'AnchorSideLeft.Control'#7#24'LanguageSettingsGroupBox'#21'Ancho'
-  +'rSideTop.Control'#7#24'LanguageSettingsGroupBox'#4'Left'#2#6#6'Height'#2#14
-  +#3'Top'#2#6#5'Width'#2'b'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Langu'
-  +'age Selection:'#11'ParentColor'#8#0#0#6'TLabel'#17'CharacterSetLabel'#22'An'
-  +'chorSideLeft.Control'#7#25'LanguageSelectionComboBox'#19'AnchorSideLeft.Sid'
-  +'e'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'LanguageSettingsGroupBox'#4
-  +'Left'#3#4#1#6'Height'#2#14#3'Top'#2#6#5'Width'#2'H'#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#14'Character Set:'#11'ParentColor'#8#0#0#9'TComboBox'#25'L'
-  +'anguageSelectionComboBox'#22'AnchorSideLeft.Control'#7#22'LanguageSelection'
-  +'Label'#21'AnchorSideTop.Control'#7#22'LanguageSelectionLabel'#18'AnchorSide'
-  +'Top.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#26#5'Width'#3
-  +#248#0#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Bottom'#2#6#10'ItemHeight'
-  +#2#13#8'TabOrder'#2#0#4'Text'#6#12'U.S. English'#0#0#9'TComboBox'#20'Charact'
-  +'erSetComboBox'#22'AnchorSideLeft.Control'#7#17'CharacterSetLabel'#21'Anchor'
-  +'SideTop.Control'#7#25'LanguageSelectionComboBox'#23'AnchorSideRight.Control'
-  +#7#24'LanguageSettingsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#3#4#1#6'Height'#2#21#3'Top'#2#26#5'Width'#3#183#0#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'
-  +#2#6#10'ItemHeight'#2#13#8'TabOrder'#2#1#4'Text'#6#12'Multilingual'#0#0#0#9
-  +'TGroupBox'#17'OtherInfoGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'e'#3'Top'#3#215
-  +#0#5'Width'#3#197#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Aroun'
-  +'d'#2#6#7'Caption'#6#10'Other Info'#12'ClientHeight'#2'e'#11'ClientWidth'#3
-  +#197#1#8'TabOrder'#2#3#0#5'TEdit'#15'DescriptionEdit'#22'AnchorSideLeft.Cont'
-  +'rol'#7#16'PanelOtherLabels'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'Ancho'
-  +'rSideRight.Control'#7#17'OtherInfoGroupBox'#20'AnchorSideRight.Side'#7#9'as'
-  +'rBottom'#4'Left'#2'F'#6'Height'#2#21#5'Width'#3'u'#1#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2
-  +#6#8'TabOrder'#2#0#0#0#5'TEdit'#13'CopyrightEdit'#22'AnchorSideLeft.Control'
-  +#7#15'DescriptionEdit'#21'AnchorSideTop.Control'#7#15'DescriptionEdit'#18'An'
-  +'chorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfo'
-  +'GroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2
-  +#21#3'Top'#2#27#5'Width'#3'u'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#1#0#0#7
-  +'TButton'#20'AdditionalInfoButton'#21'AnchorSideTop.Control'#7#13'CopyrightE'
-  +'dit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17
-  +'OtherInfoGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBot'
-  +'tom.Side'#7#9'asrBottom'#4'Left'#3'['#1#6'Height'#2#23#3'Top'#2'6'#5'Width'
-  +#2'`'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Aro'
-  +'und'#2#6#7'Caption'#6#15'Additional Info'#7'OnClick'#7#25'AdditionalInfoBut'
-  +'tonClick'#8'TabOrder'#2#2#0#0#6'TPanel'#16'PanelOtherLabels'#6'Height'#2'('
-  +#5'Width'#2'@'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'('
-  +#11'ClientWidth'#2'@'#8'TabOrder'#2#3#0#6'TLabel'#14'CopyrightLabel'#22'Anch'
-  +'orSideLeft.Control'#7#16'DescriptionLabel'#18'AnchorSideTop.Side'#7#9'asrCe'
-  +'nter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#26#5'Width'#2'4'#7'Caption'#6#10
-  +'Copyright:'#11'ParentColor'#8#0#0#6'TLabel'#16'DescriptionLabel'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#5'Width'#2':'#18'Bor'
-  +'derSpacing.Left'#2#6#7'Caption'#6#12'Description:'#11'ParentColor'#8#0#0#0#0
-  +#0#5'TPage'#8'i18nPage'#7'Caption'#6#4'i18n'#11'ClientWidth'#3#213#1#12'Clie'
-  ,'ntHeight'#3'c'#1#0#9'TGroupBox'#12'I18NGroupBox'#22'AnchorSideLeft.Control'
-  +#7#17'OtherInfoGroupBox'#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'Othe'
-  +'rInfoGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2'P'#3'Top'#2'"'#5'Width'#3#201#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#12'i18n Options'#12'ClientHeight'#2'P'#11
-  +'ClientWidth'#3#201#1#8'TabOrder'#2#0#0#6'TLabel'#13'PoOutDirLabel'#4'Left'#2
-  +#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3#132#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#20'PO Output Directory:'#11'ParentColor'#8#0#0#5'TEdit'#12'POOut'
-  +'DirEdit'#22'AnchorSideLeft.Control'#7#12'I18NGroupBox'#21'AnchorSideTop.Con'
-  +'trol'#7#13'PoOutDirLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSi'
-  +'deRight.Control'#7#14'POOutDirButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2' '
-  +#5'Width'#3#155#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpa'
-  +'cing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#12'POOutDirEdit'#0#0#7'TButton'
-  +#14'POOutDirButton'#21'AnchorSideTop.Control'#7#13'PoOutDirLabel'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#12'I18NGroupBox'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#3#167#1#6'Height'#2#23#3'Top'#2' '#5'Width'#2#24#7'Anchors'#11
-  +#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'...'#7'On'
-  +'Click'#7#19'POOutDirButtonClick'#8'TabOrder'#2#1#0#0#0#9'TCheckBox'#18'Enab'
-  +'leI18NCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#201#1#5'Al'
-  +'ign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'Enable i18n'#8
-  +'OnChange'#7#24'EnableI18NCheckBoxChange'#8'TabOrder'#2#1#0#0#0#0#6'TPanel'
-  +#11'PODBtnPanel'#6'Height'#2'&'#3'Top'#3#138#1#5'Width'#3#217#1#5'Align'#7#8
-  +'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'#11
-  +'ClientWidth'#3#217#1#8'TabOrder'#2#1#0#7'TBitBtn'#8'OKButton'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3'5'#1#6'Height'#2#26#3'Top'#2#6#5'Widt'
-  +'h'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2
-  +'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'Ta'
-  +'bOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'as'
-  +'rBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#134#1#6'Height'
-  +#2#26#3'Top'#2#6#5'Width'#2'M'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Border'
-  +'Spacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHe'
-  +'ight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResu'
-  +'lt'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#10'HelpButton'#21'A'
-  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#26#3'Top'#2#6#5
-  +'Width'#2'K'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidt'
-  +'h'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'HelpButtonClic'
-  +'k'#8'TabOrder'#2#2#0#0#0#22'TSelectDirectoryDialog'#21'SelectDirectoryDialo'
-  +'g'#11'FilterIndex'#2#0#4'left'#2'X'#3'top'#3'p'#1#0#0#0
+  +'Top'#2#6#5'Width'#3#151#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
+  +'BorderSpacing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#14'LazDocPathEdit'#0#0#7
+  +'TButton'#18'LazDocBrowseButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'An'
+  +'chorSideRight.Control'#7#19'LazDocPathsGroupBox'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#3#163#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2#24#7'Anch'
+  +'ors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'.'
+  +'..'#7'OnClick'#7#23'LazDocBrowseButtonClick'#8'TabOrder'#2#2#0#0#7'TBitBtn'
+  +#19'LazDocAddPathButton'#22'AnchorSideLeft.Control'#7#19'LazDocPathsGroupBox'
+  +#21'AnchorSideTop.Control'#7#13'LazDocListBox'#18'AnchorSideTop.Side'#7#9'as'
+  ,'rBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'x'#5'Width'#3#133#0#8'AutoSize'
+  +#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'LazDocAddPathButton'#9'NumGl'
+  +'yphs'#2#0#7'OnClick'#7#24'LazDocAddPathButtonClick'#8'TabOrder'#2#3#0#0#7'T'
+  +'BitBtn'#22'LazDocDeletePathButton'#22'AnchorSideLeft.Control'#7#19'LazDocAd'
+  +'dPathButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#13'LazDocListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#145#0
+  +#6'Height'#2#23#3'Top'#2'x'#5'Width'#3#145#0#8'AutoSize'#9#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6#22'LazDocDeletePathButton'#9'NumGlyphs'#2#0#7'OnCl'
+  +'ick'#7#27'LazDocDeletePathButtonClick'#8'TabOrder'#2#4#0#0#0#0#5'TPage'#8'S'
+  +'avePage'#7'Caption'#6#8'SavePage'#11'ClientWidth'#3#209#1#12'ClientHeight'#3
+  +'p'#1#0#9'TCheckBox'#26'SaveClosedUnitInfoCheckBox'#4'Left'#2#6#6'Height'#2
+  +#19#3'Top'#2#6#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#26'SaveClosedUnitInfoCheckBox'#8'TabOrder'#2#0#0#0#9'TChec'
+  +'kBox'#31'SaveOnlyProjectUnitInfoCheckBox'#21'AnchorSideTop.Control'#7#26'Sa'
+  +'veClosedUnitInfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#19#3'Top'#2#31#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#31'SaveOnlyProjectUnitInfoCheckBox'#8'TabOrd'
+  +'er'#2#1#0#0#11'TRadioGroup'#29'SaveSessionLocationRadioGroup'#21'AnchorSide'
+  +'Top.Control'#7#31'SaveOnlyProjectUnitInfoCheckBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#23'AnchorSideRight.Control'#7#8'SavePage'#20'AnchorSideRight.S'
+  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'u'#3'Top'#2'>'#5'Width'#3#197#1
+  +#5'Align'#7#5'alTop'#8'AutoFill'#9#17'BorderSpacing.Top'#2#6#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#29'SaveSessionLocationRadioGroup'#28'ChildSizing'
+  +'.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.'
+  +'EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVer'
+  +'tical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14
+  +'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'Chil'
+  +'dSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Controls'
+  +'PerLine'#2#1#8'TabOrder'#2#2#0#0#0#5'TPage'#15'VersionInfoPage'#7'Caption'#6
+  +#15'VersionInfoPage'#11'ClientWidth'#3#209#1#12'ClientHeight'#3'q'#1#0#9'TGr'
+  +'oupBox'#19'VersionInfoGroupBox'#22'AnchorSideLeft.Control'#7#24'LanguageSet'
+  +'tingsGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'e'#3'Top'#2#31#5'Width'#3#197#1#5
+  +'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17
+  +'Version Numbering'#12'ClientHeight'#2'S'#11'ClientWidth'#3#193#1#8'TabOrder'
+  +#2#0#0#6'TLabel'#12'VersionLabel'#22'AnchorSideLeft.Control'#7#19'VersionInf'
+  +'oGroupBox'#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#4'Left'#2#6#6
+  +'Height'#2#14#3'Top'#2#6#5'Width'#2'('#20'BorderSpacing.Around'#2#6#7'Captio'
+  +'n'#6#8'Version:'#11'ParentColor'#8#0#0#6'TLabel'#18'MajorRevisionLabel'#22
+  +'AnchorSideLeft.Control'#7#15'VersionSpinEdit'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srBottom'#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#4'Left'#2'j'#6
+  +'Height'#2#14#3'Top'#2#6#5'Width'#2'K'#18'BorderSpacing.Left'#2#24#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#15'Major Revision:'#11'ParentColor'#8#0#0#6
+  +'TLabel'#18'MinorRevisionLabel'#22'AnchorSideLeft.Control'#7#21'MajorRevisio'
+  +'nSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
+  +#7#19'VersionInfoGroupBox'#4'Left'#3#206#0#6'Height'#2#14#3'Top'#2#6#5'Width'
+  +#2'J'#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#15'Minor Revision:'#11'ParentColor'#8#0#0#6'TLabel'#10'BuildLabel'#22'Ancho'
+  +'rSideLeft.Control'#7#21'MinorRevisionSpinEdit'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#4'Left'#3'2'
+  +#1#6'Height'#2#14#3'Top'#2#6#5'Width'#2#27#18'BorderSpacing.Left'#2#24#20'Bo'
+  +'rderSpacing.Around'#2#6#7'Caption'#6#6'Build:'#11'ParentColor'#8#0#0#5'TEdi'
+  +'t'#9'BuildEdit'#22'AnchorSideLeft.Control'#7#10'BuildLabel'#21'AnchorSideTo'
+  +'p.Control'#7#10'BuildLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
+  +'2'#1#6'Height'#2#20#3'Top'#2#26#5'Width'#2'F'#8'TabOrder'#2#0#4'Text'#6#1'0'
+  +#0#0#9'TSpinEdit'#15'VersionSpinEdit'#22'AnchorSideLeft.Control'#7#12'Versio'
+  +'nLabel'#21'AnchorSideTop.Control'#7#12'VersionLabel'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#26#5'Width'#2'F'#8'TabOr'
+  +'der'#2#1#0#0#9'TSpinEdit'#21'MajorRevisionSpinEdit'#22'AnchorSideLeft.Contr'
+  +'ol'#7#18'MajorRevisionLabel'#21'AnchorSideTop.Control'#7#18'MajorRevisionLa'
+  +'bel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'j'#6'Height'#2#20#3'To'
+  +'p'#2#26#5'Width'#2'F'#8'TabOrder'#2#2#0#0#9'TSpinEdit'#21'MinorRevisionSpin'
+  +'Edit'#22'AnchorSideLeft.Control'#7#18'MinorRevisionLabel'#21'AnchorSideTop.'
+  +'Control'#7#18'MinorRevisionLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+  ,'eft'#3#206#0#6'Height'#2#20#3'Top'#2#26#5'Width'#2'F'#8'TabOrder'#2#3#0#0#9
+  +'TCheckBox"AutomaticallyIncreaseBuildCheckBox'#22'AnchorSideLeft.Control'#7
+  +#19'VersionInfoGroupBox'#21'AnchorSideTop.Control'#7#15'VersionSpinEdit'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2':'#5
+  +'Width'#3#158#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Cap'
+  +'tion'#6#28'Automatically increase Build'#8'TabOrder'#2#4#0#0#0#9'TCheckBox'
+  +#22'UseVersionInfoCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3
+  +#197#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'"Includ'
+  +'e Version Info in executable'#8'OnChange'#7#28'UseVersionInfoCheckBoxChange'
+  +#8'TabOrder'#2#1#0#0#9'TGroupBox'#24'LanguageSettingsGroupBox'#18'AnchorSide'
+  +'Top.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2'G'#3'Top'#3#138#0#5'Width'#3#197#1#5'Align'#7#5'alTop'#8'AutoSi'
+  +'ze'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'Language Options'#12'Cli'
+  +'entHeight'#2'5'#11'ClientWidth'#3#193#1#8'TabOrder'#2#2#0#6'TLabel'#22'Lang'
+  +'uageSelectionLabel'#22'AnchorSideLeft.Control'#7#24'LanguageSettingsGroupBo'
+  +'x'#21'AnchorSideTop.Control'#7#24'LanguageSettingsGroupBox'#4'Left'#2#6#6'H'
+  +'eight'#2#14#3'Top'#2#6#5'Width'#2'b'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#19'Language Selection:'#11'ParentColor'#8#0#0#6'TLabel'#17'CharacterSetLa'
+  +'bel'#22'AnchorSideLeft.Control'#7#25'LanguageSelectionComboBox'#19'AnchorSi'
+  +'deLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'LanguageSettings'
+  +'GroupBox'#4'Left'#3#4#1#6'Height'#2#14#3'Top'#2#6#5'Width'#2'H'#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#14'Character Set:'#11'ParentColor'#8#0#0#9'T'
+  +'ComboBox'#25'LanguageSelectionComboBox'#22'AnchorSideLeft.Control'#7#22'Lan'
+  +'guageSelectionLabel'#21'AnchorSideTop.Control'#7#22'LanguageSelectionLabel'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#26
+  +#5'Width'#3#248#0#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Bottom'#2#6#10
+  +'ItemHeight'#2#13#8'TabOrder'#2#0#4'Text'#6#12'U.S. English'#0#0#9'TComboBox'
+  +#20'CharacterSetComboBox'#22'AnchorSideLeft.Control'#7#17'CharacterSetLabel'
+  +#21'AnchorSideTop.Control'#7#25'LanguageSelectionComboBox'#23'AnchorSideRigh'
+  +'t.Control'#7#24'LanguageSettingsGroupBox'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#3#4#1#6'Height'#2#21#3'Top'#2#26#5'Width'#3#183#0#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#20'BorderSpa'
+  +'cing.Bottom'#2#6#10'ItemHeight'#2#13#8'TabOrder'#2#1#4'Text'#6#12'Multiling'
+  +'ual'#0#0#0#9'TGroupBox'#17'OtherInfoGroupBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'e'
+  +#3'Top'#3#215#0#5'Width'#3#197#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#10'Other Info'#12'ClientHeight'#2'S'#11'Cl'
+  +'ientWidth'#3#193#1#8'TabOrder'#2#3#0#5'TEdit'#15'DescriptionEdit'#22'Anchor'
+  +'SideLeft.Control'#7#16'PanelOtherLabels'#19'AnchorSideLeft.Side'#7#9'asrBot'
+  +'tom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBox'#20'AnchorSideRight'
+  +'.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#21#5'Width'#3'u'#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpac'
+  +'ing.Right'#2#6#8'TabOrder'#2#0#0#0#5'TEdit'#13'CopyrightEdit'#22'AnchorSide'
+  +'Left.Control'#7#15'DescriptionEdit'#21'AnchorSideTop.Control'#7#15'Descript'
+  +'ionEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+  +#17'OtherInfoGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'F'#6
+  +'Height'#2#21#3'Top'#2#27#5'Width'#3'u'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'
+  +#2#1#0#0#6'TPanel'#16'PanelOtherLabels'#6'Height'#2'('#5'Width'#2'@'#8'AutoS'
+  +'ize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'('#11'ClientWidth'#2'@'
+  +#8'TabOrder'#2#2#0#6'TLabel'#14'CopyrightLabel'#22'AnchorSideLeft.Control'#7
+  +#16'DescriptionLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'He'
+  +'ight'#2#14#3'Top'#2#26#5'Width'#2'4'#7'Caption'#6#10'Copyright:'#11'ParentC'
+  +'olor'#8#0#0#6'TLabel'#16'DescriptionLabel'#18'AnchorSideTop.Side'#7#9'asrCe'
+  +'nter'#4'Left'#2#6#6'Height'#2#14#5'Width'#2':'#18'BorderSpacing.Left'#2#6#7
+  +'Caption'#6#12'Description:'#11'ParentColor'#8#0#0#0#7'TBitBtn'#20'Additiona'
+  +'lInfoButton'#21'AnchorSideTop.Control'#7#13'CopyrightEdit'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBotto'
+  +'m'#4'Left'#3'['#1#6'Height'#2#23#3'Top'#2'6'#5'Width'#2'`'#7'Anchors'#11#5
+  +'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#15'Additional Info'#9'NumGlyphs'#2#0#7'OnClick'#7#25'AdditionalInfoButtonCl'
+  +'ick'#8'TabOrder'#2#3#0#0#0#0#5'TPage'#8'i18nPage'#7'Caption'#6#4'i18n'#11'C'
+  +'lientWidth'#3#209#1#12'ClientHeight'#3'q'#1#0#9'TGroupBox'#12'I18NGroupBox'
+  ,#22'AnchorSideLeft.Control'#7#17'OtherInfoGroupBox'#21'AnchorSideTop.Control'
+  +#7#19'VersionInfoGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSi'
+  +'deRight.Control'#7#17'OtherInfoGroupBox'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#2#6#6'Height'#2'I'#3'Top'#2#31#5'Width'#3#197#1#5'Align'#7#5
+  +'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'i18n Opti'
+  +'ons'#12'ClientHeight'#2'I'#11'ClientWidth'#3#197#1#8'TabOrder'#2#0#0#6'TLab'
+  +'el'#13'PoOutDirLabel'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'g'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#20'PO Output Directory:'#11'ParentCo'
+  +'lor'#8#0#0#5'TEdit'#12'POOutDirEdit'#22'AnchorSideLeft.Control'#7#12'I18NGr'
+  +'oupBox'#21'AnchorSideTop.Control'#7#13'PoOutDirLabel'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#14'POOutDirButton'#4'Left'#2#6
+  +#6'Height'#2#23#3'Top'#2#26#5'Width'#3#151#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#12'POOu'
+  +'tDirEdit'#0#0#7'TButton'#14'POOutDirButton'#21'AnchorSideTop.Control'#7#13
+  +'PoOutDirLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Con'
+  +'trol'#7#12'I18NGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorS'
+  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3#163#1#6'Height'#2#23#3'Top'#2#26#5
+  +'Width'#2#24#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#3'...'#7'OnClick'#7#19'POOutDirButtonClick'#8'TabOrder'#2#1#0#0
+  +#0#9'TCheckBox'#18'EnableI18NCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6
+  +#5'Width'#3#197#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#11'Enable i18n'#8'OnChange'#7#24'EnableI18NCheckBoxChange'#8'TabOrder'#2#1
+  +#0#0#0#0#6'TPanel'#11'PODBtnPanel'#6'Height'#2'%'#3'Top'#3#139#1#5'Width'#3
+  +#217#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'Cl'
+  +'ientHeight'#2'%'#11'ClientWidth'#3#217#1#8'TabOrder'#2#1#0#7'TBitBtn'#8'OKB'
+  +'utton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'7'#1#6'Height'#2
+  +#25#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'#21'Constraints.MinHeight'#2#25#20'Con'
+  +'straints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9
+  +'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +#3#136#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'Aut'
+  +'oSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21
+  +'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCan'
+  +'cel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#10
+  +'HelpButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#25#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20'BorderSpa'
+  +'cing.Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Co'
+  +'nstraints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7
+  +#15'HelpButtonClick'#8'TabOrder'#2#2#0#0#0#22'TSelectDirectoryDialog'#21'Sel'
+  +'ectDirectoryDialog'#11'FilterIndex'#2#0#4'left'#2'X'#3'top'#3'p'#1#0#0#0
 ]);
diff --git a/ide/projectopts.pp b/ide/projectopts.pp
index f548b80877..c2c09e2bb9 100644
--- a/ide/projectopts.pp
+++ b/ide/projectopts.pp
@@ -48,10 +48,14 @@ type
   { TProjectOptionsDialog }
 
   TProjectOptionsDialog = class(TForm)
+    AdditionalInfoButton: TBitBtn;
+    CreateAppBundleButton: TBitBtn;
     FormsAddToAutoCreatedFormsBtn: TSpeedButton;
     FormsMoveAutoCreatedFormsDownBtn: TSpeedButton;
     FormsMoveAutoCreatedFormUpBtn: TSpeedButton;
     FormsRemoveFromAutoCreatedFormsBtn: TSpeedButton;
+    LazDocAddPathButton: TBitBtn;
+    LazDocDeletePathButton: TBitBtn;
     Notebook: TNotebook;
     ApplicationPage: TPage;
     FormsPage: TPage;
@@ -70,7 +74,6 @@ type
     TargetFileLabel: TLabel;
     TargetFileEdit: TEdit;
     PanelOtherLabels: TPanel;
-    CreateAppBundleButton: TButton;
     UseAppBundleCheckBox: TCheckBox;
     UseXPManifestCheckBox: TCheckBox;
 
@@ -93,8 +96,6 @@ type
     // Lazdoc settings
     LazDocBrowseButton: TButton;
     LazDocPathEdit: TEdit;
-    LazDocDeletePathButton: TButton;
-    LazDocAddPathButton: TButton;
     LazDocPathsGroupBox: TGroupBox;
     LazDocListBox: TListBox;
 
@@ -121,7 +122,6 @@ type
     LanguageSelectionComboBox: TComboBox;
     CharacterSetComboBox: TComboBox;
     OtherInfoGroupBox: TGroupBox;
-    AdditionalInfoButton: TButton;
     DescriptionEdit: TEdit;
     CopyrightEdit: TEdit;
     DescriptionLabel: TLabel;
@@ -256,6 +256,10 @@ begin
   CancelButton.Caption:=dlgCancel;
   HelpButton.Caption:=lisMenuHelp;
 
+  OKButton.LoadGlyphFromLazarusResource('btn_ok');
+  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+  HelpButton.LoadGlyphFromLazarusResource('btn_help');
+
   NoteBook.PageIndex := 0;
 
   SetupApplicationPage(0);
@@ -284,6 +288,7 @@ begin
   UseXPManifestCheckBox.Caption := dlgPOUseManifest;
   UseXPManifestCheckBox.Checked := False;
   CreateAppBundleButton.Caption := dlgPOCreateAppBundle;
+  CreateAppBundleButton.LoadGlyphFromLazarusResource('pkg_compile');
 end;
 
 procedure TProjectOptionsDialog.SetupLazDocPage(PageIndex: Integer);
@@ -293,6 +298,8 @@ begin
   LazDocPathsGroupBox.Caption := lisCodeHelpPathsGroupBox;
   LazDocAddPathButton.Caption := lisCodeHelpAddPathButton;
   LazDocDeletePathButton.Caption := lisCodeHelpDeletePathButton;
+  LazDocDeletePathButton.LoadGlyphFromLazarusResource('delete');
+  LazDocAddPathButton.LoadGlyphFromLazarusResource('add');
 
   LazDocPathEdit.Clear;
 end;
@@ -353,6 +360,7 @@ begin
   DescriptionLabel.Caption := lisCodeToolsDefsDescription;
   CopyrightLabel.Caption := rsCopyright;
   AdditionalInfoButton.Caption := rsAdditionalInfo;
+  AdditionalInfoButton.LoadGlyphFromLazarusResource('add');
 end;
 
 procedure TProjectOptionsDialog.SetupI18NPage(PageIndex: Integer);