diff --git a/ide/compileroptionsdlg.lfm b/ide/compileroptionsdlg.lfm
index 30494f14d6..5dd94e4ef3 100644
--- a/ide/compileroptionsdlg.lfm
+++ b/ide/compileroptionsdlg.lfm
@@ -21,7 +21,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     Width = 669
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 7
+    PageIndex = 0
     TabOrder = 0
     object PathPage: TPage
       Caption = 'PathPage'
@@ -228,9 +228,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         AnchorSideLeft.Control = LCLWidgetTypeLabel
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = LCLWidgetTypeLabel
+        AnchorSideTop.Side = asrCenter
         Left = 139
         Height = 25
-        Top = 306
+        Top = 304
         Width = 155
         AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
         BorderSpacing.Left = 6
diff --git a/ide/compileroptionsdlg.lrs b/ide/compileroptionsdlg.lrs
index 58b2dcf53b..5240a41a0d 100644
--- a/ide/compileroptionsdlg.lrs
+++ b/ide/compileroptionsdlg.lrs
@@ -10,7 +10,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'ze'#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#12'Mai'
   +'nNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#224#1#5'W'
   +'idth'#3#157#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#8'akBottom'#0#9'PageIndex'#2#7#8'TabOrder'#2#0#0#5'TPage'#8'PathPage'#7
+  +'t'#8'akBottom'#0#9'PageIndex'#2#0#8'TabOrder'#2#0#0#5'TPage'#8'PathPage'#7
   +'Caption'#6#8'PathPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#6
   +'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3
   +#141#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
@@ -82,169 +82,169 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'ing.Bottom'#2#6#8'TabOrder'#2#5#4'Text'#6#12'edtDebugPath'#0#0#9'TComboBox'
   +#21'LCLWidgetTypeComboBox'#22'AnchorSideLeft.Control'#7#18'LCLWidgetTypeLabe'
   +'l'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'LC'
