diff --git a/lcl/include/controlbar.inc b/lcl/include/controlbar.inc
index 22aaef617e..d4b42d3f50 100644
--- a/lcl/include/controlbar.inc
+++ b/lcl/include/controlbar.inc
@@ -133,13 +133,8 @@ begin
 end;
 
 function TCustomControlBar.CalcBandHeightSnapped(AControl: TControl): Integer;
-var
-  rowsz : integer;
-  rows  : integer;
 begin
-  rowsz := RowSize;
-  rows := (AControl.Height - (2 * cBandBorderV) + (rowsz-1)) div rowsz;
-  Result := rows * rowsz;
+  Result := (1 + trunc((AControl.Height + 2 * cBandBorderV) div RowSize)) * RowSize;
 end;
 
 function TCustomControlBar.CalcInnerBevelWidth: Integer;
@@ -490,7 +485,7 @@ begin
   for i := 0 to ControlCount - 1 do begin
     aBand := TCtrlBand.Create;
     aBand.Control := Controls[i];
-    aBand.Height := CalcBandHeight(aBand.Control);
+    aBand.Height := CalcBandHeight(Controls[i]);
     aBand.Width := cFullGrabber + Controls[i].Width + cBandBorderH;
     aBand.Top := Controls[i].Top - (aBand.Height - Controls[i].Height) div 2;
     aBand.Left := Controls[i].Left - aIndent;
diff --git a/lcl/include/toolbar.inc b/lcl/include/toolbar.inc
index 7018580acd..4c46a09281 100644
--- a/lcl/include/toolbar.inc
+++ b/lcl/include/toolbar.inc
@@ -599,7 +599,6 @@ end;
 procedure TToolBar.DoAutoSize;
 begin
   // children are moved in ControlsAligned independent of AutoSize=true
-  inherited DoAutoSize; // needed for autosizing toolbar in controlbar bands
 end;
 
 function TToolBar.DropDownWidthIsStored: Boolean;
diff --git a/lcl/include/toolbutton.inc b/lcl/include/toolbutton.inc
index 403325fb0b..fc947d26c3 100644
--- a/lcl/include/toolbutton.inc
+++ b/lcl/include/toolbutton.inc
@@ -874,25 +874,14 @@ begin
   inherited GetPreferredSize(PreferredWidth, PreferredHeight, Raw, WithThemeSpace);
 
   if FToolbar = nil then Exit;
-
   RealButtonWidth := FToolbar.ButtonWidth;
   RealButtonHeight := FToolbar.ButtonHeight;
   if RealButtonHeight <= 0 then Exit;
-
-  if (AutoSize) then begin
-    // why FToolbar overrides prefered size?
-    if FToolBar.IsVertical then
-      PreferredWidth  := max( PreferredWidth, RealButtonWidth )
-    else
-      PreferredHeight := max( PreferredHeight, RealButtonHeight );
-  end
-  else begin
-    if FToolBar.IsVertical then
-      PreferredWidth := RealButtonWidth
-    else
-      PreferredHeight:= RealButtonHeight;
-  end;
-
+  // buttonheight overrules in hor toolbar
+  if FToolBar.IsVertical then
+    PreferredWidth := RealButtonWidth
+  else
+    PreferredHeight := RealButtonHeight;
 end;
 
 function TToolButton.IsWidthStored: Boolean;