diff --git a/ide/codeexplorer.lfm b/ide/codeexplorer.lfm
index 666493db9d..7649910493 100644
--- a/ide/codeexplorer.lfm
+++ b/ide/codeexplorer.lfm
@@ -5,7 +5,7 @@ object CodeExplorerView: TCodeExplorerView
   Width = 215
   HorzScrollBar.Page = 214
   VertScrollBar.Page = 516
-  ActiveControl = RefreshButton
+  ActiveControl = CodeFilterEdit
   Caption = 'CodeExplorerView'
   ClientHeight = 517
   ClientWidth = 215
@@ -14,54 +14,28 @@ object CodeExplorerView: TCodeExplorerView
   OnCreate = CodeExplorerViewCREATE
   OnDestroy = CodeExplorerViewDestroy
   OnResize = CodeExplorerViewRESIZE
-  object RefreshButton: TButton
-    Height = 29
-    Width = 80
-    AutoSize = True
-    Caption = 'Refresh'
-    Constraints.MinWidth = 80
-    OnClick = RefreshButtonClick
-    TabOrder = 0
-  end
-  object OptionsButton: TButton
-    AnchorSideLeft.Control = RefreshButton
-    AnchorSideLeft.Side = asrBottom
-    Left = 83
-    Height = 29
-    Width = 80
-    AutoSize = True
-    BorderSpacing.Left = 3
-    Caption = 'Options'
-    Constraints.MinWidth = 80
-    OnClick = OptionsButtonClick
-    TabOrder = 1
-  end
   object MainNotebook: TNotebook
-    AnchorSideTop.Control = OptionsButton
     AnchorSideTop.Side = asrBottom
-    Height = 486
-    Top = 31
+    Height = 515
+    Top = 2
     Width = 215
-    Align = alBottom
-    Anchors = [akTop, akLeft, akRight, akBottom]
+    Align = alClient
     BorderSpacing.Top = 2
     OnPageChanged = MainNotebookPageChanged
     PageIndex = 0
-    TabOrder = 2
+    TabOrder = 0
     object CodePage: TPage
       Caption = 'CodePage'
-      ClientWidth = 211
-      ClientHeight = 455
+      ClientWidth = 207
+      ClientHeight = 489
       object CodeTreeview: TTreeView
-        AnchorSideTop.Control = CodeFilterEdit
         AnchorSideTop.Side = asrBottom
-        Height = 431
-        Top = 24
-        Width = 211
-        Align = alBottom
-        Anchors = [akTop, akLeft, akRight, akBottom]
+        Height = 463
+        Top = 26
+        Width = 207
+        Align = alClient
         BorderSpacing.Top = 1
-        DefaultItemHeight = 19
+        DefaultItemHeight = 16
         HideSelection = False
         Images = Imagelist1
         ParentCtl3D = False
@@ -73,17 +47,125 @@ object CodeExplorerView: TCodeExplorerView
         OnKeyUp = CodeTreeviewKeyUp
         Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoNoDoubleClickExpand]
       end
-      object CodeFilterEdit: TEdit
-        AnchorSideLeft.Control = CodePage
-        AnchorSideTop.Control = CodePage
-        AnchorSideRight.Control = CodePage
-        AnchorSideRight.Side = asrBottom
-        Height = 23
-        Width = 211
-        Anchors = [akTop, akLeft, akRight]
-        OnChange = CodeFilterEditChange
+      object CodeTreeviewButtonPanel: TPanel
+        Height = 25
+        Width = 207
+        Align = alTop
+        BevelOuter = bvNone
+        ClientHeight = 25
+        ClientWidth = 207
         TabOrder = 1