-  +'LWidgetTypeLabel'#4'Left'#3#139#0#6'Height'#2#25#3'Top'#3'2'#1#5'Width'#3
-  +#155#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAsce'
-  +'nding'#0#18'BorderSpacing.Left'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#6#4'Text'
-  +#6#21'LCLWidgetTypeComboBox'#0#0#0#5'TPage'#11'ParsingPage'#7'Caption'#6#11
-  +'ParsingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#11'TRadioGr'
-  +'oup'#8'grpStyle'#4'Left'#2#6#6'Height'#2'('#3'Top'#2#6#5'Width'#3#141#2#5'A'
-  +'lign'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#8
-  +'grpStyle'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpac'
-  +'ing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27
-  +'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.'
-  +'ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14
-  +'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'
-  +#27'ChildSizing.ControlsPerLine'#2#3#7'Columns'#2#3#8'TabOrder'#2#0#0#0#11'T'
-  +'CheckGroup'#16'grpSyntaxOptions'#4'Left'#2#6#6'Height'#3#2#1#3'Top'#2'4'#5
-  +'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#16'grpSyntaxOptions'#28'ChildSizing.LeftRightSpacing'#2#6#28
-  +'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'cr'
-  +'sHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousC'
-  +'hildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildS'
-  +'izing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL'
-  +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2
-  +#1#0#0#0#5'TPage'#11'CodeGenPage'#7'Caption'#6#11'CodeGenPage'#11'ClientWidt'
-  +'h'#3#153#2#12'ClientHeight'#3#193#1#0#9'TGroupBox'#16'grpSmartLinkUnit'#22
-  +'AnchorSideLeft.Control'#7#9'grpChecks'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#21'AnchorSideTop.Control'#7#11'CodeGenPage'#23'AnchorSideRight.Control'#7
-  +#11'CodeGenPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#174#0#6'Height'#2'5'#3'Top'#2#6#5'Width'#3
-  +#229#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'Border'
-  +'Spacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'C'
-  +'aption'#6#16'grpSmartLinkUnit'#12'ClientHeight'#2'"'#11'ClientWidth'#3#225#1
-  +#8'TabOrder'#2#0#0#9'TCheckBox'#16'chkSmartLinkUnit'#4'Left'#2#6#6'Height'#2
-  +#22#3'Top'#2#6#5'Width'#3#213#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#16'chkSmartLinkUnit'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#9
-  +'grpChecks'#22'AnchorSideLeft.Control'#7#11'CodeGenPage'#21'AnchorSideTop.Co'
-  +'ntrol'#7#11'CodeGenPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#3#137#0#3'Top'#2#6#5'Width'#3#162#0#8'AutoSize'#9#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#9'grpChecks'#12'ClientHeight'#2'v'#11'ClientWidt'
-  +'h'#3#158#0#8'TabOrder'#2#1#0#9'TCheckBox'#11'chkChecksIO'#4'Left'#2#6#6'Hei'
-  +'ght'#2#22#3'Top'#2'"'#5'Width'#3#146#0#5'Align'#7#5'alTop'#20'BorderSpacing'
-  +'.Around'#2#6#7'Caption'#6#11'chkChecksIO'#8'TabOrder'#2#0#0#0#9'TCheckBox'
-  +#14'chkChecksRange'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'Z'#5'Width'#3#146#0#5
-  +'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'chkChecksRan'
-  +'ge'#8'TabOrder'#2#1#0#0#9'TCheckBox'#17'chkChecksOverflow'#4'Left'#2#6#6'He'
-  +'ight'#2#22#3'Top'#2'>'#5'Width'#3#146#0#5'Align'#7#5'alTop'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#17'chkChecksOverflow'#8'TabOrder'#2#2#0#0#9'TChe'
-  +'ckBox'#14'chkChecksStack'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3
-  +#146#0#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'chkC'
-  ,'hecksStack'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#11'grpHeapSize'#22'AnchorSid'
-  +'eLeft.Control'#7#9'grpChecks'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anc'
-  +'horSideTop.Control'#7#16'grpSmartLinkUnit'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#23'AnchorSideRight.Control'#7#11'CodeGenPage'#20'AnchorSideRight.Side'
-  +#7#9'asrBottom'#4'Left'#3#174#0#6'Height'#2'6'#3'Top'#2'A'#5'Width'#3#229#1#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.'
-  +'Around'#2#6#7'Caption'#6#11'grpHeapSize'#12'ClientHeight'#2'#'#11'ClientWid'
-  +'th'#3#225#1#8'TabOrder'#2#2#0#5'TEdit'#11'edtHeapSize'#4'Left'#2#6#6'Height'
-  +#2#23#3'Top'#2#6#5'Width'#3#213#1#5'Align'#7#5'alTop'#20'BorderSpacing.Aroun'
-  +'d'#2#6#8'TabOrder'#2#0#4'Text'#6#11'edtHeapSize'#0#0#0#9'TGroupBox'#11'grpG'
-  +'enerate'#22'AnchorSideLeft.Control'#7#11'CodeGenPage'#21'AnchorSideTop.Cont'
-  +'rol'#7#9'grpChecks'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBott'
-  +'om.Control'#7#17'grpTargetPlatform'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#2'v'#3'Top'#3#149#0#5'Width'#3#136#0#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17
-  +'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#11'grpGener'
-  +'ate'#12'ClientHeight'#2'c'#11'ClientWidth'#3#132#0#8'TabOrder'#2#3#0#12'TRa'
-  +'dioButton'#12'radGenNormal'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#2
-  +'x'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radGenN'
-  +'ormal'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioBu'
-  +'tton'#12'radGenFaster'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'#5'Width'#2'x'
-  +#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radGenFast'
-  +'er'#8'TabOrder'#2#1#0#0#12'TRadioButton'#13'radGenSmaller'#4'Left'#2#6#6'He'
-  +'ight'#2#22#3'Top'#2'>'#5'Width'#2'x'#5'Align'#7#5'alTop'#20'BorderSpacing.A'
-  +'round'#2#6#7'Caption'#6#13'radGenSmaller'#8'TabOrder'#2#2#0#0#0#9'TGroupBox'
-  +#17'grpTargetPlatform'#22'AnchorSideLeft.Control'#7#11'grpGenerate'#19'Ancho'
-  +'rSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'grpChecks'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#11'CodeGen'
-  +'Page'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#148#0#6'Height'#2'v'
-  +#3'Top'#3#149#0#5'Width'#3#255#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'grpTargetPlatf'
-  +'orm'#12'ClientHeight'#2'c'#11'ClientWidth'#3#251#1#8'TabOrder'#2#4#0#6'TLab'
-  +'el'#11'lblTargetOS'#22'AnchorSideLeft.Control'#7#17'grpTargetPlatform'#21'A'
-  +'nchorSideTop.Control'#7#17'grpTargetPlatform'#4'Left'#2#6#6'Height'#2#20#3
-  +'Top'#2#6#5'Width'#2'I'#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'lblTarg'
-  +'etOS'#11'ParentColor'#8#0#0#6'TLabel'#12'lblTargetCPU'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#17'grpTargetPlatform'#21'AnchorSideTop.Control'#7#16'TargetOSCombo'
-  +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'
-  +#2'%'#5'Width'#2'Q'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'lblTargetCP'
-  +'U'#11'ParentColor'#8#0#0#6'TLabel'#17'lblTargeti386Proc'#22'AnchorSideLeft.'
-  +'Control'#7#17'grpTargetPlatform'#21'AnchorSideTop.Control'#7#17'TargetCPUCo'
-  +'mboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3
-  +'Top'#2'D'#5'Width'#2'l'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'lblTar'
-  +'geti386Proc'#11'ParentColor'#8#0#0#9'TComboBox'#16'TargetOSComboBox'#22'Anc'
-  +'horSideLeft.Control'#7#11'lblTargetOS'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#21'AnchorSideTop.Control'#7#17'grpTargetPlatform'#23'AnchorSideRight.Con'
-  +'trol'#7#17'grpTargetPlatform'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2'['#6'Height'#2#25#3'Top'#2#6#5'Width'#3#154#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
-  +'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'
-  +#2#6#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#16'TargetOSComboBox'#0#0#9'T'
-  +'ComboBox'#17'TargetCPUComboBox'#22'AnchorSideLeft.Control'#7#12'lblTargetCP'
-  +'U'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'Ta'
-  +'rgetOSComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Co'
-  +'ntrol'#7#17'grpTargetPlatform'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#2'c'#6'Height'#2#25#3'Top'#2'%'#5'Width'#3#146#1#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
-  +'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'
-  +#2#6#9'MaxLength'#2#0#8'TabOrder'#2#1#4'Text'#6#17'TargetCPUComboBox'#0#0#9
-  +'TComboBox'#22'Targeti386ProcComboBox'#22'AnchorSideLeft.Control'#7#17'lblTa'
-  +'rgeti386Proc'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contr'
-  +'ol'#7#17'TargetCPUComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anchor'
-  +'SideRight.Control'#7#17'grpTargetPlatform'#20'AnchorSideRight.Side'#7#9'asr'
-  +'Bottom'#4'Left'#2'~'#6'Height'#2#25#3'Top'#2'D'#5'Width'#3'w'#1#7'Anchors'
-  ,#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLin'
-  +'eComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#20'BorderS'
-  +'pacing.Around'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#2#4'Text'#6#22'Targeti386'
-  +'ProcComboBox'#0#0#0#9'TGroupBox'#16'grpOptimizations'#22'AnchorSideLeft.Con'
-  +'trol'#7#11'CodeGenPage'#21'AnchorSideTop.Control'#7#11'grpGenerate'#18'Anch'
-  +'orSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#11'CodeGenPage'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'C'
-  +'odeGenPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3
-  +#170#0#3'Top'#3#17#1#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
-  +'ight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'grpOptimiz'
-  +'ations'#12'ClientHeight'#3#151#0#11'ClientWidth'#3#137#2#8'TabOrder'#2#5#0
-  +#12'TRadioButton'#15'radOptLevelNone'#22'AnchorSideLeft.Control'#7#16'grpOpt'
-  +'imizations'#21'AnchorSideTop.Control'#7#16'grpOptimizations'#4'Left'#2#6#6
-  +'Height'#2#22#3'Top'#2#6#5'Width'#3#135#0#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#15'radOptLevelNone'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'
-  +#2#0#0#0#12'TRadioButton'#12'radOptLevel1'#22'AnchorSideLeft.Control'#7#16'g'
-  +'rpOptimizations'#21'AnchorSideTop.Control'#7#15'radOptLevelNone'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'#5'Width'
-  +#2'm'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radOptLevel1'#8'TabOrder'
-  +#2#1#0#0#12'TRadioButton'#12'radOptLevel2'#22'AnchorSideLeft.Control'#7#16'g'
-  +'rpOptimizations'#21'AnchorSideTop.Control'#7#12'radOptLevel1'#18'AnchorSide'
-  +'Top.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'>'#5'Width'#2
-  +'m'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radOptLevel2'#8'TabOrder'#2
-  +#2#0#0#12'TRadioButton'#12'radOptLevel3'#22'AnchorSideLeft.Control'#7#16'grp'
-  +'Optimizations'#21'AnchorSideTop.Control'#7#12'radOptLevel2'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'Z'#5'Width'#2'm'
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radOptLevel3'#8'TabOrder'#2#3#0
-  +#0#9'TCheckBox'#15'chkOptVarsInReg'#21'AnchorSideTop.Control'#7#16'grpOptimi'
-  +'zations'#4'Left'#3#205#0#6'Height'#2#22#3'Top'#2#6#5'Width'#3#131#0#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#15'chkOptVarsInReg'#8'TabOrder'#2#4#0#0#9
-  +'TCheckBox'#15'chkOptUncertain'#21'AnchorSideTop.Control'#7#15'chkOptVarsInR'
-  +'eg'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#205#0#6'Height'#2#22#3
-  +'Top'#2'"'#5'Width'#3#131#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'chk'
-  +'OptUncertain'#8'TabOrder'#2#5#0#0#0#0#5'TPage'#11'LinkingPage'#7'Caption'#6
-  +#11'LinkingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#9'TGroup'
-  +'Box'#16'grpLinkLibraries'#4'Left'#2#6#6'Height'#2'5'#3'Top'#3#233#0#5'Width'
-  +#3#141#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#16'grpLinkLibraries'#12'ClientHeight'#2'"'#11'ClientWidth'#3#137#2
-  +#8'TabOrder'#2#0#0#9'TCheckBox'#12'chkLinkSmart'#4'Left'#2#6#6'Height'#2#22#3
-  +'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#12'chkLinkSmart'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#21'TargetSpe'
-  +'cificsGrpBox'#4'Left'#2#6#6'Height'#2'5'#3'Top'#3'$'#1#5'Width'#3#141#2#5'A'
-  +'lign'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#21
-  +'TargetSpecificsGrpBox'#12'ClientHeight'#2'"'#11'ClientWidth'#3#137#2#8'TabO'
-  +'rder'#2#1#0#9'TCheckBox'#18'chkWin32GraphicApp'#4'Left'#2#6#6'Height'#2#22#3
-  +'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#18'chkWin32GraphicApp'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#10'grp'
-  +'Options'#4'Left'#2#6#6'Height'#2'R'#3'Top'#3'_'#1#5'Width'#3#141#2#5'Align'
-  +#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'grpOp'
-  +'tions'#12'ClientHeight'#2'?'#11'ClientWidth'#3#137#2#8'TabOrder'#2#2#0#9'TC'
-  +'heckBox'#17'chkOptionsLinkOpt'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Widt'
-  +'h'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17
+  +'LWidgetTypeLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#139#0#6'H'
+  +'eight'#2#25#3'Top'#3'0'#1#5'Width'#3#155#0#16'AutoCompleteText'#11#22'cbact'
+  +'EndOfLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#9
+  +'MaxLength'#2#0#8'TabOrder'#2#6#4'Text'#6#21'LCLWidgetTypeComboBox'#0#0#0#5
+  +'TPage'#11'ParsingPage'#7'Caption'#6#11'ParsingPage'#11'ClientWidth'#3#153#2
+  +#12'ClientHeight'#3#193#1#0#11'TRadioGroup'#8'grpStyle'#4'Left'#2#6#6'Height'
+  +#2'('#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'Borde'
+  +'rSpacing.Around'#2#6#7'Caption'#6#8'grpStyle'#28'ChildSizing.LeftRightSpaci'
+  +'ng'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizont'
+  +'al'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crs'
+  +'HomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'
+  +#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7
+  +#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#7'Col'
+  +'umns'#2#3#8'TabOrder'#2#0#0#0#11'TCheckGroup'#16'grpSyntaxOptions'#4'Left'#2
+  +#6#6'Height'#3#2#1#3'Top'#2'4'#5'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoFi'
+  +'ll'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'grpSyntaxOptions'#28'Chi'
+  +'ldSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'Chil'
+  +'dSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.En'
+  +'largeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizont'
+  +'al'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'
+  +#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.C'
+  +'ontrolsPerLine'#2#1#8'TabOrder'#2#1#0#0#0#5'TPage'#11'CodeGenPage'#7'Captio'
+  +'n'#6#11'CodeGenPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#9'T'
+  +'GroupBox'#16'grpSmartLinkUnit'#22'AnchorSideLeft.Control'#7#9'grpChecks'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'CodeGenP'
+  +'age'#23'AnchorSideRight.Control'#7#11'CodeGenPage'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#174#0#6'H'
+  +'eight'#2'5'#3'Top'#2#6#5'Width'#3#229#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
+  +#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#16'grpSmartLinkUnit'#12'ClientHe'
+  +'ight'#2'"'#11'ClientWidth'#3#225#1#8'TabOrder'#2#0#0#9'TCheckBox'#16'chkSma'
+  +'rtLinkUnit'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#213#1#5'Align'
+  +#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'chkSmartLinkUnit'#8
+  +'TabOrder'#2#0#0#0#0#9'TGroupBox'#9'grpChecks'#22'AnchorSideLeft.Control'#7
+  +#11'CodeGenPage'#21'AnchorSideTop.Control'#7#11'CodeGenPage'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#137#0#3'Top'#2#6#5'Width'#3
+  +#162#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#9'grpChecks'
+  +#12'ClientHeight'#2'v'#11'ClientWidth'#3#158#0#8'TabOrder'#2#1#0#9'TCheckBox'
+  +#11'chkChecksIO'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'#5'Width'#3#146#0#5'A'
+  +'lign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'chkChecksIO'#8
+  +'TabOrder'#2#0#0#0#9'TCheckBox'#14'chkChecksRange'#4'Left'#2#6#6'Height'#2#22
+  +#3'Top'#2'Z'#5'Width'#3#146#0#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#14'chkChecksRange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#17'chkCh'
+  +'ecksOverflow'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'>'#5'Width'#3#146#0#5'Ali'
+  +'gn'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'chkChecksOverfl'
+  +'ow'#8'TabOrder'#2#2#0#0#9'TCheckBox'#14'chkChecksStack'#4'Left'#2#6#6'Heigh'
+  +'t'#2#22#3'Top'#2#6#5'Width'#3#146#0#5'Align'#7#5'alTop'#20'BorderSpacing.Ar'
+  ,'ound'#2#6#7'Caption'#6#14'chkChecksStack'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'
+  +#11'grpHeapSize'#22'AnchorSideLeft.Control'#7#9'grpChecks'#19'AnchorSideLeft'
+  +'.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'grpSmartLinkUnit'#18'A'
+  +'nchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#11'CodeGenP'
+  +'age'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#174#0#6'Height'#2'6'
+  +#3'Top'#2'A'#5'Width'#3#229#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'grpHeapSize'#12'Cl'
+  +'ientHeight'#2'#'#11'ClientWidth'#3#225#1#8'TabOrder'#2#2#0#5'TEdit'#11'edtH'
+  +'eapSize'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#213#1#5'Align'#7#5
+  +'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'edtHeapSiz'
+  +'e'#0#0#0#9'TGroupBox'#11'grpGenerate'#22'AnchorSideLeft.Control'#7#11'CodeG'
+  +'enPage'#21'AnchorSideTop.Control'#7#9'grpChecks'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#24'AnchorSideBottom.Control'#7#17'grpTargetPlatform'#21'AnchorSi'
+  +'deBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'v'#3'Top'#3#149#0#5'W'
+  +'idth'#3#136#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoSize'#9
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'
+  +#2#6#7'Caption'#6#11'grpGenerate'#12'ClientHeight'#2'c'#11'ClientWidth'#3#132
+  +#0#8'TabOrder'#2#3#0#12'TRadioButton'#12'radGenNormal'#4'Left'#2#6#6'Height'
+  +#2#22#3'Top'#2#6#5'Width'#2'x'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#12'radGenNormal'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabO'
+  +'rder'#2#0#0#0#12'TRadioButton'#12'radGenFaster'#4'Left'#2#6#6'Height'#2#22#3
+  +'Top'#2'"'#5'Width'#2'x'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#12'radGenFaster'#8'TabOrder'#2#1#0#0#12'TRadioButton'#13'radGenS'
+  +'maller'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'>'#5'Width'#2'x'#5'Align'#7#5'a'
+  +'lTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'radGenSmaller'#8'TabOrde'
+  +'r'#2#2#0#0#0#9'TGroupBox'#17'grpTargetPlatform'#22'AnchorSideLeft.Control'#7
+  +#11'grpGenerate'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Con'
+  +'trol'#7#9'grpChecks'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRig'
+  +'ht.Control'#7#11'CodeGenPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#3#148#0#6'Height'#2'v'#3'Top'#3#149#0#5'Width'#3#255#1#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'C'
+  +'aption'#6#17'grpTargetPlatform'#12'ClientHeight'#2'c'#11'ClientWidth'#3#251
+  +#1#8'TabOrder'#2#4#0#6'TLabel'#11'lblTargetOS'#22'AnchorSideLeft.Control'#7
+  +#17'grpTargetPlatform'#21'AnchorSideTop.Control'#7#17'grpTargetPlatform'#4'L'
+  +'eft'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#2'I'#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#11'lblTargetOS'#11'ParentColor'#8#0#0#6'TLabel'#12'lblTarget'
+  +'CPU'#22'AnchorSideLeft.Control'#7#17'grpTargetPlatform'#21'AnchorSideTop.Co'
+  +'ntrol'#7#16'TargetOSComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2#6#6'Height'#2#20#3'Top'#2'%'#5'Width'#2'Q'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#12'lblTargetCPU'#11'ParentColor'#8#0#0#6'TLabel'#17'lblTargeti38'
+  +'6Proc'#22'AnchorSideLeft.Control'#7#17'grpTargetPlatform'#21'AnchorSideTop.'
+  +'Control'#7#17'TargetCPUComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#2#6#6'Height'#2#20#3'Top'#2'D'#5'Width'#2'l'#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#17'lblTargeti386Proc'#11'ParentColor'#8#0#0#9'TComboBox'#16
+  +'TargetOSComboBox'#22'AnchorSideLeft.Control'#7#11'lblTargetOS'#19'AnchorSid'
+  +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'grpTargetPlatform'
+  +#23'AnchorSideRight.Control'#7#17'grpTargetPlatform'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#2'['#6'Height'#2#25#3'Top'#2#6#5'Width'#3#154#1#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactE'
+  +'ndOfLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#20
+  +'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#16'Tar'
+  +'getOSComboBox'#0#0#9'TComboBox'#17'TargetCPUComboBox'#22'AnchorSideLeft.Con'
+  +'trol'#7#12'lblTargetCPU'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSi'
+  +'deTop.Control'#7#16'TargetOSComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#17'grpTargetPlatform'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#2'c'#6'Height'#2#25#3'Top'#2'%'#5'Width'#3#146#1#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbact'
+  +'EndOfLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#20
+  +'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#1#4'Text'#6#17'Tar'
+  +'getCPUComboBox'#0#0#9'TComboBox'#22'Targeti386ProcComboBox'#22'AnchorSideLe'
+  +'ft.Control'#7#17'lblTargeti386Proc'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#17'TargetCPUComboBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#17'grpTargetPlatform'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#4'Left'#2'~'#6'Height'#2#25#3'Top'#2'D'#5'Width'
+  ,#3'w'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11
+  +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'
+  +#2#6#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#2#4'Text'#6
+  +#22'Targeti386ProcComboBox'#0#0#0#9'TGroupBox'#16'grpOptimizations'#22'Ancho'
+  +'rSideLeft.Control'#7#11'CodeGenPage'#21'AnchorSideTop.Control'#7#11'grpGene'
+  +'rate'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#11
+  +'CodeGenPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Co'
+  +'ntrol'#7#11'CodeGenPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2
+  +#6#6'Height'#3#170#0#3'Top'#3#17#1#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#16'grpOptimizations'#12'ClientHeight'#3#151#0#11'ClientWidth'#3#137#2#8'Tab'
+  +'Order'#2#5#0#12'TRadioButton'#15'radOptLevelNone'#22'AnchorSideLeft.Control'
+  +#7#16'grpOptimizations'#21'AnchorSideTop.Control'#7#16'grpOptimizations'#4'L'
+  +'eft'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#135#0#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#15'radOptLevelNone'#7'Checked'#9#5'State'#7#9'cbChecked'#8
+  +'TabOrder'#2#0#0#0#12'TRadioButton'#12'radOptLevel1'#22'AnchorSideLeft.Contr'
+  +'ol'#7#16'grpOptimizations'#21'AnchorSideTop.Control'#7#15'radOptLevelNone'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'
+  +#5'Width'#2'm'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radOptLevel1'#8
+  +'TabOrder'#2#1#0#0#12'TRadioButton'#12'radOptLevel2'#22'AnchorSideLeft.Contr'
+  +'ol'#7#16'grpOptimizations'#21'AnchorSideTop.Control'#7#12'radOptLevel1'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'>'#5
+  +'Width'#2'm'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radOptLevel2'#8'Ta'
+  +'bOrder'#2#2#0#0#12'TRadioButton'#12'radOptLevel3'#22'AnchorSideLeft.Control'
+  +#7#16'grpOptimizations'#21'AnchorSideTop.Control'#7#12'radOptLevel2'#18'Anch'
+  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'Z'#5'Wid'
+  +'th'#2'm'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'radOptLevel3'#8'TabOr'
+  +'der'#2#3#0#0#9'TCheckBox'#15'chkOptVarsInReg'#21'AnchorSideTop.Control'#7#16
+  +'grpOptimizations'#4'Left'#3#205#0#6'Height'#2#22#3'Top'#2#6#5'Width'#3#131#0
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'chkOptVarsInReg'#8'TabOrder'#2
+  +#4#0#0#9'TCheckBox'#15'chkOptUncertain'#21'AnchorSideTop.Control'#7#15'chkOp'
+  +'tVarsInReg'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#205#0#6'Height'
+  +#2#22#3'Top'#2'"'#5'Width'#3#131#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#15'chkOptUncertain'#8'TabOrder'#2#5#0#0#0#0#5'TPage'#11'LinkingPage'#7'Capt'
+  +'ion'#6#11'LinkingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#9
+  +'TGroupBox'#16'grpLinkLibraries'#4'Left'#2#6#6'Height'#2'5'#3'Top'#3#233#0#5
+  +'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#16'grpLinkLibraries'#12'ClientHeight'#2'"'#11'ClientWidth'#3
+  +#137#2#8'TabOrder'#2#0#0#9'TCheckBox'#12'chkLinkSmart'#4'Left'#2#6#6'Height'
+  +#2#22#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#12'chkLinkSmart'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#21'Tar'
+  +'getSpecificsGrpBox'#4'Left'#2#6#6'Height'#2'5'#3'Top'#3'$'#1#5'Width'#3#141
+  +#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#21'TargetSpecificsGrpBox'#12'ClientHeight'#2'"'#11'ClientWidth'#3#137#2#8
+  +'TabOrder'#2#1#0#9'TCheckBox'#18'chkWin32GraphicApp'#4'Left'#2#6#6'Height'#2
+  +#22#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#18'chkWin32GraphicApp'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#10
+  +'grpOptions'#4'Left'#2#6#6'Height'#2'R'#3'Top'#3'_'#1#5'Width'#3#141#2#5'Ali'
+  +'gn'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'g'
+  +'rpOptions'#12'ClientHeight'#2'?'#11'ClientWidth'#3#137#2#8'TabOrder'#2#2#0#9
+  +'TCheckBox'#17'chkOptionsLinkOpt'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Wi'
+  +'dth'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17
   +'chkOptionsLinkOpt'#8'TabOrder'#2#0#0#0#5'TEdit'#17'edtOptionsLinkOpt'#4'Lef'
   +'t'#2#6#6'Height'#2#23#3'Top'#2'"'#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'Bo'
   +'rderSpacing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#17'edtOptionsLinkOpt'#0#0
diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp
index 4e015c0269..d4d9ce28eb 100644
--- a/ide/compileroptionsdlg.pp
+++ b/ide/compileroptionsdlg.pp
@@ -42,7 +42,7 @@ uses
   Graphics, LResources, FileUtil, Dialogs, Controls, GraphType,
   ProjectIntf, IDEWindowIntf, IDEContextHelpEdit,
   PathEditorDlg, LazarusIDEStrConsts, IDEOptionDefs, LazConf, IDEProcs,
-  CompilerOptions, ShowCompilerOpts, Project, PackageDefs;
+  IDEImagesIntf, CompilerOptions, ShowCompilerOpts, Project, PackageDefs;
 
 type
   { Compiler options form }
@@ -271,9 +271,6 @@ type
 
 implementation
 
-uses
-  IDEImagesIntf;
-
 type
   TInheritedNodeData = record
     FullText: string;
@@ -319,15 +316,14 @@ begin
     SetupCompilationTab(Page);
     inc(Page);
     SetupButtonBar;
-    MainNotebook.AnchorToNeighbour(akBottom,6,btnLoadSave);
   finally
     EnableAlign;
   end;
 end;
 
-{------------------------------------------------------------------------------}
-{  TfrmCompilerOptions Destructor                                              }
-{------------------------------------------------------------------------------}
+{------------------------------------------------------------------------------
+  TfrmCompilerOptions Destructor
+------------------------------------------------------------------------------}
 destructor TfrmCompilerOptions.Destroy;
 begin
   ClearInheritedTree;
