diff --git a/designer/anchoreditor.lfm b/designer/anchoreditor.lfm
index 0c7ff9c249..07b26d35fe 100644
--- a/designer/anchoreditor.lfm
+++ b/designer/anchoreditor.lfm
@@ -7,7 +7,7 @@ object AnchorDesigner: TAnchorDesigner
   OnCreate = AnchorDesignerCreate
   OnDestroy = AnchorDesignerDestroy
   OnShow = AnchorDesignerShow
-  PixelsPerInch = 96
+  PixelsPerInch = 112
   Position = poScreenCenter
   HorzScrollBar.Page = 519
   VertScrollBar.Page = 258
@@ -18,7 +18,7 @@ object AnchorDesigner: TAnchorDesigner
   object BorderSpaceGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'BorderSpaceGroupBox'
-    ClientHeight = 86
+    ClientHeight = 87
     ClientWidth = 168
     TabOrder = 0
     Left = 172
@@ -30,6 +30,7 @@ object AnchorDesigner: TAnchorDesigner
       ParentShowHint = False
       ShowHint = True
       TabOrder = 0
+      Value = 1
       Height = 20
       Top = 30
       Width = 56
@@ -39,6 +40,7 @@ object AnchorDesigner: TAnchorDesigner
       ParentShowHint = False
       ShowHint = True
       TabOrder = 1
+      Value = 1
       Left = 118
       Height = 20
       Top = 30
@@ -49,6 +51,7 @@ object AnchorDesigner: TAnchorDesigner
       ParentShowHint = False
       ShowHint = True
       TabOrder = 2
+      Value = 1
       Left = 58
       Height = 20
       Width = 56
@@ -58,6 +61,7 @@ object AnchorDesigner: TAnchorDesigner
       ParentShowHint = False
       ShowHint = True
       TabOrder = 3
+      Value = 1
       Left = 58
       Height = 20
       Top = 57
@@ -68,6 +72,7 @@ object AnchorDesigner: TAnchorDesigner
       ParentShowHint = False
       ShowHint = True
       TabOrder = 4
+      Value = 1
       Left = 58
       Height = 20
       Top = 30
@@ -77,7 +82,7 @@ object AnchorDesigner: TAnchorDesigner
   object TopGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akRight]
     Caption = 'TopGroupBox'
-    ClientHeight = 32
+    ClientHeight = 33
     ClientWidth = 404
     TabOrder = 1
     Left = 64
@@ -85,8 +90,10 @@ object AnchorDesigner: TAnchorDesigner
     Width = 408
     object TopRefTopSpeedButton: TSpeedButton
       Anchors = [akTop, akRight]
+      Color = clBtnFace
       GroupIndex = 1
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -96,8 +103,10 @@ object AnchorDesigner: TAnchorDesigner
     end
     object TopRefBottomSpeedButton: TSpeedButton
       Anchors = [akTop, akRight]
+      Color = clBtnFace
       GroupIndex = 1
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -107,8 +116,10 @@ object AnchorDesigner: TAnchorDesigner
     end
     object TopRefCenterSpeedButton: TSpeedButton
       Anchors = [akTop, akRight]
+      Color = clBtnFace
       GroupIndex = 1
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -151,7 +162,7 @@ object AnchorDesigner: TAnchorDesigner
   object BottomGroupBox: TGroupBox
     Anchors = [akLeft, akRight, akBottom]
     Caption = 'BottomGroupBox'
-    ClientHeight = 32
+    ClientHeight = 33
     ClientWidth = 404
     TabOrder = 2
     Left = 64
@@ -160,8 +171,10 @@ object AnchorDesigner: TAnchorDesigner
     Width = 408
     object BottomRefTopSpeedButton: TSpeedButton
       Anchors = [akTop, akRight]
+      Color = clBtnFace
       GroupIndex = 3
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -171,8 +184,10 @@ object AnchorDesigner: TAnchorDesigner
     end
     object BottomRefBottomSpeedButton: TSpeedButton
       Anchors = [akTop, akRight]
+      Color = clBtnFace
       GroupIndex = 3
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -182,8 +197,10 @@ object AnchorDesigner: TAnchorDesigner
     end
     object BottomRefCenterSpeedButton: TSpeedButton
       Anchors = [akTop, akRight]
+      Color = clBtnFace
       GroupIndex = 3
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -226,7 +243,7 @@ object AnchorDesigner: TAnchorDesigner
   object RightGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'RightGroupBox'
-    ClientHeight = 111
+    ClientHeight = 112
     ClientWidth = 146
     TabOrder = 3
     Left = 364
@@ -234,8 +251,10 @@ object AnchorDesigner: TAnchorDesigner
     Top = 64
     Width = 150
     object RightRefLeftSpeedButton: TSpeedButton
+      Color = clBtnFace
       GroupIndex = 4
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -245,8 +264,10 @@ object AnchorDesigner: TAnchorDesigner
       Width = 30
     end
     object RightRefRightSpeedButton: TSpeedButton
+      Color = clBtnFace
       GroupIndex = 4
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -256,8 +277,10 @@ object AnchorDesigner: TAnchorDesigner
       Width = 30
     end
     object RightRefCenterSpeedButton: TSpeedButton
+      Color = clBtnFace
       GroupIndex = 4
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -302,7 +325,7 @@ object AnchorDesigner: TAnchorDesigner
   object LeftGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'LeftGroupBox'
-    ClientHeight = 111
+    ClientHeight = 112
     ClientWidth = 146
     TabOrder = 4
     Left = 8
@@ -310,8 +333,10 @@ object AnchorDesigner: TAnchorDesigner
     Top = 64
     Width = 150
     object LeftRefLeftSpeedButton: TSpeedButton
+      Color = clBtnFace
       GroupIndex = 2
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -321,8 +346,10 @@ object AnchorDesigner: TAnchorDesigner
       Width = 30
     end
     object LeftRefRightSpeedButton: TSpeedButton
+      Color = clBtnFace
       GroupIndex = 2
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
@@ -332,8 +359,10 @@ object AnchorDesigner: TAnchorDesigner
       Width = 30
     end
     object LeftRefCenterSpeedButton: TSpeedButton
+      Color = clBtnFace
       GroupIndex = 2
       NumGlyphs = 0
+      Transparent = False
       OnClick = ReferenceSideButtonClicked
       ShowHint = True
       ParentShowHint = False