-        Text = 'CodeFilterEdit'
+        object OptionsSpeedButton: TSpeedButton
+          Left = 182
+          Height = 22
+          Hint = 'Options for CodeExplorer'
+          Top = 1
+          Width = 23
+          Anchors = [akTop, akRight]
+          Color = clBtnFace
+          Glyph.Data = {
+            36040000424D3604000000000000360000002800000010000000100000000100
+            2000000000000004000064000000640000000000000000000000D587595BD583
+            51F0D07D49F4B267399F00000036000000360000003600000036000000360000
+            003600000036000000360000003600000036000000330000001DDB9367EFE6B8
+            9CFFE9BFA5FFDC9B74FFE7BBA1FEFDFDFDFFFDFDFDFFFCFCFCFFFDFDFDFFFDFD
+            FDFFFCFCFCFFFDFDFDFFFCFCFCFFFDFDFDFDFBFBFBF300000033DD9D75F7EBC4
+            ADFFECC8B2FFEAC1A9FFDEA17CFFE7BA9FFFFDFDFDFFFDFDFDFFFDFDFDFFFDFD
+            FDFFFCFCFCFFFDFDFDFFFDFDFDFFFDFDFDFFFDFDFDFD00000036DFA58375DFA1
+            7BF9ECC7B0FFEDCAB5FFE9BEA3FFD58E64FFE3E3E3FFE1E1E1FFE0E0E0FFDEDE
+            DEFFDDDDDDFFDEDEDEFFDDDDDDFFFCFCFCFFFCFCFCFF00000036FFFFFF00E1AE
+            8C76E0A987FEEBC7B0FFDDA17CFFBCA595FFADADADFFD0D0D0FFD4D4D4FFF1F1
+            F1FFFBFBFBFFFBFBFBFFFBFBFBFFFBFBFBFFFCFCFCFF00000036FFFFFF000000
+            0001BC92789CDEAD90FFC4AFA3FFD5D5D5FFBBBBBBFFA6A6A6FFA0A0A0FF8D8D
+            8DFFB4B4B4FFD4D4D4FFD2D2D2FFF9F9F9FFFDFDFDFF00000036FFFFFF000000
+            000100000036FBFBFBFFACACACFFCBCBCBFFD2D2D2FFC9C9C9FFD2D2D2FFC6C6
+            C6FF909090FFFAFAFAFFFAFAFAFFF9F9F9FFFDFDFDFF00000036FFFFFF000000
+            000100000036FCFCFCFFDBDBDBFFB2B2B2FFD6D6D6FF9A9A9AFF919191FFC0C0
+            C0FF8A8A8AFFCACACAFFC8C8C8FFF8F8F8FFFDFDFDFF00000036FFFFFF000000
+            000100000036FCFCFCFFDDDDDDFFB5B5B5FFE6E6E6FF9B9B9BFFB3B3B3FFB5B5
+            B5FFBCBCBCFFF8F8F8FFF6F6F6FFF5F5F5FFFDFDFDFF00000036FFFFFF000000
+            000100000036FDFDFDFFF3F3F3FFA2A2A2FFE1E1E1FFD2D2D2FFA6A6A6FFC3C3
+            C3FFC1C1C1FFBEBEBEFFBCBCBCFFF1F1F1FFFDFDFDFF00000036FFFFFF000000
+            000100000036FCFCFCFFFCFCFCFFD8D8D8FFA6A6A6FF9D9D9DFFC2C2C2FFF7F7
+            F7FFF4F4F4FFF1F1F1FFEFEFEFFFECECECFFFCFCFCFF00000036FFFFFF000000
+            000100000036FCFCFCFFFAFAFAFFCDCDCDFFC8C8C8FFC3C3C3FFBFBFBFFFBBBB
+            BBFFB7B7B7FFFDFDFDFFFDFDFDFFFCFCFCFFFDFDFDFF00000036FFFFFF000000
+            000100000036FDFDFDFFF9F9F9FFFAFAFAFFF9F9F9FFF9F9F9FFF6F6F6FFF4F4
+            F4FFEFEFEFFFFDFDFDFFF8F8F8FFF7F7F7FFACACAC9100000020FFFFFF00FFFF
+            FF0000000036FCFCFCFDF6F6F6FFF7F7F7FFF8F8F8FFF7F7F7FFF5F5F5FFF3F3
+            F3FFEEEEEEFFFCFCFCFFECECECFFA8A8A8910000002000000002FFFFFF00FFFF
+            FF0000000033FAFAFAF0FCFCFCFDFDFDFDFFFDFDFDFFFCFCFCFFFDFDFDFFFCFC
+            FCFFFDFDFDFFFAFAFAFFA8A8A8910000002000000002FFFFFF00FFFFFF00FFFF
+            FF000000001C0000003300000036000000360000003600000036000000360000
+            003600000036000000360000002000000002FFFFFF00FFFFFF00
+          }
+          NumGlyphs = 0
+          OnClick = OptionsSpeedButtonClick
+          ShowHint = True
+          ParentShowHint = False
+        end
+        object RefreshSpeedButton: TSpeedButton
+          Left = 159
+          Height = 22
+          Hint = 'Refresh CodeExplorer'
+          Top = 1
+          Width = 23
+          Anchors = [akTop, akRight]
+          Color = clBtnFace
+          Glyph.Data = {
+            36040000424D3604000000000000360000002800000010000000100000000100
+            2000000000000004000064000000640000000000000000000000FFFFFF00A465
+            34A2A4653401FFFFFF00FFFFFF00A4653405A4653453A76A3ABEA66938E9A466
+            35FAA76A3AE4A76B3BAAA4653424FFFFFF00FFFFFF00FFFFFF00FFFFFF00A465
+            34FFA5673693FFFFFF00A4653454A66737EEB58055F3CEA684FFD8B697FFDBB9
+            99FFD3AC8AFFC2946DFCA66838F6A466355BFFFFFF00FFFFFF00FFFFFF00A567
+            37FEB7845BF7A56736D4B17A4EF4E3CAB4FFECDAC9FFE7D1BCFFE3C9B0FFDEBE
+            A0FFD2AB88FFCEA582FFD3AE8EFFA66838F5A465342AFFFFFF00FFFFFF00A668
+            38FDF1E4D8FFD4B295FEF4E9E0FFF3E8DDFFEDDCCCFFD2AD8FFEB0784CF5A566
+            35FBA66939FFA66939FEA96D3DFFB0784CFFA76A3AA8FFFFFF00FFFFFF00A567
+            37FDF6EEE6FFF5ECE3FFF5EDE4FFE6D2C1FFB0794DF5A66938CAA4653436FFFF
+            FF00A465346AA96B3CEDB67C4FFFA76A3AFEA56837FAFFFFFF00FFFFFF00A466
+            35FCF6EEE6FFEBD7C4FFEAD9C9FFA46534FEA465346AFFFFFF00FFFFFF00FFFF
+            FF00A465340BA56635E9C9956C8DB77F53C2A46534FFA4653405FFFFFF00A465
+            34FCF5EDE5FFF6EDE5FFF5ECE4FFD7B79CFDA66837E0A4653410FFFFFF00FFFF
+            FF00FFFFFF00FFFFFF00D5A47E1ACD997239A46534FCA465340CFFFFFF00A465
+            34F9A46534FEA46534FEA46534FDA46534FCA46534FBA46534B9A465341DA465
+            3418A4653418A4653418A4653418A4653418A465341CFFFFFF00FFFFFF00A465
+            340DFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A46534A0A465
+            34FFAD7447F8AF774CF7AF774CF7AF784CF7A46534FFA4653408FFFFFF00A465
+            34FCB3794C7ECF9D762BBB835713A4653402FFFFFF00FFFFFF00A4653404A668
+            38C4D0AC8FFAF6EEE7FFF2E6DBFFF6EEE6FFA66A3AFBA4653409FFFFFF00A465
+            35FEA76A3AFBC791689DA56737E6A4653423FFFFFF00FFFFFF00FFFFFF00A465
+            3460A46635FFE9D7C7FFEBD8C6FFF5ECE3FFA66A3AFAA465340AFFFFFF00A668
+            38F3AB7041FFA96C3CFEA76A3AF5A4653475A4653419A4653445A66938CDB988
+            61F5EBDBCDFFF5EBE2FFF6EEE6FFF6EEE6FFA76A3AFAA465340BFFFFFF00A769
+            399BC09069FDC59872FFA86B3CFFA46635FFA76A3AFCB7855DF3D9BBA1FEF1E4
+            D8FFF2E6DBFFF3E8DDFFCEA788FDEAD8C8FFA76A3AF9A465340DFFFFFF00A465
+            3429A66939F5D3AD8CFFDCBD9DFFDDBEA1FFE5CBB4FFE9D3BFFFEEDDCCFFF0E2
+            D5FFE7D2BFFFAF774BF5A56736C0AB7143F7A46635FCA465340EFFFFFF00FFFF
+            FF00A4653550A66838F6C09068FAD3B08FFFDFC2A8FFDEC1A8FFD4B193FFB987
+            5FF4A56737F0A4653458FFFFFF00A4663566A46534FFA465340FFFFFFF00FFFF
+            FF00FFFFFF00A465341DA7693A9FA76A3ADEA56736F6A76939E5A76A3ABCA465
+            3453A4653405FFFFFF00FFFFFF00FFFFFF00A4653479A4653410
+          }
+          NumGlyphs = 0
+          OnClick = RefreshSpeedButtonClick
+          ShowHint = True
+          ParentShowHint = False
+        end
+        object CodeFilterEdit: TEdit
+          AnchorSideLeft.Control = CodePage
+          AnchorSideTop.Control = CodePage
+          AnchorSideRight.Control = CodePage
+          AnchorSideRight.Side = asrBottom
+          Height = 23
+          Width = 157
+          Anchors = [akTop, akLeft, akRight]
+          AutoSelect = True
+          OnChange = CodeFilterEditChange
+          TabOrder = 0
+          Text = 'CodeFilterEdit'
+        end
       end
     end
     object DirectivesPage: TPage