@@ -1418,7 +1414,7 @@ begin
 
   {------------------------------------------------------------}
 
-  lblIncludeFiles .Caption := dlgCOIncFiles;
+  lblIncludeFiles.Caption := dlgCOIncFiles;
   IncludeFilesPathEditBtn:=TPathEditorButton.Create(Self);
   with IncludeFilesPathEditBtn do begin
     Name:='IncludeFilesPathEditBtn';
@@ -1525,7 +1521,7 @@ begin
     end;
     ItemIndex:=1;
     Constraints.MinWidth:=150;
-    AutoSize:=True;
+    // MG: does not work in win32 intf: AutoSize:=True;
   end;
 end;
 
diff --git a/ideintf/ideimagesintf.pas b/ideintf/ideimagesintf.pas
index 4aa6237d9a..1f217cac07 100644
--- a/ideintf/ideimagesintf.pas
+++ b/ideintf/ideimagesintf.pas
@@ -1,8 +1,29 @@
+{
+ ***************************************************************************
+ *                                                                         *
+ *   This source is free software; you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This code is distributed in the hope that it will be useful, but      *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   General Public License for more details.                              *
+ *                                                                         *
+ *   A copy of the GNU General Public License is available on the World    *
+ *   Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also      *
+ *   obtain it by writing to the Free Software Foundation,                 *
+ *   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.        *
+ *                                                                         *
+ ***************************************************************************
+}
 unit IDEImagesIntf;
 
 {$mode objfpc}{$H+}
 
 interface
