diff --git a/components/tvplanit/source/design/vpnabed.lfm b/components/tvplanit/source/design/vpnabed.lfm
index 22bc0f182..f0c0bfe1a 100644
--- a/components/tvplanit/source/design/vpnabed.lfm
+++ b/components/tvplanit/source/design/vpnabed.lfm
@@ -209,11 +209,9 @@ object frmNavBarEd: TfrmNavBarEd
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Top = 4
         BorderSpacing.Right = 4
-        ItemHeight = 13
+        ItemHeight = 0
         OnClick = lbItemsClick
         OnDrawItem = lbItemsDrawItem
-        OnMeasureItem = lbItemsMeasureItem
-        Style = lbOwnerDrawVariable
         TabOrder = 0
       end
       object pnlItemBtns: TPanel
diff --git a/components/tvplanit/source/design/vpnabed.pas b/components/tvplanit/source/design/vpnabed.pas
index 9e4797fd0..a9bb1b3db 100644
--- a/components/tvplanit/source/design/vpnabed.pas
+++ b/components/tvplanit/source/design/vpnabed.pas
@@ -536,8 +536,15 @@ begin
   FBar := ABar;
   FDesigner := ADesigner;
 
-  if FBar <> nil then
+  if FBar <> nil then begin
     FBar.FreeNotification(self);
+    if FBar.Images = nil then
+      lbItems.Style := lbStandard
+    else begin
+      lbItems.ItemHeight := FBar.Images.Height + 2 * vITEMS_MARGIN;
+      lbItems.Style := lbOwnerDrawFixed;
+    end;
+  end;
 
   PopulateFolderList;
   PopulateImagesList;
@@ -632,8 +639,8 @@ begin
       (Rect.Top + Rect.Bottom - Bar.Images.Height) div 2,
       btn.IconIndex
     );
+    dec(Rect.Right, Bar.Images.Width + 2*delta);
   end;
-  dec(Rect.Right, Bar.Images.Width + 2*delta);
 
   // Draw text
   ts := lb.Canvas.TextStyle;