diff --git a/ide/projectinspector.lfm b/ide/projectinspector.lfm
index 54ed3ed2e5..a237c384a7 100644
--- a/ide/projectinspector.lfm
+++ b/ide/projectinspector.lfm
@@ -1,7 +1,7 @@
 object ProjectInspectorForm: TProjectInspectorForm
-  Left = 328
+  Left = 374
   Height = 474
-  Top = 24
+  Top = 0
   Width = 425
   ActiveControl = ItemsTreeView
   Caption = 'ProjectInspectorForm'
@@ -39,6 +39,8 @@ object ProjectInspectorForm: TProjectInspectorForm
     TabOrder = 1
     object OpenButton: TSpeedButton
       AnchorSideLeft.Control = BtnPanel
+      AnchorSideTop.Control = BtnPanel
+      AnchorSideTop.Side = asrCenter
       Left = 1
       Height = 26
       Top = 1
@@ -58,7 +60,7 @@ object ProjectInspectorForm: TProjectInspectorForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = OpenButton
       AnchorSideTop.Side = asrCenter
-      Left = 43
+      Left = 37
       Height = 25
       Top = 2
       Width = 25
@@ -78,7 +80,7 @@ object ProjectInspectorForm: TProjectInspectorForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = OpenButton
       AnchorSideTop.Side = asrCenter
-      Left = 69
+      Left = 63
       Height = 25
       Top = 2
       Width = 25
@@ -96,13 +98,15 @@ object ProjectInspectorForm: TProjectInspectorForm
     object FilterEdit: TTreeFilterEdit
       AnchorSideLeft.Control = SortAlphabeticallyButton
       AnchorSideLeft.Side = asrBottom
-      Left = 97
-      Height = 28
-      Top = 1
-      Width = 305
+      AnchorSideTop.Control = SortAlphabeticallyButton
+      AnchorSideTop.Side = asrCenter
+      Left = 91
+      Height = 22
+      Top = 3
+      Width = 311
       ButtonWidth = 23
       NumGlyphs = 0
-      Anchors = [akLeft, akRight]
+      Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 3
       Font.Color = clBtnShadow
       MaxLength = 0
diff --git a/packager/packageeditor.lfm b/packager/packageeditor.lfm
index 82e6a47be0..1bc0fc8949 100644
--- a/packager/packageeditor.lfm
+++ b/packager/packageeditor.lfm
@@ -1,7 +1,7 @@
 inherited PackageEditorForm: TPackageEditorForm
-  Left = 278
+  Left = 385
   Height = 455
-  Top = 490
+  Top = 525
   Width = 577
   Caption = 'PackageEditorForm'
   ClientHeight = 455
@@ -25,18 +25,18 @@ inherited PackageEditorForm: TPackageEditorForm
   object FilePropsGroupBox: TGroupBox[1]
     Left = 0
     Height = 118
-    Top = 314
+    Top = 318
     Width = 577
     Align = alBottom
     Caption = 'FilePropsGroupBox'
-    ClientHeight = 96
-    ClientWidth = 569
+    ClientHeight = 99
+    ClientWidth = 571
     TabOrder = 2
     object CallRegisterProcCheckBox: TCheckBox
       Left = 0
-      Height = 23
+      Height = 21
       Top = 0
-      Width = 222
+      Width = 174
       Caption = 'CallRegisterProcCheckBox'
       OnChange = CallRegisterProcCheckBoxChange
       ParentShowHint = False
@@ -46,10 +46,10 @@ inherited PackageEditorForm: TPackageEditorForm
     object AddToUsesPkgSectionCheckBox: TCheckBox
       AnchorSideLeft.Control = CallRegisterProcCheckBox
       AnchorSideLeft.Side = asrBottom
-      Left = 232
-      Height = 23
+      Left = 184
+      Height = 21
       Top = 0
-      Width = 264
+      Width = 203
       BorderSpacing.Left = 10
       Caption = 'AddToUsesPkgSectionCheckBox'
       OnChange = AddToUsesPkgSectionCheckBoxChange
@@ -62,9 +62,9 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideTop.Control = MinVersionEdit
       AnchorSideTop.Side = asrCenter
       Left = 0
-      Height = 23
-      Top = 3
-      Width = 211
+      Height = 21
+      Top = 1
+      Width = 163
       Caption = 'UseMinVersionCheckBox'
       OnChange = UseMinVersionCheckBoxChange
       TabOrder = 2