+
 uses
   Classes, SysUtils, ImgList, Controls, Graphics, LResources;
 
@@ -167,5 +188,6 @@ initialization
 
 finalization
   FIDEImages.Free;
+  FIDEImages:=nil;
 
 end.
diff --git a/lcl/extdlgs.pas b/lcl/extdlgs.pas
index 77c8da8f77..f68f246450 100644
--- a/lcl/extdlgs.pas
+++ b/lcl/extdlgs.pas
@@ -348,7 +348,6 @@ var
   CurFilename: String;
   FileIsValid: boolean;
 begin
-  //DebugLn(['TOpenPictureDialog.UpdatePreview ']);
   CurFilename := FileName;
   if CurFilename = FPreviewFilename then exit;
 
@@ -371,8 +370,8 @@ end;
 constructor TOpenPictureDialog.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
-  FDefaultFilter := GraphicFilter(TGraphic)+'|'+Format(rsAllFiles,
-  [GetAllFilesMask, GetAllFilesMask,'']);
+  FDefaultFilter := GraphicFilter(TGraphic)+'|'+
+                       Format(rsAllFiles,[GetAllFilesMask, GetAllFilesMask,'']);
   Filter:=FDefaultFilter;
 
   FPictureGroupBox:=TGroupBox.Create(Self);