diff --git a/designer/anchoreditor.lrs b/designer/anchoreditor.lrs
index 168efe34f3..971e5f8d0b 100644
--- a/designer/anchoreditor.lrs
+++ b/designer/anchoreditor.lrs
@@ -5,109 +5,116 @@ LazarusResources.Add('TAnchorDesigner','FORMDATA',[
   +'erSpaceSpinEdit'#7'Caption'#6#14'AnchorDesigner'#12'ClientHeight'#3#3#1#11
   +'ClientWidth'#3#8#2#7'OnClose'#7#19'AnchorDesignerClose'#8'OnCreate'#7#20'An'
   +'chorDesignerCreate'#9'OnDestroy'#7#21'AnchorDesignerDestroy'#6'OnShow'#7#18
-  +'AnchorDesignerShow'#13'PixelsPerInch'#2'`'#8'Position'#7#14'poScreenCenter'
+  +'AnchorDesignerShow'#13'PixelsPerInch'#2'p'#8'Position'#7#14'poScreenCenter'
   +#18'HorzScrollBar.Page'#3#7#2#18'VertScrollBar.Page'#3#2#1#4'Left'#3'*'#1#6
   +'Height'#3#3#1#3'Top'#3#179#0#5'Width'#3#8#2#0#9'TGroupBox'#19'BorderSpaceGr'
   +'oupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#7'Caption'#6#19'Bord'
-  +'erSpaceGroupBox'#12'ClientHeight'#2'V'#11'ClientWidth'#3#168#0#8'TabOrder'#2
+  +'erSpaceGroupBox'#12'ClientHeight'#2'W'#11'ClientWidth'#3#168#0#8'TabOrder'#2
   +#0#4'Left'#3#172#0#6'Height'#2'h'#3'Top'#2'P'#5'Width'#3#172#0#0#9'TSpinEdit'
   +#23'LeftBorderSpaceSpinEdit'#8'OnChange'#7#25'BorderSpaceSpinEditChange'#14
-  +'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#6'Height'#2#20#3'Top'#2#30#5
-  +'Width'#2'8'#0#0#9'TSpinEdit'#24'RightBorderSpaceSpinEdit'#8'OnChange'#7#25
-  +'BorderSpaceSpinEditChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2
-  +#1#4'Left'#2'v'#6'Height'#2#20#3'Top'#2#30#5'Width'#2'8'#0#0#9'TSpinEdit'#22
-  +'TopBorderSpaceSpinEdit'#8'OnChange'#7#25'BorderSpaceSpinEditChange'#14'Pare'
-  +'ntShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#2#4'Left'#2':'#6'Height'#2#20#5'W'
-  +'idth'#2'8'#0#0#9'TSpinEdit'#25'BottomBorderSpaceSpinEdit'#8'OnChange'#7#25
-  +'BorderSpaceSpinEditChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2
-  +#3#4'Left'#2':'#6'Height'#2#20#3'Top'#2'9'#5'Width'#2'8'#0#0#9'TSpinEdit'#25
-  +'AroundBorderSpaceSpinEdit'#8'OnChange'#7#25'BorderSpaceSpinEditChange'#14'P'
-  +'arentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#4#4'Left'#2':'#6'Height'#2#20#3
-  +'Top'#2#30#5'Width'#2'8'#0#0#0#9'TGroupBox'#11'TopGroupBox'#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#11'TopGroupBox'#12'ClientHeight'
-  +#2' '#11'ClientWidth'#3#148#1#8'TabOrder'#2#1#4'Left'#2'@'#6'Height'#2'2'#5
-  +'Width'#3#152#1#0#12'TSpeedButton'#20'TopRefTopSpeedButton'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#26'Ref'
-  +'erenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3'('#1#6
-  +'Height'#2#30#5'Width'#2#30#0#0#12'TSpeedButton'#23'TopRefBottomSpeedButton'
-  +#7'Anchors'#11#5'akTop'#7'akRight'#0#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#7'O'
-  +'nClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8
+  +'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#5'Value'#2#1#6'Height'#2#20
+  +#3'Top'#2#30#5'Width'#2'8'#0#0#9'TSpinEdit'#24'RightBorderSpaceSpinEdit'#8'O'
+  +'nChange'#7#25'BorderSpaceSpinEditChange'#14'ParentShowHint'#8#8'ShowHint'#9
+  +#8'TabOrder'#2#1#5'Value'#2#1#4'Left'#2'v'#6'Height'#2#20#3'Top'#2#30#5'Widt'
+  +'h'#2'8'#0#0#9'TSpinEdit'#22'TopBorderSpaceSpinEdit'#8'OnChange'#7#25'Border'
+  +'SpaceSpinEditChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#2#5'V'
+  +'alue'#2#1#4'Left'#2':'#6'Height'#2#20#5'Width'#2'8'#0#0#9'TSpinEdit'#25'Bot'
+  +'tomBorderSpaceSpinEdit'#8'OnChange'#7#25'BorderSpaceSpinEditChange'#14'Pare'
+  +'ntShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#3#5'Value'#2#1#4'Left'#2':'#6'Hei'
+  +'ght'#2#20#3'Top'#2'9'#5'Width'#2'8'#0#0#9'TSpinEdit'#25'AroundBorderSpaceSp'
+  +'inEdit'#8'OnChange'#7#25'BorderSpaceSpinEditChange'#14'ParentShowHint'#8#8
+  +'ShowHint'#9#8'TabOrder'#2#4#5'Value'#2#1#4'Left'#2':'#6'Height'#2#20#3'Top'
+  +#2#30#5'Width'#2'8'#0#0#0#9'TGroupBox'#11'TopGroupBox'#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#7'Caption'#6#11'TopGroupBox'#12'ClientHeight'#2'!'#11
+  +'ClientWidth'#3#148#1#8'TabOrder'#2#1#4'Left'#2'@'#6'Height'#2'2'#5'Width'#3
+  +#152#1#0#12'TSpeedButton'#20'TopRefTopSpeedButton'#7'Anchors'#11#5'akTop'#7
+  +'akRight'#0#5'Color'#7#9'clBtnFace'#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#11'T'
+  +'ransparent'#8#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14
+  +'ParentShowHint'#8#4'Left'#3'('#1#6'Height'#2#30#5'Width'#2#30#0#0#12'TSpeed'
+  +'Button'#23'TopRefBottomSpeedButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#5'C'
+  +'olor'#7#9'clBtnFace'#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#11'Transparent'#8#7
+  +'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8
   +#4'Left'#3'K'#1#6'Height'#2#30#5'Width'#2#30#0#0#12'TSpeedButton'#23'TopRefC'
-  +'enterSpeedButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#10'GroupIndex'#2#1#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14
-  +'ParentShowHint'#8#4'Left'#3'n'#1#6'Height'#2#30#5'Width'#2#30#0#0#6'TLabel'
-  +#15'TopSiblingLabel'#7'Caption'#6#7'Sibling'#5'Color'#7#6'clNone'#11'ParentC'
-  +'olor'#8#4'Left'#2'^'#6'Height'#2#14#3'Top'#2#4#5'Width'#2#31#0#0#9'TCheckBo'
-  +'x'#19'TopAnchoredCheckBox'#7'Caption'#6#7'Enabled'#8'OnChange'#7#27'AnchorE'
-  +'nabledCheckBoxChange'#8'TabOrder'#2#0#11'UseOnChange'#9#4'Left'#2#2#6'Heigh'
-  +'t'#2#13#5'Width'#2';'#0#0#9'TComboBox'#18'TopSiblingComboBox'#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineCo'
-  +'mplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#21'Siblin'
-  +'gComboBoxChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#4'Text'
-  +#6#18'TopSiblingComboBox'#4'Left'#3#158#0#6'Height'#2#21#5'Width'#3#129#0#0#0
-  +#0#9'TGroupBox'#14'BottomGroupBox'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBo'
-  +'ttom'#0#7'Caption'#6#14'BottomGroupBox'#12'ClientHeight'#2' '#11'ClientWidt'
-  +'h'#3#148#1#8'TabOrder'#2#2#4'Left'#2'@'#6'Height'#2'2'#3'Top'#3#200#0#5'Wid'
-  +'th'#3#152#1#0#12'TSpeedButton'#23'BottomRefTopSpeedButton'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#10'GroupIndex'#2#3#9'NumGlyphs'#2#0#7'OnClick'#7#26'Ref'
-  +'erenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3'('#1#6
-  +'Height'#2#30#5'Width'#2#30#0#0#12'TSpeedButton'#26'BottomRefBottomSpeedButt'
-  +'on'#7'Anchors'#11#5'akTop'#7'akRight'#0#10'GroupIndex'#2#3#9'NumGlyphs'#2#0
-  +#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'
-  +#8#4'Left'#3'K'#1#6'Height'#2#30#5'Width'#2#30#0#0#12'TSpeedButton'#26'Botto'
-  +'mRefCenterSpeedButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#10'GroupIndex'#2
-  +#3#9'NumGlyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9
-  +#14'ParentShowHint'#8#4'Left'#3'n'#1#6'Height'#2#30#5'Width'#2#30#0#0#6'TLab'
-  +'el'#18'BottomSiblingLabel'#7'Caption'#6#7'Sibling'#5'Color'#7#6'clNone'#11
-  +'ParentColor'#8#4'Left'#2'^'#6'Height'#2#14#3'Top'#2#8#5'Width'#2#31#0#0#9'T'
-  +'CheckBox'#22'BottomAnchoredCheckBox'#7'Caption'#6#7'Enabled'#8'OnChange'#7
-  +#27'AnchorEnabledCheckBoxChange'#8'TabOrder'#2#0#11'UseOnChange'#9#4'Left'#2
-  +#2#6'Height'#2#13#5'Width'#2';'#0#0#9'TComboBox'#21'BottomSiblingComboBox'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbac'
-  +'tEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'
-  ,#7#21'SiblingComboBoxChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2
-  +#1#4'Text'#6#21'BottomSiblingComboBox'#4'Left'#3#158#0#6'Height'#2#21#5'Widt'
-  +'h'#3#129#0#0#0#0#9'TGroupBox'#13'RightGroupBox'#7'Anchors'#11#5'akTop'#6'ak'
-  +'Left'#8'akBottom'#0#7'Caption'#6#13'RightGroupBox'#12'ClientHeight'#2'o'#11
-  +'ClientWidth'#3#146#0#8'TabOrder'#2#3#4'Left'#3'l'#1#6'Height'#3#129#0#3'Top'
-  +#2'@'#5'Width'#3#150#0#0#12'TSpeedButton'#23'RightRefLeftSpeedButton'#10'Gro'
-  +'upIndex'#2#4#9'NumGlyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8
-  +'ShowHint'#9#14'ParentShowHint'#8#4'Left'#2#5#6'Height'#2#30#3'Top'#2'Q'#5'W'
-  +'idth'#2#30#0#0#12'TSpeedButton'#24'RightRefRightSpeedButton'#10'GroupIndex'
-  +#2#4#9'NumGlyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'
-  +#9#14'ParentShowHint'#8#4'Left'#2'('#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30
-  +#0#0#12'TSpeedButton'#25'RightRefCenterSpeedButton'#10'GroupIndex'#2#4#9'Num'
-  +'Glyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'Pa'
-  +'rentShowHint'#8#4'Left'#2'K'#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30#0#0#6
-  +'TLabel'#17'RightSiblingLabel'#7'Caption'#6#7'Sibling'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#4'Left'#2#2#6'Height'#2#14#3'Top'#2#28#5'Width'#2#31#0#0#9
-  +'TCheckBox'#21'RightAnchoredCheckBox'#7'Caption'#6#7'Enabled'#8'OnChange'#7
-  +#27'AnchorEnabledCheckBoxChange'#8'TabOrder'#2#0#11'UseOnChange'#9#4'Left'#2
-  +#2#6'Height'#2#13#5'Width'#2';'#0#0#9'TComboBox'#20'RightSiblingComboBox'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbac'
-  +'tEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'
-  +#7#21'SiblingComboBoxChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2
-  +#1#4'Text'#6#20'RightSiblingComboBox'#4'Left'#2#5#6'Height'#2#21#3'Top'#2'1'
-  +#5'Width'#3#135#0#0#0#0#9'TGroupBox'#12'LeftGroupBox'#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#8'akBottom'#0#7'Caption'#6#12'LeftGroupBox'#12'ClientHeight'#2'o'
-  +#11'ClientWidth'#3#146#0#8'TabOrder'#2#4#4'Left'#2#8#6'Height'#3#129#0#3'Top'
-  +#2'@'#5'Width'#3#150#0#0#12'TSpeedButton'#22'LeftRefLeftSpeedButton'#10'Grou'
-  +'pIndex'#2#2#9'NumGlyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8
-  +'ShowHint'#9#14'ParentShowHint'#8#4'Left'#2#5#6'Height'#2#30#3'Top'#2'Q'#5'W'
-  +'idth'#2#30#0#0#12'TSpeedButton'#23'LeftRefRightSpeedButton'#10'GroupIndex'#2
-  +#2#9'NumGlyphs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9
+  +'enterSpeedButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#5'Color'#7#9'clBtnFac'
+  +'e'#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7#26'Re'
+  +'ferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3'n'#1
+  +#6'Height'#2#30#5'Width'#2#30#0#0#6'TLabel'#15'TopSiblingLabel'#7'Caption'#6
+  +#7'Sibling'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2'^'#6'Height'#2
+  +#14#3'Top'#2#4#5'Width'#2#31#0#0#9'TCheckBox'#19'TopAnchoredCheckBox'#7'Capt'
+  +'ion'#6#7'Enabled'#8'OnChange'#7#27'AnchorEnabledCheckBoxChange'#8'TabOrder'
+  +#2#0#11'UseOnChange'#9#4'Left'#2#2#6'Height'#2#13#5'Width'#2';'#0#0#9'TCombo'
+  +'Box'#18'TopSiblingComboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16
+  +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9
+  +'MaxLength'#2#0#8'OnChange'#7#21'SiblingComboBoxChange'#14'ParentShowHint'#8
+  +#8'ShowHint'#9#8'TabOrder'#2#1#4'Text'#6#18'TopSiblingComboBox'#4'Left'#3#158
+  +#0#6'Height'#2#21#5'Width'#3#129#0#0#0#0#9'TGroupBox'#14'BottomGroupBox'#7'A'
+  +'nchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#14'BottomGroupBo'
+  +'x'#12'ClientHeight'#2'!'#11'ClientWidth'#3#148#1#8'TabOrder'#2#2#4'Left'#2
+  +'@'#6'Height'#2'2'#3'Top'#3#200#0#5'Width'#3#152#1#0#12'TSpeedButton'#23'Bot'
+  +'tomRefTopSpeedButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#5'Color'#7#9'clBt'
+  +'nFace'#10'GroupIndex'#2#3#9'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7#26
+  +'ReferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3'('
+  +#1#6'Height'#2#30#5'Width'#2#30#0#0#12'TSpeedButton'#26'BottomRefBottomSpeed'
+  +'Button'#7'Anchors'#11#5'akTop'#7'akRight'#0#5'Color'#7#9'clBtnFace'#10'Grou'
+  +'pIndex'#2#3#9'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7#26'ReferenceSid'
+  +'eButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3'K'#1#6'Height'
+  +#2#30#5'Width'#2#30#0#0#12'TSpeedButton'#26'BottomRefCenterSpeedButton'#7'An'
+  +'chors'#11#5'akTop'#7'akRight'#0#5'Color'#7#9'clBtnFace'#10'GroupIndex'#2#3#9
+  +'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7#26'ReferenceSideButtonClicked'
+  +#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3'n'#1#6'Height'#2#30#5'Width'#2
+  +#30#0#0#6'TLabel'#18'BottomSiblingLabel'#7'Caption'#6#7'Sibling'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#4'Left'#2'^'#6'Height'#2#14#3'Top'#2#8#5'Width'#2
+  +#31#0#0#9'TCheckBox'#22'BottomAnchoredCheckBox'#7'Caption'#6#7'Enabled'#8'On'
+  ,'Change'#7#27'AnchorEnabledCheckBoxChange'#8'TabOrder'#2#0#11'UseOnChange'#9
+  +#4'Left'#2#2#6'Height'#2#13#5'Width'#2';'#0#0#9'TComboBox'#21'BottomSiblingC'
+  +'omboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'
+  +#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8
+  +'OnChange'#7#21'SiblingComboBoxChange'#14'ParentShowHint'#8#8'ShowHint'#9#8
+  +'TabOrder'#2#1#4'Text'#6#21'BottomSiblingComboBox'#4'Left'#3#158#0#6'Height'
+  +#2#21#5'Width'#3#129#0#0#0#0#9'TGroupBox'#13'RightGroupBox'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#8'akBottom'#0#7'Caption'#6#13'RightGroupBox'#12'ClientHeig'
+  +'ht'#2'p'#11'ClientWidth'#3#146#0#8'TabOrder'#2#3#4'Left'#3'l'#1#6'Height'#3
+  +#129#0#3'Top'#2'@'#5'Width'#3#150#0#0#12'TSpeedButton'#23'RightRefLeftSpeedB'
+  +'utton'#5'Color'#7#9'clBtnFace'#10'GroupIndex'#2#4#9'NumGlyphs'#2#0#11'Trans'
+  +'parent'#8#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'Pare'
+  +'ntShowHint'#8#4'Left'#2#5#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30#0#0#12'T'
+  +'SpeedButton'#24'RightRefRightSpeedButton'#5'Color'#7#9'clBtnFace'#10'GroupI'
+  +'ndex'#2#4#9'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7#26'ReferenceSideB'
+  +'uttonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#2'('#6'Height'#2#30
+  +#3'Top'#2'Q'#5'Width'#2#30#0#0#12'TSpeedButton'#25'RightRefCenterSpeedButton'
+  +#5'Color'#7#9'clBtnFace'#10'GroupIndex'#2#4#9'NumGlyphs'#2#0#11'Transparent'
+  +#8#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHi'
+  +'nt'#8#4'Left'#2'K'#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30#0#0#6'TLabel'#17
+  +'RightSiblingLabel'#7'Caption'#6#7'Sibling'#5'Color'#7#6'clNone'#11'ParentCo'
+  +'lor'#8#4'Left'#2#2#6'Height'#2#14#3'Top'#2#28#5'Width'#2#31#0#0#9'TCheckBox'
+  +#21'RightAnchoredCheckBox'#7'Caption'#6#7'Enabled'#8'OnChange'#7#27'AnchorEn'
+  +'abledCheckBoxChange'#8'TabOrder'#2#0#11'UseOnChange'#9#4'Left'#2#2#6'Height'
+  +#2#13#5'Width'#2';'#0#0#9'TComboBox'#20'RightSiblingComboBox'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComp'
+  +'lete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#21'SiblingC'
+  +'omboBoxChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#4'Text'#6
+  +#20'RightSiblingComboBox'#4'Left'#2#5#6'Height'#2#21#3'Top'#2'1'#5'Width'#3
+  +#135#0#0#0#0#9'TGroupBox'#12'LeftGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8
+  +'akBottom'#0#7'Caption'#6#12'LeftGroupBox'#12'ClientHeight'#2'p'#11'ClientWi'
+  +'dth'#3#146#0#8'TabOrder'#2#4#4'Left'#2#8#6'Height'#3#129#0#3'Top'#2'@'#5'Wi'
+  +'dth'#3#150#0#0#12'TSpeedButton'#22'LeftRefLeftSpeedButton'#5'Color'#7#9'clB'
+  +'tnFace'#10'GroupIndex'#2#2#9'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7
+  +#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#2
+  +#5#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30#0#0#12'TSpeedButton'#23'LeftRefR'
+  +'ightSpeedButton'#5'Color'#7#9'clBtnFace'#10'GroupIndex'#2#2#9'NumGlyphs'#2#0
+  +#11'Transparent'#8#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9
   +#14'ParentShowHint'#8#4'Left'#2'('#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30#0
-  +#0#12'TSpeedButton'#24'LeftRefCenterSpeedButton'#10'GroupIndex'#2#2#9'NumGly'
-  +'phs'#2#0#7'OnClick'#7#26'ReferenceSideButtonClicked'#8'ShowHint'#9#14'Paren'
-  +'tShowHint'#8#4'Left'#2'K'#6'Height'#2#30#3'Top'#2'Q'#5'Width'#2#30#0#0#6'TL'
-  +'abel'#16'LeftSiblingLabel'#7'Caption'#6#7'Sibling'#5'Color'#7#6'clNone'#11
-  +'ParentColor'#8#4'Left'#2#2#6'Height'#2#14#3'Top'#2#28#5'Width'#2#31#0#0#9'T'
-  +'CheckBox'#20'LeftAnchoredCheckBox'#7'Caption'#6#7'Enabled'#8'OnChange'#7#27
-  +'AnchorEnabledCheckBoxChange'#8'TabOrder'#2#0#11'UseOnChange'#9#4'Left'#2#2#6
-  +'Height'#2#13#5'Width'#2';'#0#0#9'TComboBox'#19'LeftSiblingComboBox'#7'Ancho'
-  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndO'
-  +'fLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#21
-  +'SiblingComboBoxChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#4
-  +'Text'#6#19'LeftSiblingComboBox'#4'Left'#2#5#6'Height'#2#21#3'Top'#2'1'#5'Wi'
-  +'dth'#3#134#0#0#0#0#0
+  +#0#12'TSpeedButton'#24'LeftRefCenterSpeedButton'#5'Color'#7#9'clBtnFace'#10
+  +'GroupIndex'#2#2#9'NumGlyphs'#2#0#11'Transparent'#8#7'OnClick'#7#26'Referenc'
+  +'eSideButtonClicked'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#2'K'#6'Heigh'
+  +'t'#2#30#3'Top'#2'Q'#5'Width'#2#30#0#0#6'TLabel'#16'LeftSiblingLabel'#7'Capt'
+  +'ion'#6#7'Sibling'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#2#6'Heig'
+  +'ht'#2#14#3'Top'#2#28#5'Width'#2#31#0#0#9'TCheckBox'#20'LeftAnchoredCheckBox'
+  +#7'Caption'#6#7'Enabled'#8'OnChange'#7#27'AnchorEnabledCheckBoxChange'#8'Tab'
+  +'Order'#2#0#11'UseOnChange'#9#4'Left'#2#2#6'Height'#2#13#5'Width'#2';'#0#0#9
+  +'TComboBox'#19'LeftSiblingComboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
+  +'ht'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAsce'
+  +'nding'#0#9'MaxLength'#2#0#8'OnChange'#7#21'SiblingComboBoxChange'#14'Parent'
+  +'ShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#4'Text'#6#19'LeftSiblingComboBox'
+  +#4'Left'#2#5#6'Height'#2#21#3'Top'#2'1'#5'Width'#3#134#0#0#0#0#0
 ]);
diff --git a/ide/helpfpcmessages.pas b/ide/helpfpcmessages.pas
index a12d04aa0c..1fcd607c8b 100644
--- a/ide/helpfpcmessages.pas
+++ b/ide/helpfpcmessages.pas
@@ -126,7 +126,6 @@ var
   sl: TStringList;
   p: Integer;
   TagStart: LongInt;
-  Level: Integer;
 begin
   Result:='';
   sl:=TStringList.Create;
diff --git a/ide/helpmanager.pas b/ide/helpmanager.pas
index 44956ea247..ce058dc0fe 100644
--- a/ide/helpmanager.pas
+++ b/ide/helpmanager.pas
@@ -452,9 +452,12 @@ function THelpManager.ShowHelpForSourcePosition(const Filename: string;
   procedure FindHelpForFPCKeyWord(const KeyWord: string);
   var
     RefFilename: String;
-    sl: TStringList;
     i: Integer;
     List: TStrings;
+    Line: string;
+    FileStartPos: Integer;
+    FileEndPos: LongInt;
+    HTMLFilename: String;
   begin
     if Keyword='' then exit;
     RefFilename:=HelpOpts.FPCDocsHTMLDirectory;
@@ -466,7 +469,22 @@ function THelpManager.ShowHelpForSourcePosition(const Filename: string;
       if LoadStringListFromFile(RefFilename,'FPC keyword list',List)<>mrOk then
         exit;
       for i:=0 to List.Count-1 do begin
+        // example: integer=refsu5.html#keyword:integer
+        Line:=List[i];
+        if (length(Line)>length(KeyWord))
+        and (Line[length(KeyWord)+1]='=')
+        and (SysUtils.CompareText(KeyWord,copy(Line,1,length(KeyWord)))=0) then
+        begin
+          FileStartPos:=length(KeyWord)+2;
+          FileEndPos:=FileStartPos;
+          while (FileEndPos<=length(Line)) and (Line[FileEndPos]<>'#') do
+            inc(FileEndPos);
+          HTMLFilename:=copy(Line,FileStartPos,FileEndPos-FileStartPos);
+          HTMLFilename:=AppendPathDelim(HelpOpts.FPCDocsHTMLDirectory)+'ref'
+                        +PathDelim+HTMLFilename;
 
+          break;
+        end;
       end;
     finally
       List.Free;
diff --git a/ide/helpoptions.lfm b/ide/helpoptions.lfm
index 7dd46f8530..c8b38c679a 100644
--- a/ide/helpoptions.lfm
+++ b/ide/helpoptions.lfm
@@ -6,7 +6,7 @@ object HelpOptionsDialog: THelpOptionsDialog
   ClientWidth = 500
   OnClose = HelpOptionsDialogClose
   OnCreate = HelpOptionsDialogCreate
-  PixelsPerInch = 96
+  PixelsPerInch = 112
   Position = poScreenCenter
   HorzScrollBar.Page = 499
   VertScrollBar.Page = 299
@@ -22,15 +22,60 @@ object HelpOptionsDialog: THelpOptionsDialog
     PageIndex = 0
     AnchorSideBottom.Control = OkButton
     Left = 6
-    Height = 248
+    Height = 254
     Top = 6
     Width = 488
+    object GeneralPage: TPage
+      Caption = 'GeneralPage'
+      ClientWidth = 484
+      ClientHeight = 224
+      Left = 2
+      Height = 224
+      Top = 28
+      Width = 484
+      object FPCDocHTMLLabel: TLabel
+        Caption = 'FPCDocHTMLLabel'
+        Color = clNone
+        ParentColor = False
+        AnchorSideTop.Control = FPCDocHTMLBrowseButton
+        AnchorSideTop.Side = asrCenter
+        Left = 14
+        Height = 13
+        Top = 16
+        Width = 114
+      end
+      object FPCDocHTMLEdit: TEdit
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Left = 6
+        TabOrder = 0
+        Text = 'FPCDocHTMLEdit'
+        AnchorSideLeft.Control = FPCDocHTMLLabel
+        AnchorSideLeft.Side = asrBottom
+        Left = 134
+        Height = 23
+        Top = 10
+        Width = 308
+      end
+      object FPCDocHTMLBrowseButton: TButton
+        Anchors = [akTop, akRight]
+        BorderSpacing.InnerBorder = 2
+        Caption = '...'
+        OnClick = FPCDocHTMLBrowseButtonClick
+        TabOrder = 1
+        Left = 447
+        Height = 25
+        Top = 10
+        Width = 30
+      end
+    end
     object ViewersPage: TPage
       Caption = 'ViewersPage'
-      ClientWidth = 480
-      ClientHeight = 222
-      Height = 222
-      Width = 480
+      ClientWidth = 484
+      ClientHeight = 224
+      Left = 2
+      Height = 224
+      Top = 28
+      Width = 484
       object ViewersLabel: TLabel
         Caption = 'ViewersLabel'
         Color = clNone
@@ -48,11 +93,12 @@ object HelpOptionsDialog: THelpOptionsDialog
         ClickOnSelChange = False
         OnSelectionChange = ViewersListBoxSelectionChange
         TabOrder = 0
+        TopIndex = -1
         AnchorSideLeft.Control = ViewersPage
         AnchorSideTop.Control = ViewersLabel
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 192
+        Height = 194
         Top = 26
         Width = 152
       end
@@ -61,23 +107,25 @@ object HelpOptionsDialog: THelpOptionsDialog
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'ViewerPropsGroupBox'
-        ClientHeight = 192
-        ClientWidth = 306
+        ClientHeight = 212
+        ClientWidth = 314
         TabOrder = 1
         AnchorSideLeft.Control = ViewersListBox
         AnchorSideLeft.Side = asrBottom
         Left = 164
-        Height = 210
+        Height = 212
         Top = 6
-        Width = 310
+        Width = 314
       end
     end
     object DataBasePage: TPage
       Caption = 'DataBasePage'
-      ClientWidth = 480
-      ClientHeight = 222
-      Height = 222
-      Width = 480
+      ClientWidth = 484
+      ClientHeight = 224
+      Left = 2
+      Height = 224
+      Top = 28
+      Width = 484
       object DatabasesLabel: TLabel
         Caption = 'DatabasesLabel'
         Color = clNone
@@ -95,11 +143,12 @@ object HelpOptionsDialog: THelpOptionsDialog
         ClickOnSelChange = False
         OnSelectionChange = DatabasesListBoxSelectionChange
         TabOrder = 0
+        TopIndex = -1
         AnchorSideLeft.Control = DataBasePage
         AnchorSideTop.Control = DatabasesLabel
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 190
+        Height = 192
         Top = 26
         Width = 152
       end
@@ -108,15 +157,15 @@ object HelpOptionsDialog: THelpOptionsDialog
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'DataBasesPropsGroupBox'
-        ClientHeight = 192
-        ClientWidth = 306
+        ClientHeight = 212
+        ClientWidth = 314
         TabOrder = 1
         AnchorSideLeft.Control = DatabasesListBox
         AnchorSideLeft.Side = asrBottom
         Left = 164
-        Height = 210
+        Height = 212
         Top = 6
-        Width = 310
+        Width = 314
       end
     end
   end
@@ -130,15 +179,16 @@ object HelpOptionsDialog: THelpOptionsDialog
     Kind = bkOK
     ModalResult = 1
     NumGlyphs = 0
+    OnClick = OkButtonClick
     TabOrder = 1
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 432
-    Height = 34
-    Top = 260
-    Width = 62
+    Left = 443
+    Height = 28
+    Top = 266
+    Width = 51
   end
   object CancelButton: TBitBtn
     Anchors = [akRight, akBottom]
@@ -154,9 +204,9 @@ object HelpOptionsDialog: THelpOptionsDialog
     AnchorSideRight.Control = OkButton
     AnchorSideBottom.Control = OkButton
     AnchorSideBottom.Side = asrBottom
-    Left = 346
-    Height = 34
-    Top = 260
-    Width = 80
+    Left = 364
+    Height = 28
+    Top = 266
+    Width = 73
   end
 end
diff --git a/ide/helpoptions.lrs b/ide/helpoptions.lrs
index 07b6bc5273..b98e1b83f9 100644
--- a/ide/helpoptions.lrs
+++ b/ide/helpoptions.lrs
@@ -5,54 +5,68 @@ LazarusResources.Add('THelpOptionsDialog','FORMDATA',[
   +'ewersListBox'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#17'HelpOpt'
   +'ionsDialog'#12'ClientHeight'#3','#1#11'ClientWidth'#3#244#1#7'OnClose'#7#22
   +'HelpOptionsDialogClose'#8'OnCreate'#7#23'HelpOptionsDialogCreate'#13'Pixels'
-  +'PerInch'#2'`'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#243
+  +'PerInch'#2'p'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#243
   +#1#18'VertScrollBar.Page'#3'+'#1#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
   +'Left'#3'8'#1#6'Height'#3','#1#3'Top'#3'f'#1#5'Width'#3#244#1#0#9'TNotebook'
   +#12'MainNotebook'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akB'
   +'ottom'#0#20'BorderSpacing.Around'#2#6#9'PageIndex'#2#0#24'AnchorSideBottom.'
-  +'Control'#7#8'OkButton'#4'Left'#2#6#6'Height'#3#248#0#3'Top'#2#6#5'Width'#3
-  +#232#1#0#5'TPage'#11'ViewersPage'#7'Caption'#6#11'ViewersPage'#11'ClientWidt'
-  +'h'#3#224#1#12'ClientHeight'#3#222#0#6'Height'#3#222#0#5'Width'#3#224#1#0#6
-  +'TLabel'#12'ViewersLabel'#7'Caption'#6#12'ViewersLabel'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#21'AnchorSideTop.Control'#7#19'ViewerPropsGroupBox'#4'Lef'
-  +'t'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'?'#0#0#8'TListBox'#14'ViewersLi'
-  +'stBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'
-  +#2#6#17'BorderSpacing.Top'#2#6#16'ClickOnSelChange'#8#17'OnSelectionChange'#7
-  +#29'ViewersListBoxSelectionChange'#8'TabOrder'#2#0#22'AnchorSideLeft.Control'
-  +#7#11'ViewersPage'#21'AnchorSideTop.Control'#7#12'ViewersLabel'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#192#0#3'Top'#2#26#5'Width'
-  +#3#152#0#0#0#9'TGroupBox'#19'ViewerPropsGroupBox'#5'Align'#7#7'alRight'#7'An'
-  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#19'ViewerPropsGroupBox'#12'ClientHeight'#3#192#0#11'Cl'
-  +'ientWidth'#3'2'#1#8'TabOrder'#2#1#22'AnchorSideLeft.Control'#7#14'ViewersLi'
-  +'stBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3
-  +#210#0#3'Top'#2#6#5'Width'#3'6'#1#0#0#0#5'TPage'#12'DataBasePage'#7'Caption'
-  +#6#12'DataBasePage'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#222#0#6'Heigh'
-  +'t'#3#222#0#5'Width'#3#224#1#0#6'TLabel'#14'DatabasesLabel'#7'Caption'#6#14
-  +'DatabasesLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#21'AnchorSideTop.Con'
-  +'trol'#7#22'DataBasesPropsGroupBox'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5
-  +'Width'#2'M'#0#0#8'TListBox'#16'DatabasesListBox'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#16
-  +'ClickOnSelChange'#8#17'OnSelectionChange'#7#31'DatabasesListBoxSelectionCha'
-  +'nge'#8'TabOrder'#2#0#22'AnchorSideLeft.Control'#7#12'DataBasePage'#21'Ancho'
-  +'rSideTop.Control'#7#14'DatabasesLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#3#190#0#3'Top'#2#26#5'Width'#3#152#0#0#0#9'TGroupBox'
-  +#22'DataBasesPropsGroupBox'#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#22
-  +'DataBasesPropsGroupBox'#12'ClientHeight'#3#192#0#11'ClientWidth'#3'2'#1#8'T'
-  +'abOrder'#2#1#22'AnchorSideLeft.Control'#7#16'DatabasesListBox'#19'AnchorSid'
-  +'eLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#210#0#3'Top'#2#6#5'W'
-  +'idth'#3'6'#1#0#0#0#0#7'TBitBtn'#8'OkButton'#7'Anchors'#11#7'akRight'#8'akBo'
-  +'ttom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBo'
-  +'rder'#2#2#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'
-  +#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#23'AnchorSideRight.Control'#7#5'Owner'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Ow'
-  +'ner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#176#1#6'Height'#2'"'
-  +#3'Top'#3#4#1#5'Width'#2'>'#0#0#7'TBitBtn'#12'CancelButton'#7'Anchors'#11#7
-  +'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#25'BorderS'
-  +'pacing.InnerBorder'#2#2#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCa'
-  +'ncel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#2#23'AnchorSideRig'
-  +'ht.Control'#7#8'OkButton'#24'AnchorSideBottom.Control'#7#8'OkButton'#21'Anc'
-  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3'Z'#1#6'Height'#2'"'#3'Top'#3#4
-  +#1#5'Width'#2'P'#0#0#0
+  +'Control'#7#8'OkButton'#4'Left'#2#6#6'Height'#3#254#0#3'Top'#2#6#5'Width'#3
+  +#232#1#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidt'
+  +'h'#3#228#1#12'ClientHeight'#3#224#0#4'Left'#2#2#6'Height'#3#224#0#3'Top'#2
+  +#28#5'Width'#3#228#1#0#6'TLabel'#15'FPCDocHTMLLabel'#7'Caption'#6#15'FPCDocH'
+  +'TMLLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#21'AnchorSideTop.Control'#7
+  +#22'FPCDocHTMLBrowseButton'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2
+  +#14#6'Height'#2#13#3'Top'#2#16#5'Width'#2'r'#0#0#5'TEdit'#14'FPCDocHTMLEdit'
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#8
+  +'TabOrder'#2#0#4'Text'#6#14'FPCDocHTMLEdit'#22'AnchorSideLeft.Control'#7#15
+  +'FPCDocHTMLLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#134#0#6'H'
+  +'eight'#2#23#3'Top'#2#10#5'Width'#3'4'#1#0#0#7'TButton'#22'FPCDocHTMLBrowseB'
+  +'utton'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2
+  +#7'Caption'#6#3'...'#7'OnClick'#7#27'FPCDocHTMLBrowseButtonClick'#8'TabOrder'
+  +#2#1#4'Left'#3#191#1#6'Height'#2#25#3'Top'#2#10#5'Width'#2#30#0#0#0#5'TPage'
+  +#11'ViewersPage'#7'Caption'#6#11'ViewersPage'#11'ClientWidth'#3#228#1#12'Cli'
+  +'entHeight'#3#224#0#4'Left'#2#2#6'Height'#3#224#0#3'Top'#2#28#5'Width'#3#228
+  +#1#0#6'TLabel'#12'ViewersLabel'#7'Caption'#6#12'ViewersLabel'#5'Color'#7#6'c'
+  +'lNone'#11'ParentColor'#8#21'AnchorSideTop.Control'#7#19'ViewerPropsGroupBox'
+  +#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'?'#0#0#8'TListBox'#14'View'
+  +'ersListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing'
+  +'.Left'#2#6#17'BorderSpacing.Top'#2#6#16'ClickOnSelChange'#8#17'OnSelectionC'
+  +'hange'#7#29'ViewersListBoxSelectionChange'#8'TabOrder'#2#0#8'TopIndex'#2#255
+  +#22'AnchorSideLeft.Control'#7#11'ViewersPage'#21'AnchorSideTop.Control'#7#12
+  +'ViewersLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3
+  +#194#0#3'Top'#2#26#5'Width'#3#152#0#0#0#9'TGroupBox'#19'ViewerPropsGroupBox'
+  +#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
+  +'m'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'ViewerPropsGroupBox'#12'C'
+  +'lientHeight'#3#212#0#11'ClientWidth'#3':'#1#8'TabOrder'#2#1#22'AnchorSideLe'
+  +'ft.Control'#7#14'ViewersListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'L'
+  +'eft'#3#164#0#6'Height'#3#212#0#3'Top'#2#6#5'Width'#3':'#1#0#0#0#5'TPage'#12
+  +'DataBasePage'#7'Caption'#6#12'DataBasePage'#11'ClientWidth'#3#228#1#12'Clie'
+  +'ntHeight'#3#224#0#4'Left'#2#2#6'Height'#3#224#0#3'Top'#2#28#5'Width'#3#228#1
+  +#0#6'TLabel'#14'DatabasesLabel'#7'Caption'#6#14'DatabasesLabel'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#21'AnchorSideTop.Control'#7#22'DataBasesPropsGrou'
+  +'pBox'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'M'#0#0#8'TListBox'#16
+  +'DatabasesListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderS'
+  +'pacing.Left'#2#6#17'BorderSpacing.Top'#2#6#16'ClickOnSelChange'#8#17'OnSele'
+  +'ctionChange'#7#31'DatabasesListBoxSelectionChange'#8'TabOrder'#2#0#8'TopInd'
+  +'ex'#2#255#22'AnchorSideLeft.Control'#7#12'DataBasePage'#21'AnchorSideTop.Co'
+  +'ntrol'#7#14'DatabasesLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#6#6'Height'#3#192#0#3'Top'#2#26#5'Width'#3#152#0#0#0#9'TGroupBox'#22'DataBa'
+  +'sesPropsGroupBox'#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'DataBas'
+  +'esPropsGroupBox'#12'ClientHeight'#3#212#0#11'ClientWidth'#3':'#1#8'TabOrder'
+  +#2#1#22'AnchorSideLeft.Control'#7#16'DatabasesListBox'#19'AnchorSideLeft.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#212#0#3'Top'#2#6#5'Width'#3':'
+  +#1#0#0#0#0#7'TBitBtn'#8'OkButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'A'
+  +'utoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7
+  +'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumG'
+  +'lyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#1#23'AnchorSideRigh'
+  +'t.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSide'
+  +'Bottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +#3#187#1#6'Height'#2#28#3'Top'#3#10#1#5'Width'#2'3'#0#0#7'TBitBtn'#12'Cancel'
+  +'Button'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpaci'
+  +'ng.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Caption'#6#6
+  ,'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrd'
+  +'er'#2#2#23'AnchorSideRight.Control'#7#8'OkButton'#24'AnchorSideBottom.Contr'
+  +'ol'#7#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'l'#1#6
+  +'Height'#2#28#3'Top'#3#10#1#5'Width'#2'I'#0#0#0
 ]);
diff --git a/ide/helpoptions.pas b/ide/helpoptions.pas
index 2c319b6966..d74b7d00d1 100644
--- a/ide/helpoptions.pas
+++ b/ide/helpoptions.pas
@@ -37,7 +37,7 @@ interface
 uses
   Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
   StdCtrls, Buttons, ExtCtrls,
-  ObjectInspector, HelpIntf, IDEWindowIntf, Laz_XMLCfg,
+  ObjectInspector, HelpIntf, IDEWindowIntf, IDEDialogs, Laz_XMLCfg,
   LazConf, LazarusIDEStrConsts, IDEProcs, IDEOptionDefs;
 
 type
@@ -70,12 +70,16 @@ type
   { THelpOptionsDialog }
 
   THelpOptionsDialog = class(TForm)
+    FPCDocHTMLBrowseButton: TButton;
+    FPCDocHTMLEdit: TEdit;
+    FPCDocHTMLLabel: TLabel;
     OkButton: TBitBtn;
     CancelButton: TBitBtn;
     DataBasePage: TPage;
     DatabasesLabel: TLabel;
     DataBasesPropsGroupBox: TGroupBox;
     DatabasesListBox: TListBox;
+    GeneralPage: TPage;
     ViewerPropsGroupBox: TGroupBox;
     ViewersLabel: TLabel;
     ViewersListBox: TListBox;
@@ -83,6 +87,7 @@ type
     ViewersPage: TPage;
     procedure CancelButtonClick(Sender: TObject);
     procedure DatabasesListBoxSelectionChange(Sender: TObject; User: boolean);
+    procedure FPCDocHTMLBrowseButtonClick(Sender: TObject);
     procedure HelpOptionsDialogClose(Sender: TObject;
       var CloseAction: TCloseAction);
     procedure HelpOptionsDialogCreate(Sender: TObject);
@@ -92,6 +97,7 @@ type
   public
     ViewersPropertiesGrid: TCustomPropertiesGrid;
     DatabasesPropertiesGrid: TCustomPropertiesGrid;
+    procedure FillGeneralPage;
     procedure FillViewersList;
     procedure FillViewerPropGrid;
     procedure FillDatabasesList;
@@ -131,6 +137,8 @@ begin
   Caption:=lisHlpOptsHelpOptions;
   OkButton.Caption:=lisLazBuildOk;
   CancelButton.Caption:=dlgCancel;
+  GeneralPage.Caption:=lisMenuInsertGeneral;
+  FPCDocHTMLLabel.Caption:=lisHOFPCDocHTMLPath;
   ViewersPage.Caption:=lisHlpOptsViewers;
   ViewerPropsGroupBox.Caption:=lisHlpOptsProperties;
   ViewersLabel.Caption:=lisHlpOptsViewers;
@@ -152,6 +160,7 @@ begin
     Align:=alClient;
   end;
 
+  FillGeneralPage;
   FillViewersList;
   FillViewerPropGrid;
   FillDatabasesList;
@@ -160,6 +169,7 @@ end;
 
 procedure THelpOptionsDialog.OkButtonClick(Sender: TObject);
 begin
+  HelpOpts.FPCDocsHTMLDirectory:=FPCDocHTMLEdit.Text;
   ModalResult:=mrOk;
 end;
 
@@ -169,6 +179,11 @@ begin
   FillViewerPropGrid;
 end;
 
+procedure THelpOptionsDialog.FillGeneralPage;
+begin
+  FPCDocHTMLEdit.Text:=HelpOpts.FPCDocsHTMLDirectory;
+end;
+
 procedure THelpOptionsDialog.FillViewersList;
 var
   i: Integer;
@@ -259,6 +274,15 @@ begin
   FillDatabasesPropGrid;
 end;
 
+procedure THelpOptionsDialog.FPCDocHTMLBrowseButtonClick(Sender: TObject);
+var
+  NewFilename: String;
+begin
+  NewFilename:=LazSelectDirectory('FPC Doc HTML directory','');
+  if NewFilename='' then exit;
+  FPCDocHTMLEdit.Text:=NewFilename;
+end;
+
 { THelpOptions }
 
 procedure THelpOptions.SetFilename(const AValue: string);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 036e1f93f9..05b50a5b3d 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -2845,6 +2845,7 @@ resourcestring
   // Help Options
   lisHlpOptsHelpOptions = 'Help Options';
   lisHlpOptsViewers = 'Viewers';
+  lisHOFPCDocHTMLPath = 'FPC Doc HTML Path';
   lisHlpOptsProperties = 'Properties:';
   lisHlpOptsDatabases = 'Databases';
 
diff --git a/ide/main.pp b/ide/main.pp
index 0d8720a85f..b18aa86fe0 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -73,6 +73,7 @@ uses
   // IDE interface
   AllIDEIntf, ObjectInspector, PropEdits, MacroIntf, IDECommands, SrcEditorIntf,
   NewItemIntf, IDEMsgIntf, PackageIntf, ProjectIntf, MenuIntf, LazIDEIntf,
+  IDEDialogs,
   // protocol
   IDEProtocol,
   // compile
@@ -297,6 +298,7 @@ type
                        var Key: word; Shift: TShiftState;
                        IDEWindowClass: TCustomFormClass);
     function OnExecuteIDECommand(Sender: TObject; Command: word): boolean;
+    function OnSelectDirectory(const Title, InitialDir: string): string;
 
     // Environment options dialog events
     procedure OnLoadEnvironmentSettings(Sender: TObject;
@@ -445,7 +447,7 @@ type
     // MessagesView events
     procedure MessagesViewSelectionChanged(sender: TObject);
 
-    //SearchResultsView events
+    // SearchResultsView events
     procedure SearchResultsViewSelectionChanged(sender: TObject);
 
     // External Tools events
@@ -497,6 +499,7 @@ type
     procedure LoadMenuShortCuts; override;
     procedure ConnectMainBarEvents;
     procedure SetupSpeedButtons;
+    procedure SetupDialogs;
     procedure SetupComponentNoteBook;
     procedure SetupHints;
     procedure SetupOutputFilter;
@@ -1085,6 +1088,7 @@ begin
   SetupStandardIDEMenuItems;
   SetupMainMenu;
   SetupSpeedButtons;
+  SetupDialogs;
   SetupComponentNoteBook;
   ConnectMainBarEvents;
   
@@ -1418,6 +1422,11 @@ begin
   MainIDEBar.OpenFilePopupMenu.AutoPopup := False;
 end;
 
+procedure TMainIDE.SetupDialogs;
+begin
+  LazIDESelectDirectory:=@OnSelectDirectory;
+end;
+
 procedure TMainIDE.SetupComponentNoteBook;
 begin
   // Component Notebook
@@ -2528,6 +2537,30 @@ begin
   OnProcessIDECommand(Sender,Command,Result);
 end;
 
+function TMainIDE.OnSelectDirectory(const Title, InitialDir: string
+  ): string;
+var
+  Dialog: TSelectDirectoryDialog;
+  DummyResult: Boolean;
+begin
+  Result:='';
+  Dialog:=TSelectDirectoryDialog.Create(nil);
+  try
+    InputHistories.ApplyFileDialogSettings(Dialog);
+    Dialog.Title:=Title;
+    Dialog.Options:=Dialog.Options+[ofFileMustExist];
+    if InitialDir<>'' then
+      Dialog.InitialDir:=InitialDir;
+    DummyResult:=Dialog.Execute;
+    InputHistories.StoreFileDialogSettings(Dialog);
+    if DummyResult and DirPathExists(Dialog.Filename) then begin
+      Result:=Dialog.Filename;
+    end;
+  finally
+    Dialog.Free;
+  end;
+end;
+
 procedure TMainIDE.OnExecuteIDEShortCut(Sender: TObject; var Key: word;
   Shift: TShiftState;
   IDEWindowClass: TCustomFormClass);
diff --git a/ideintf/allideintf.pas b/ideintf/allideintf.pas
index d94ad0b80d..b34c419db6 100644
--- a/ideintf/allideintf.pas
+++ b/ideintf/allideintf.pas
@@ -34,6 +34,7 @@ uses
   HelpHTML,
   HelpIntf,
   IDECommands,
+  IDEDialogs,
   IDEMsgIntf,
   IDEWindowIntf,
   ImageListEditor,