@@ -73,8 +73,8 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideLeft.Control = UseMinVersionCheckBox
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = FilePropsGroupBox
-      Left = 221
-      Height = 28
+      Left = 173
+      Height = 22
       Top = 0
       Width = 100
       BorderSpacing.Left = 10
@@ -87,9 +87,9 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideTop.Control = MaxVersionEdit
       AnchorSideTop.Side = asrCenter
       Left = 0
-      Height = 23
-      Top = 33
-      Width = 216
+      Height = 21
+      Top = 25
+      Width = 167
       Caption = 'UseMaxVersionCheckBox'
       OnChange = UseMaxVersionCheckBoxChange
       TabOrder = 4
@@ -99,9 +99,9 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = MinVersionEdit
       AnchorSideTop.Side = asrBottom
-      Left = 226
-      Height = 28
-      Top = 30
+      Left = 177
+      Height = 22
+      Top = 24
       Width = 100
       BorderSpacing.Left = 10
       BorderSpacing.Top = 2
@@ -114,9 +114,9 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideTop.Control = MaxVersionEdit
       AnchorSideTop.Side = asrBottom
       Left = 0
-      Height = 30
-      Top = 64
-      Width = 193
+      Height = 23
+      Top = 52
+      Width = 152
       AutoSize = True
       BorderSpacing.Top = 6
       Caption = 'ApplyDependencyButton'
@@ -127,21 +127,21 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideTop.Control = CallRegisterProcCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 0
-      Height = 67
-      Top = 29
-      Width = 569
+      Height = 72
+      Top = 27
+      Width = 571
       Align = alBottom
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Top = 6
       Caption = 'RegisteredPluginsGroupBox'
-      ClientHeight = 45
-      ClientWidth = 561
+      ClientHeight = 53
+      ClientWidth = 565
       TabOrder = 7
       object RegisteredListBox: TListBox
         Left = 0
-        Height = 45
+        Height = 53
         Top = 0
-        Width = 561
+        Width = 565
         Align = alClient
         ItemHeight = 0
         OnDrawItem = RegisteredListBoxDrawItem
@@ -153,10 +153,10 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideLeft.Control = AddToUsesPkgSectionCheckBox
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = AddToUsesPkgSectionCheckBox
-      Left = 502
-      Height = 23
+      Left = 393
+      Height = 21
       Top = 0
-      Width = 241
+      Width = 186
       BorderSpacing.Left = 6
       Caption = 'DisableI18NForLFMCheckBox'
       OnChange = DisableI18NForLFMCheckBoxChange
@@ -167,8 +167,8 @@ inherited PackageEditorForm: TPackageEditorForm
   end
   object StatusBar: TStatusBar[2]
     Left = 0
-    Height = 23
-    Top = 432
+    Height = 19
+    Top = 436
     Width = 577
     Panels = <>
   end
@@ -176,55 +176,35 @@ inherited PackageEditorForm: TPackageEditorForm
     Cursor = crVSplit
     Left = 0
     Height = 5
-    Top = 309
+    Top = 313
     Width = 577
     Align = alBottom
     ResizeAnchor = akBottom
   end
-  object ItemsPanel: TPanel[4]
+  object BtnPanel: TPanel[4]
     Left = 0
-    Height = 261
+    Height = 28
     Top = 48
     Width = 577
-    Align = alClient
+    Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 261
+    ClientHeight = 28
     ClientWidth = 577
     TabOrder = 1
-    object FilesTreeView: TTreeView
-      AnchorSideTop.Control = FilterEdit
-      AnchorSideTop.Side = asrBottom
-      Left = 0
-      Height = 230
-      Top = 31
-      Width = 577
-      Align = alBottom
-      Anchors = [akTop, akLeft, akRight, akBottom]
-      BorderSpacing.Top = 3
-      DefaultItemHeight = 16
-      PopupMenu = FilesPopupMenu
-      ReadOnly = True
-      RightClickSelect = True
-      TabOrder = 1
-      OnDblClick = FixFilesCaseMenuItemClick
-      OnKeyPress = FilesTreeViewKeyPress
-      OnSelectionChanged = FilesTreeViewSelectionChanged
-      Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
-    end
     object DirectoryHierarchyButton: TSpeedButton
-      AnchorSideLeft.Control = DummyButton
+      AnchorSideLeft.Control = OpenButton
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = OpenButton
       AnchorSideTop.Side = asrCenter
       AnchorSideBottom.Side = asrBottom
-      Left = 42
+      Left = 36
       Height = 25
-      Top = 3
+      Top = 2
       Width = 25
       AllowAllUp = True
       Anchors = [akTop, akLeft, akBottom]
       AutoSize = True
