Index: comctrls.pp
===================================================================
--- comctrls.pp	(revision 44847)
+++ comctrls.pp	(working copy)
@@ -2272,6 +2272,8 @@
     cHorSpacing = 7;
     cVertSpacing = 3;
   protected
+    FControlLeft: Integer;
+    FControlTop: Integer;
     function CalcPreferredHeight: Integer;
     function CalcPrefferedWidth: Integer;
     function GetDisplayName: string; override;
@@ -2361,6 +2363,7 @@
     FPrevHeight: Integer;
     FPrevWidth: Integer;
     FTextHeight: Integer;
+    procedure AlignControls(AControl: TControl; var RemainingClientRect: TRect); override;
     procedure BitmapOrImageListChange(Sender: TObject);
     procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer;
                                      {%H-}WithThemeSpace: Boolean); override;

Index: coolbar.inc
===================================================================
--- coolbar.inc	(revision 44847)
+++ coolbar.inc	(working copy)
@@ -409,6 +409,21 @@
   Invalidate;
 end;
 
+procedure TCustomCoolBar.AlignControls(AControl: TControl; var RemainingClientRect: TRect);
+var i: Integer;
+begin 
+  //DebugLn('AlignControls');
+  for i:=0 to Bands.Count-1 do
+    if assigned(Bands[i].FControl) then begin
+      Bands[i].FControl.Align:=alNone;
+      Bands[i].FControl.BorderSpacing.Around:=0;
+      Bands[i].FControl.Anchors:=[akLeft, akTop];
+      Bands[i].FControl.AnchorParallel(akLeft, Bands[i].FControlLeft, self);
+      Bands[i].FControl.AnchorParallel(akTop, Bands[i].FControlTop, self);
+    end;
+  inherited AlignControls(AControl, RemainingClientRect);
+end;
+
 procedure TCustomCoolBar.BitmapOrImageListChange(Sender: TObject);
 begin
   Invalidate;
@@ -470,8 +485,9 @@
       inc(x, aLeft);
       y := aTop+(FVisiBands[i].FHeight-FVisiBands[i].Control.Height) div 2;
       FVisiBands[i].Control.Width:=aWidth;
-      FVisiBands[i].Control.AnchorParallel(akLeft, x-cBorderWidth, self);
-      FVisiBands[i].Control.AnchorParallel(akTop, y-cBorderWidth, self);
+      FVisiBands[i].FControlLeft:=x-cBorderWidth;
+      FVisiBands[i].FControlTop:=y-cBorderWidth;
+      ReAlign;
     end;
     x := FVisiBands[i].Width;
     inc(aLeft, x);

Index: comctrls.pp
===================================================================
--- comctrls.pp	(revision 44921)
+++ comctrls.pp	(working copy)
@@ -2360,8 +2360,6 @@
     FDragBand: TDragBand;
     FDraggedBandIndex: Integer;  // -1 .. space below the last row; other negative .. invalid area
     FDragInitPos: Integer;       // Initial mouse X - position (for resizing Bands)
-    FPrevHeight: Integer;
-    FPrevWidth: Integer;
     FTextHeight: Integer;
     procedure AlignControls(AControl: TControl; var RemainingClientRect: TRect); override;
     procedure BitmapOrImageListChange(Sender: TObject);
@@ -2382,8 +2380,8 @@
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure Paint; override;
-    procedure Resize; override;
     procedure SetAlign(aValue: TAlign); reintroduce;
+    procedure WMSize(var Message: TLMSize); message LM_SIZE;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;

Index: coolbar.inc
===================================================================
--- coolbar.inc	(revision 44921)
+++ coolbar.inc	(working copy)
@@ -459,7 +459,7 @@
     inc(aLeft, FVisiBands[i].Width);
     aRowEnd := (i = aCountM1) or ((i < aCountM1)
       and ((FVisiBands[i+1].Break or Vertical)
-      or ((aLeft+FVisiBands[i+1].Width) > (ClientWidth-2*cBorderWidth))));
+      or ((aLeft+FVisiBands[i+1].Width) > ClientWidth)));  //condition must be same as in IsRowEnd 
     //Set all Bands in row to uniform height
     if aRowEnd then begin
       for y := aStartIndex to i do
@@ -506,8 +506,6 @@
     if aCountM1 >= 0 then EnableAutoSizing;
     dec(FUpdateCount);
   end;
-  FPrevWidth := Width;
-  FPrevHeight := Height;
 end;
 
 procedure TCustomCoolBar.CalculatePreferredSize(var PreferredWidth, PreferredHeight: Integer;
@@ -955,19 +953,11 @@
   end;
 end;
 
-procedure TCustomCoolBar.Resize;
-var aWidth, aHeight: Integer;
+procedure TCustomCoolBar.WMSize(var Message: TLMSize);
 begin
-  //DebugLn('Resize');
-  inherited Resize;
-  aWidth := Width;
-  aHeight := Height;
-  if ((aWidth <> FPrevWidth) or (aHeight <> FPrevHeight))
-    and (aWidth*aHeight > 0) and HandleAllocated then
-    begin
-      //DebugLn('Resize calls CalcAndAlign');
-      CalculateAndAlign;
-      Invalidate;  //Required by GTK2
-    end;
+  //DebugLn('WMSize');
+  inherited WMSize(Message);
+  CalculateAndAlign;
+  Invalidate;  //Required by GTK2
 end;