diff --git a/ide/codeexplorer.lrs b/ide/codeexplorer.lrs
index ce4517e981..7d11b5b2be 100644
--- a/ide/codeexplorer.lrs
+++ b/ide/codeexplorer.lrs
@@ -3,50 +3,147 @@
 LazarusResources.Add('TCodeExplorerView','FORMDATA',[
   'TPF0'#17'TCodeExplorerView'#16'CodeExplorerView'#4'Left'#3'c'#1#6'Height'#3#5
   +#2#3'Top'#3#142#0#5'Width'#3#215#0#18'HorzScrollBar.Page'#3#214#0#18'VertScr'
-  +'ollBar.Page'#3#4#2#13'ActiveControl'#7#13'RefreshButton'#7'Caption'#6#16'Co'
-  +'deExplorerView'#12'ClientHeight'#3#5#2#11'ClientWidth'#3#215#0#10'KeyPrevie'
-  +'w'#9#7'OnClose'#7#21'CodeExplorerViewCLOSE'#8'OnCreate'#7#22'CodeExplorerVi'
-  +'ewCREATE'#9'OnDestroy'#7#23'CodeExplorerViewDestroy'#8'OnResize'#7#22'CodeE'
-  +'xplorerViewRESIZE'#0#7'TButton'#13'RefreshButton'#6'Height'#2#29#5'Width'#2
-  +'P'#8'AutoSize'#9#7'Caption'#6#7'Refresh'#20'Constraints.MinWidth'#2'P'#7'On'
-  +'Click'#7#18'RefreshButtonClick'#8'TabOrder'#2#0#0#0#7'TButton'#13'OptionsBu'
-  +'tton'#22'AnchorSideLeft.Control'#7#13'RefreshButton'#19'AnchorSideLeft.Side'
-  +#7#9'asrBottom'#4'Left'#2'S'#6'Height'#2#29#5'Width'#2'P'#8'AutoSize'#9#18'B'
-  +'orderSpacing.Left'#2#3#7'Caption'#6#7'Options'#20'Constraints.MinWidth'#2'P'
-  +#7'OnClick'#7#18'OptionsButtonClick'#8'TabOrder'#2#1#0#0#9'TNotebook'#12'Mai'
-  +'nNotebook'#21'AnchorSideTop.Control'#7#13'OptionsButton'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#6'Height'#3#230#1#3'Top'#2#31#5'Width'#3#215#0#5'Align'
-  +#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17
-  +'BorderSpacing.Top'#2#2#13'OnPageChanged'#7#23'MainNotebookPageChanged'#9'Pa'
-  +'geIndex'#2#0#8'TabOrder'#2#2#0#5'TPage'#8'CodePage'#7'Caption'#6#8'CodePage'
-  +#11'ClientWidth'#3#211#0#12'ClientHeight'#3#199#1#0#9'TTreeView'#12'CodeTree'
-  +'view'#21'AnchorSideTop.Control'#7#14'CodeFilterEdit'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#6'Height'#3#175#1#3'Top'#2#24#5'Width'#3#211#0#5'Align'#7#8
-  +'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'Bord'
-  +'erSpacing.Top'#2#1#17'DefaultItemHeight'#2#19#13'HideSelection'#8#6'Images'
-  +#7#10'Imagelist1'#11'ParentCtl3D'#8#9'PopupMenu'#7#13'TreePopupmenu'#16'Righ'
-  +'tClickSelect'#9#8'TabOrder'#2#0#10'OnDblClick'#7#20'CodeTreeviewDblClick'#10
-  +'OnDeletion'#7#20'CodeTreeviewDeletion'#7'OnKeyUp'#7#17'CodeTreeviewKeyUp'#7
-  +'Options'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#19'tvoRightClic'
-  +'kSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'
-  +#22'tvoNoDoubleClickExpand'#0#0#0#5'TEdit'#14'CodeFilterEdit'#22'AnchorSideL'
-  +'eft.Control'#7#8'CodePage'#21'AnchorSideTop.Control'#7#8'CodePage'#23'Ancho'
-  +'rSideRight.Control'#7#8'CodePage'#20'AnchorSideRight.Side'#7#9'asrBottom'#6
-  +'Height'#2#23#5'Width'#3#211#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#8'OnChange'#7#20'CodeFilterEditChange'#8'TabOrder'#2#1#4'Text'#6#14'CodeFil'
-  +'terEdit'#0#0#0#5'TPage'#14'DirectivesPage'#7'Caption'#6#14'DirectivesPage'
-  +#11'ClientWidth'#3#211#0#12'ClientHeight'#3#191#1#0#5'TEdit'#20'DirectivesFi'
-  +'lterEdit'#22'AnchorSideLeft.Control'#7#14'DirectivesPage'#21'AnchorSideTop.'
-  +'Control'#7#14'DirectivesPage'#23'AnchorSideRight.Control'#7#14'DirectivesPa'
-  +'ge'#20'AnchorSideRight.Side'#7#9'asrBottom'#6'Height'#2#23#5'Width'#3#211#0
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7#26'DirectivesFi'
-  +'lterEditChange'#8'TabOrder'#2#0#4'Text'#6#20'DirectivesFilterEdit'#0#0#9'TT'
-  +'reeView'#18'DirectivesTreeView'#21'AnchorSideTop.Control'#7#20'DirectivesFi'
-  +'lterEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#167#1#3'Top'#2
-  +#24#5'Width'#3#211#0#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#1#17'DefaultItemHeight'#2
-  +#19#9'PopupMenu'#7#13'TreePopupmenu'#8'TabOrder'#2#1#10'OnDblClick'#7#26'Dir'
-  +'ectivesTreeViewDblClick'#10'OnDeletion'#7#26'DirectivesTreeViewDeletion'#7
+  +'ollBar.Page'#3#4#2#13'ActiveControl'#7#14'CodeFilterEdit'#7'Caption'#6#16'C'
+  +'odeExplorerView'#12'ClientHeight'#3#5#2#11'ClientWidth'#3#215#0#10'KeyPrevi'
+  +'ew'#9#7'OnClose'#7#21'CodeExplorerViewCLOSE'#8'OnCreate'#7#22'CodeExplorerV'
+  +'iewCREATE'#9'OnDestroy'#7#23'CodeExplorerViewDestroy'#8'OnResize'#7#22'Code'
+  +'ExplorerViewRESIZE'#0#9'TNotebook'#12'MainNotebook'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#6'Height'#3#3#2#3'Top'#2#2#5'Width'#3#215#0#5'Align'#7#8'alCli'
+  +'ent'#17'BorderSpacing.Top'#2#2#13'OnPageChanged'#7#23'MainNotebookPageChang'
+  +'ed'#9'PageIndex'#2#0#8'TabOrder'#2#0#0#5'TPage'#8'CodePage'#7'Caption'#6#8
+  +'CodePage'#11'ClientWidth'#3#207#0#12'ClientHeight'#3#233#1#0#9'TTreeView'#12
+  +'CodeTreeview'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#207#1#3'Top'
+  +#2#26#5'Width'#3#207#0#5'Align'#7#8'alClient'#17'BorderSpacing.Top'#2#1#17'D'
+  +'efaultItemHeight'#2#16#13'HideSelection'#8#6'Images'#7#10'Imagelist1'#11'Pa'
+  +'rentCtl3D'#8#9'PopupMenu'#7#13'TreePopupmenu'#16'RightClickSelect'#9#8'TabO'
+  +'rder'#2#0#10'OnDblClick'#7#20'CodeTreeviewDblClick'#10'OnDeletion'#7#20'Cod'
+  +'eTreeviewDeletion'#7'OnKeyUp'#7#17'CodeTreeviewKeyUp'#7'Options'#11#17'tvoA'
+  +'utoItemHeight'#21'tvoKeepCollapsedNodes'#19'tvoRightClickSelect'#14'tvoShow'
+  +'Buttons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#22'tvoNoDoubleCli'
+  +'ckExpand'#0#0#0#6'TPanel'#23'CodeTreeviewButtonPanel'#6'Height'#2#25#5'Widt'
+  +'h'#3#207#0#5'Align'#7#5'alTop'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2
+  +#25#11'ClientWidth'#3#207#0#8'TabOrder'#2#1#0#12'TSpeedButton'#18'OptionsSpe'
+  +'edButton'#4'Left'#3#182#0#6'Height'#2#22#4'Hint'#6#24'Options for CodeExplo'
+  +'rer'#3'Top'#2#1#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#5'Color'#7
+  +#9'clBtnFace'#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#213#135'Y['#213#131'Q'#240#208'}I'#244#178'g9'#159#0#0#0'6'#0#0#0
+  +'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0
+  +#0#0'3'#0#0#0#29#219#147'g'#239#230#184#156#255#233#191#165#255#220#155't'
+  +#255#231#187#161#254#253#253#253#255#253#253#253#255#252#252#252#255#253#253
+  +#253#255#253#253#253#255#252#252#252#255#253#253#253#255#252#252#252#255#253
+  +#253#253#253#251#251#251#243#0#0#0'3'#221#157'u'#247#235#196#173#255#236#200
+  +#178#255#234#193#169#255#222#161'|'#255#231#186#159#255#253#253#253#255#253
+  +#253#253#255#253#253#253#255#253#253#253#255#252#252#252#255#253#253#253#255
+  +#253#253#253#255#253#253#253#255#253#253#253#253#0#0#0'6'#223#165#131'u'#223
+  +#161'{'#249#236#199#176#255#237#202#181#255#233#190#163#255#213#142'd'#255
+  +#227#227#227#255#225#225#225#255#224#224#224#255#222#222#222#255#221#221#221
+  +#255#222#222#222#255#221#221#221#255#252#252#252#255#252#252#252#255#0#0#0'6'
+  +#255#255#255#0#225#174#140'v'#224#169#135#254#235#199#176#255#221#161'|'#255
+  +#188#165#149#255#173#173#173#255#208#208#208#255#212#212#212#255#241#241#241
+  +#255#251#251#251#255#251#251#251#255#251#251#251#255#251#251#251#255#252#252
+  +#252#255#0#0#0'6'#255#255#255#0#0#0#0#1#188#146'x'#156#222#173#144#255#196
+  +#175#163#255#213#213#213#255#187#187#187#255#166#166#166#255#160#160#160#255
+  +#141#141#141#255#180#180#180#255#212#212#212#255#210#210#210#255#249#249#249
+  +#255#253#253#253#255#0#0#0'6'#255#255#255#0#0#0#0#1#0#0#0'6'#251#251#251#255
+  +#172#172#172#255#203#203#203#255#210#210#210#255#201#201#201#255#210#210#210
+  +#255#198#198#198#255#144#144#144#255#250#250#250#255#250#250#250#255#249#249
+  +#249#255#253#253#253#255#0#0#0'6'#255#255#255#0#0#0#0#1#0#0#0'6'#252#252#252
+  +#255#219#219#219#255#178#178#178#255#214#214#214#255#154#154#154#255#145#145
+  +#145#255#192#192#192#255#138#138#138#255#202#202#202#255#200#200#200#255#248
+  +#248#248#255#253#253#253#255#0#0#0'6'#255#255#255#0#0#0#0#1#0#0#0'6'#252#252
+  +#252#255#221#221#221#255#181#181#181#255#230#230#230#255#155#155#155#255#179
+  +#179#179#255#181#181#181#255#188#188#188#255#248#248#248#255#246#246#246#255
+  +#245#245#245#255#253#253#253#255#0#0#0'6'#255#255#255#0#0#0#0#1#0#0#0'6'#253
+  +#253#253#255#243#243#243#255#162#162#162#255#225#225#225#255#210#210#210#255
+  +#166#166#166#255#195#195#195#255#193#193#193#255#190#190#190#255#188#188#188
+  +#255#241#241#241#255#253#253#253#255#0#0#0'6'#255#255#255#0#0#0#0#1#0#0#0'6'
+  +#252#252#252#255#252#252#252#255#216#216#216#255#166#166#166#255#157#157#157
+  +#255#194#194#194#255#247#247#247#255#244#244#244#255#241#241#241#255#239#239
+  +#239#255#236#236#236#255#252#252#252#255#0#0#0'6'#255#255#255#0#0#0#0#1#0#0#0
+  +'6'#252#252#252#255#250#250#250#255#205#205#205#255#200#200#200#255#195#195
+  +#195#255#191#191#191#255#187#187#187#255#183#183#183#255#253#253#253#255#253
+  +#253#253#255#252#252#252#255#253#253#253#255#0#0#0'6'#255#255#255#0#0#0#0#1#0
+  +#0#0'6'#253#253#253#255#249#249#249#255#250#250#250#255#249#249#249#255#249
+  ,#249#249#255#246#246#246#255#244#244#244#255#239#239#239#255#253#253#253#255
+  +#248#248#248#255#247#247#247#255#172#172#172#145#0#0#0' '#255#255#255#0#255
+  +#255#255#0#0#0#0'6'#252#252#252#253#246#246#246#255#247#247#247#255#248#248
+  +#248#255#247#247#247#255#245#245#245#255#243#243#243#255#238#238#238#255#252
+  +#252#252#255#236#236#236#255#168#168#168#145#0#0#0' '#0#0#0#2#255#255#255#0
+  +#255#255#255#0#0#0#0'3'#250#250#250#240#252#252#252#253#253#253#253#255#253
+  +#253#253#255#252#252#252#255#253#253#253#255#252#252#252#255#253#253#253#255
+  +#250#250#250#255#168#168#168#145#0#0#0' '#0#0#0#2#255#255#255#0#255#255#255#0
+  +#255#255#255#0#0#0#0#28#0#0#0'3'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0'6'
+  +#0#0#0'6'#0#0#0'6'#0#0#0'6'#0#0#0' '#0#0#0#2#255#255#255#0#255#255#255#0#9'N'
+  +'umGlyphs'#2#0#7'OnClick'#7#23'OptionsSpeedButtonClick'#8'ShowHint'#9#14'Par'
+  +'entShowHint'#8#0#0#12'TSpeedButton'#18'RefreshSpeedButton'#4'Left'#3#159#0#6
+  +'Height'#2#22#4'Hint'#6#20'Refresh CodeExplorer'#3'Top'#2#1#5'Width'#2#23#7
+  +'Anchors'#11#5'akTop'#7'akRight'#0#5'Color'#7#9'clBtnFace'#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#164'e4'
+  +#162#164'e4'#1#255#255#255#0#255#255#255#0#164'e4'#5#164'e4S'#167'j:'#190#166
+  +'i8'#233#164'f5'#250#167'j:'#228#167'k;'#170#164'e4$'#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#164'e4'#255#165'g6'#147#255#255#255#0#164
+  +'e4T'#166'g7'#238#181#128'U'#243#206#166#132#255#216#182#151#255#219#185#153
+  +#255#211#172#138#255#194#148'm'#252#166'h8'#246#164'f5['#255#255#255#0#255
+  +#255#255#0#255#255#255#0#165'g7'#254#183#132'['#247#165'g6'#212#177'zN'#244
+  +#227#202#180#255#236#218#201#255#231#209#188#255#227#201#176#255#222#190#160
+  +#255#210#171#136#255#206#165#130#255#211#174#142#255#166'h8'#245#164'e4*'#255
+  +#255#255#0#255#255#255#0#166'h8'#253#241#228#216#255#212#178#149#254#244#233
+  +#224#255#243#232#221#255#237#220#204#255#210#173#143#254#176'xL'#245#165'f5'
+  +#251#166'i9'#255#166'i9'#254#169'm='#255#176'xL'#255#167'j:'#168#255#255#255
+  +#0#255#255#255#0#165'g7'#253#246#238#230#255#245#236#227#255#245#237#228#255
+  +#230#210#193#255#176'yM'#245#166'i8'#202#164'e46'#255#255#255#0#164'e4j'#169
+  +'k<'#237#182'|O'#255#167'j:'#254#165'h7'#250#255#255#255#0#255#255#255#0#164
+  +'f5'#252#246#238#230#255#235#215#196#255#234#217#201#255#164'e4'#254#164'e4j'
+  +#255#255#255#0#255#255#255#0#255#255#255#0#164'e4'#11#165'f5'#233#201#149'l'
+  +#141#183'S'#194#164'e4'#255#164'e4'#5#255#255#255#0#164'e4'#252#245#237#229
+  +#255#246#237#229#255#245#236#228#255#215#183#156#253#166'h7'#224#164'e4'#16
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#213#164'~'#26#205
+  +#153'r9'#164'e4'#252#164'e4'#12#255#255#255#0#164'e4'#249#164'e4'#254#164'e4'
+  +#254#164'e4'#253#164'e4'#252#164'e4'#251#164'e4'#185#164'e4'#29#164'e4'#24
+  +#164'e4'#24#164'e4'#24#164'e4'#24#164'e4'#24#164'e4'#28#255#255#255#0#255#255
+  +#255#0#164'e4'#13#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
+  +#255#255#0#255#255#255#0#164'e4'#160#164'e4'#255#173'tG'#248#175'wL'#247#175
+  +'wL'#247#175'xL'#247#164'e4'#255#164'e4'#8#255#255#255#0#164'e4'#252#179'yL~'
+  +#207#157'v+'#187#131'W'#19#164'e4'#2#255#255#255#0#255#255#255#0#164'e4'#4
+  +#166'h8'#196#208#172#143#250#246#238#231#255#242#230#219#255#246#238#230#255
+  +#166'j:'#251#164'e4'#9#255#255#255#0#164'e5'#254#167'j:'#251#199#145'h'#157
+  +#165'g7'#230#164'e4#'#255#255#255#0#255#255#255#0#255#255#255#0#164'e4`'#164
+  +'f5'#255#233#215#199#255#235#216#198#255#245#236#227#255#166'j:'#250#164'e4'
+  +#10#255#255#255#0#166'h8'#243#171'pA'#255#169'l<'#254#167'j:'#245#164'e4u'
+  +#164'e4'#25#164'e4E'#166'i8'#205#185#136'a'#245#235#219#205#255#245#235#226
+  +#255#246#238#230#255#246#238#230#255#167'j:'#250#164'e4'#11#255#255#255#0#167
+  +'i9'#155#192#144'i'#253#197#152'r'#255#168'k<'#255#164'f5'#255#167'j:'#252
+  +#183#133']'#243#217#187#161#254#241#228#216#255#242#230#219#255#243#232#221
+  +#255#206#167#136#253#234#216#200#255#167'j:'#249#164'e4'#13#255#255#255#0#164
+  +'e4)'#166'i9'#245#211#173#140#255#220#189#157#255#221#190#161#255#229#203#180
+  +#255#233#211#191#255#238#221#204#255#240#226#213#255#231#210#191#255#175'wK'
+  +#245#165'g6'#192#171'qC'#247#164'f5'#252#164'e4'#14#255#255#255#0#255#255#255
+  +#0#164'e5P'#166'h8'#246#192#144'h'#250#211#176#143#255#223#194#168#255#222
+  +#193#168#255#212#177#147#255#185#135'_'#244#165'g7'#240#164'e4X'#255#255#255
+  +#0#164'f5f'#164'e4'#255#164'e4'#15#255#255#255#0#255#255#255#0#255#255#255#0
+  +#164'e4'#29#167'i:'#159#167'j:'#222#165'g6'#246#167'i9'#229#167'j:'#188#164
+  +'e4S'#164'e4'#5#255#255#255#0#255#255#255#0#255#255#255#0#164'e4y'#164'e4'#16
+  +#9'NumGlyphs'#2#0#7'OnClick'#7#23'RefreshSpeedButtonClick'#8'ShowHint'#9#14
+  +'ParentShowHint'#8#0#0#5'TEdit'#14'CodeFilterEdit'#22'AnchorSideLeft.Control'
+  +#7#8'CodePage'#21'AnchorSideTop.Control'#7#8'CodePage'#23'AnchorSideRight.Co'
+  +'ntrol'#7#8'CodePage'#20'AnchorSideRight.Side'#7#9'asrBottom'#6'Height'#2#23
+  ,#5'Width'#3#157#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'AutoSelec'
+  +'t'#9#8'OnChange'#7#20'CodeFilterEditChange'#8'TabOrder'#2#0#4'Text'#6#14'Co'
+  +'deFilterEdit'#0#0#0#0#5'TPage'#14'DirectivesPage'#7'Caption'#6#14'Directive'
+  +'sPage'#11'ClientWidth'#3#211#0#12'ClientHeight'#3#191#1#0#5'TEdit'#20'Direc'
+  +'tivesFilterEdit'#22'AnchorSideLeft.Control'#7#14'DirectivesPage'#21'AnchorS'
+  +'ideTop.Control'#7#14'DirectivesPage'#23'AnchorSideRight.Control'#7#14'Direc'
+  +'tivesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#6'Height'#2#23#5'Width'#3
+  +#211#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7#26'Direct'
+  +'ivesFilterEditChange'#8'TabOrder'#2#0#4'Text'#6#20'DirectivesFilterEdit'#0#0
+  +#9'TTreeView'#18'DirectivesTreeView'#21'AnchorSideTop.Control'#7#20'Directiv'
+  +'esFilterEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#167#1#3'Top'
+  +#2#24#5'Width'#3#211#0#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#1#17'DefaultItemHeight'
+  +#2#19#9'PopupMenu'#7#13'TreePopupmenu'#8'TabOrder'#2#1#10'OnDblClick'#7#26'D'
+  +'irectivesTreeViewDblClick'#10'OnDeletion'#7#26'DirectivesTreeViewDeletion'#7
   +'OnKeyUp'#7#23'DirectivesTreeViewKeyUp'#0#0#0#0#10'TImageList'#10'Imagelist1'
   +#4'left'#2'@'#3'top'#2' '#0#0#10'TPopupMenu'#13'TreePopupmenu'#4'left'#2'@'#3
   +'top'#2'H'#0#9'TMenuItem'#9'MenuItem1'#7'Caption'#6#9'New Item1'#7'Visible'#8
diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas
index 9708029651..00496f95ff 100644
--- a/ide/codeexplorer.pas
+++ b/ide/codeexplorer.pas
@@ -85,8 +85,9 @@ type
     Imagelist1: TImageList;
     MainNotebook: TNotebook;
     MenuItem1: TMenuItem;
-    OptionsButton: TButton;
-    RefreshButton: TButton;
+    CodeTreeviewButtonPanel: TPanel;
+    OptionsSpeedButton: TSpeedButton;
+    RefreshSpeedButton: TSpeedButton;
     TreePopupmenu: TPopupMenu;
     procedure CodeExplorerViewClose(Sender: TObject;
                                     var CloseAction: TCloseAction);
@@ -105,10 +106,10 @@ type
       Shift: TShiftState);
     procedure JumpToMenuitemClick(Sender: TObject);
     procedure MainNotebookPageChanged(Sender: TObject);
-    procedure OptionsButtonClick(Sender: TObject);
-    procedure RefreshButtonClick(Sender: TObject);
+    procedure OptionsSpeedButtonClick(Sender: TObject);
     procedure RefreshMenuitemClick(Sender: TObject);
     procedure OnApplicationIdle(Sender: TObject; var Done: Boolean);
+    procedure RefreshSpeedButtonClick(Sender: TObject);
   private
     FCodeFilename: string;
     FDirectivesFilename: string;
@@ -286,8 +287,8 @@ begin
   Caption := lisMenuViewCodeExplorer;
   EnvironmentOptions.IDEWindowLayoutList.Apply(Self,Name);
   
-  RefreshButton.Caption:=dlgUnitDepRefresh;
-  OptionsButton.Caption:=dlgFROpts;
+  RefreshSpeedButton.Hint:=dlgUnitDepRefresh;
+  OptionsSpeedButton.Hint:=dlgFROpts;
   CodeFilterEdit.Text:=lisCEFilter;
   CodePage.Caption:=dlgCodeGeneration;
   DirectivesFilterEdit.Text:=lisCEFilter;
@@ -398,17 +399,12 @@ begin
   Refresh(true);
 end;
 
-procedure TCodeExplorerView.OptionsButtonClick(Sender: TObject);
+procedure TCodeExplorerView.OptionsSpeedButtonClick(Sender: TObject);
 begin
   if ShowCodeExplorerOptions=mrOk then
     SaveCodeExplorerOptions;
 end;
 
-procedure TCodeExplorerView.RefreshButtonClick(Sender: TObject);
-begin
-  Refresh(true);
-end;
-
 procedure TCodeExplorerView.RefreshMenuitemCLICK(Sender: TObject);
 begin
   Refresh(true);
@@ -421,6 +417,11 @@ begin
     Refresh(true);
 end;
 
+procedure TCodeExplorerView.RefreshSpeedButtonClick(Sender: TObject);
+begin
+  Refresh(true);
+end;
+
 function TCodeExplorerView.GetCodeNodeDescription(ACodeTool: TCodeTool;
   CodeNode: TCodeTreeNode): string;
 begin