-      BorderSpacing.Left = 1
+      BorderSpacing.Left = 11
       Constraints.MinHeight = 25
       Constraints.MinWidth = 25
       GroupIndex = 1
@@ -239,9 +219,9 @@ inherited PackageEditorForm: TPackageEditorForm
       AnchorSideTop.Control = OpenButton
       AnchorSideTop.Side = asrCenter
       AnchorSideBottom.Side = asrBottom
-      Left = 68
+      Left = 62
       Height = 25
-      Top = 3
+      Top = 2
       Width = 25
       AllowAllUp = True
       AutoSize = True
@@ -257,12 +237,13 @@ inherited PackageEditorForm: TPackageEditorForm
     object FilterEdit: TTreeFilterEdit
       AnchorSideLeft.Control = SortAlphabeticallyButton
       AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ItemsPanel
+      AnchorSideTop.Control = SortAlphabeticallyButton
+      AnchorSideTop.Side = asrCenter
       AnchorSideRight.Side = asrBottom
-      Left = 96
-      Height = 28
-      Top = 0
-      Width = 458
+      Left = 90
+      Height = 22
+      Top = 3
+      Width = 464
       ButtonWidth = 23
       NumGlyphs = 0
       Anchors = [akTop, akLeft, akRight]
@@ -274,11 +255,13 @@ inherited PackageEditorForm: TPackageEditorForm
       FilteredTreeview = FilesTreeView
     end
     object OpenButton: TSpeedButton
-      AnchorSideLeft.Control = ItemsPanel
+      AnchorSideLeft.Control = BtnPanel
+      AnchorSideTop.Control = BtnPanel
+      AnchorSideTop.Side = asrCenter
       AnchorSideBottom.Side = asrBottom
       Left = 0
       Height = 25
-      Top = 3
+      Top = 2
       Width = 25
       AllowAllUp = True
       Anchors = [akTop, akLeft, akBottom]
@@ -290,38 +273,37 @@ inherited PackageEditorForm: TPackageEditorForm
       ShowHint = True
       ParentShowHint = False
     end
-    object DummyButton: TSpeedButton
-      AnchorSideLeft.Control = OpenButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = OpenButton
-      AnchorSideTop.Side = asrCenter
-      AnchorSideBottom.Side = asrBottom
-      Left = 26
-      Height = 12
-      Top = 9
-      Width = 15
-      AllowAllUp = True
-      Anchors = [akTop, akLeft, akBottom]
-      BorderSpacing.Left = 1
-      NumGlyphs = 0
-      OnClick = DirectoryHierarchyButtonClick
-      ShowHint = True
-      ParentShowHint = False
-    end
   end
-  object FilesPopupMenu: TPopupMenu[5]
+  object FilesTreeView: TTreeView[5]
+    Left = 0
+    Height = 234
+    Top = 79
+    Width = 577
+    Align = alClient
+    BorderSpacing.Top = 3
+    DefaultItemHeight = 16
+    PopupMenu = FilesPopupMenu
+    ReadOnly = True
+    RightClickSelect = True
+    TabOrder = 5
+    OnDblClick = FixFilesCaseMenuItemClick
+    OnKeyPress = FilesTreeViewKeyPress
+    OnSelectionChanged = FilesTreeViewSelectionChanged
+    Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
+  end
+  object FilesPopupMenu: TPopupMenu[6]
     OnPopup = FilesPopupMenuPopup
-    left = 165
-    top = 160
+    left = 296
+    top = 8
   end
-  object UsePopupMenu: TPopupMenu[6]
+  object UsePopupMenu: TPopupMenu[7]
     OnPopup = UsePopupMenuPopup
-    left = 80
-    top = 112
+    left = 184
+    top = 8
   end
-  object MorePopupMenu: TPopupMenu[7]
+  object MorePopupMenu: TPopupMenu[8]
     OnPopup = MorePopupMenuPopup
-    left = 264
-    top = 192
+    left = 416
+    top = 8
   end
 end
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index fc5d1b956a..d3962e5235 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -145,8 +145,7 @@ type
     OpenButton: TSpeedButton;
     DisableI18NForLFMCheckBox: TCheckBox;
     FilterEdit: TTreeFilterEdit;
-    ItemsPanel: TPanel;
-    DummyButton: TSpeedButton;
+    BtnPanel: TPanel;
     SortAlphabeticallyButton: TSpeedButton;
     Splitter1: TSplitter;
     // toolbar