diff --git a/components/tvplanit/source/design/vpnabed.lfm b/components/tvplanit/source/design/vpnabed.lfm
index 7b3d71f7b..22bc0f182 100644
--- a/components/tvplanit/source/design/vpnabed.lfm
+++ b/components/tvplanit/source/design/vpnabed.lfm
@@ -149,11 +149,12 @@ object frmNavBarEd: TfrmNavBarEd
           AnchorSideLeft.Control = btnFolderUp
           AnchorSideLeft.Side = asrBottom
           AnchorSideTop.Control = pnlFolderBtns
-          Left = 83
+          Left = 87
           Height = 25
           Hint = 'Move folder down'
           Top = 0
           Width = 25
+          BorderSpacing.Left = 4
           Glyph.Data = {
             DE000000424DDE0000000000000076000000280000000D0000000D0000000100
             0400000000006800000000000000000000001000000010000000000000000000
diff --git a/components/tvplanit/source/design/vpnabed.pas b/components/tvplanit/source/design/vpnabed.pas
index 3aee2fc20..35648962a 100644
--- a/components/tvplanit/source/design/vpnabed.pas
+++ b/components/tvplanit/source/design/vpnabed.pas
@@ -325,8 +325,17 @@ begin
 end;
 
 procedure TfrmNavBarEd.FormShow(Sender: TObject);
+var
+  delta: Integer;
+  h: Integer;
 begin
   PopulateImagesList;
+  delta := lbFolders.Left;
+  pnlFolders.Constraints.MinWidth := btnFolderDown.Left + btnFolderDown.Width + delta;
+  pnlItems.Constraints.MinWidth := btnItemDown.Left + btnItemDown.Width + lbImages.Width + btnUseImage.Width + delta;
+  Constraints.MinWidth := pnlFolders.Constraints.MinWidth + pnlItems.Constraints.MinWidth;
+  lbItemsMeasureItem(nil, 0, h);
+  Constraints.MinHeight := lbItems.Top + h + pnlItemBtns.Height + 3*delta;
   lbFolders.SetFocus;
 end;
 
@@ -622,6 +631,7 @@ begin
       btn.IconIndex
     );
   end;
+  dec(Rect.Right, Bar.Images.Width + 2*delta);
 
   // Draw text
   ts := lb.Canvas.TextStyle;