@@ -437,7 +436,7 @@ const
    );
   BtnCaptions: array[cbSgn..cbMC] of String =
    ('±', ',', '/', '*', '-', '+', 'sqrt', '%', '1/x', '=', '<-', 'C',
-    'MP', 'MS', 'MR', 'MC');
+    'MP','MS','MR','MC');
 
 { ---------------------------------------------------------------------
   Auxiliary
diff --git a/lcl/interfaces/gtk/gtk1object.inc b/lcl/interfaces/gtk/gtk1object.inc
index 9f498109e8..420a847790 100644
--- a/lcl/interfaces/gtk/gtk1object.inc
+++ b/lcl/interfaces/gtk/gtk1object.inc
@@ -4332,6 +4332,7 @@ var
   FileSelWidget: PGtkFileSelection;
   InitialFilter: string;
 begin
+  DebugLn(['TGtkWidgetSet.InitializeOpenDialog ']);
   FileSelWidget:=GTK_FILE_SELECTION(SelWidget);
 
   // Help button
@@ -4419,6 +4420,7 @@ end;
 procedure TGtkWidgetSet.InitializeFileDialog(FileDialog: TFileDialog;
   var SelWidget: PGtkWidget; Title: PChar);
 begin
+  //DebugLn(['TGtkWidgetSet.InitializeFileDialog ']);
   SelWidget := gtk_file_selection_new(Title);
 
   {****This is a major hack put by Cliff Baeseman to solve
diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc
index 4c21aa6867..61bf3e2f30 100644
--- a/lcl/interfaces/gtk/gtkcallback.inc
+++ b/lcl/interfaces/gtk/gtkcallback.inc
@@ -2283,6 +2283,7 @@ var
   Filename, OldFilename, Details: string;
   Widget: PGtkWidget;
 begin
+  //DebugLn(['UpdateDetailView ']);
   Widget:=PGtkWidget(OpenDialog.Handle);
   {$IfDef GTK2}
   FileName:=gtk_file_chooser_get_filename(PGtkFileChooser(Widget));
diff --git a/lcl/interfaces/gtk2/gtk2object.inc b/lcl/interfaces/gtk2/gtk2object.inc
index 6100b9744e..d746b0e896 100644
--- a/lcl/interfaces/gtk2/gtk2object.inc
+++ b/lcl/interfaces/gtk2/gtk2object.inc
@@ -135,6 +135,7 @@ var
   GtkFilterList: PGSList;
   NewFilterIndex: Integer;
 begin
+  //DebugLn(['Gtk2FileChooserNotifyCB ']);
   if pspec^.name = 'filter' then
   begin // filter changed
     theDialog := TFileDialog(user_data);
@@ -165,6 +166,7 @@ var
   cFilenames1: PGSList;
   Files: TStringList;
 begin
+  //DebugLn(['Gtk2FileChooserResponseCB ']);
   theDialog := TFileDialog(data);
 
   if arg1 = GTK_RESPONSE_CANCEL then begin  
@@ -208,6 +210,24 @@ begin
   theDialog.UserChoice := mrOK;
 end;
 
+procedure gtkFileChooserSelectionChangedCB(Chooser: PGtkFileChooser;
+  Data: Pointer); cdecl;
+var
+  cFilename: Pgchar;
+  theDialog: TFileDialog;
+begin
+  //DebugLn(['gtkFileChooserSelectionChangedCB ']);
+  cFilename := gtk_file_chooser_get_filename(Chooser);
+  theDialog:=TFileDialog(Data);
+  try
+    if theDialog is TOpenDialog then
+      UpdateDetailView(TOpenDialog(theDialog));
+  finally
+    if Assigned(cFilename) then
+      g_free(cFilename);
+  end;
+end;
+
 Procedure gtk_clb_toggle(cellrenderertoggle : PGtkCellRendererToggle; arg1 : PGChar;
                          WinControl: TWinControl); cdecl;
 var
@@ -676,6 +696,11 @@ begin
   // Filter
   CreateOpenDialogFilter(OpenDialog,SelWidget);
 
+  // connect change event
+  g_signal_connect( gtk_object(FileSelWidget),
+    'selection-changed', gtk_signal_func(@gtkFileChooserSelectionChangedCB),
+    OpenDialog);
+
   (*  TODO
   // Details - a frame with a label
   if (ofViewDetail in OpenDialog.Options) then begin