AutoSize

bgrasvgtheme.pas

@@ -623,8 +623,6 @@ end;
 function TBGRASVGTheme.PreferredButtonHeight(const hasGlyph: boolean): Integer;
 begin
   Result := (FButtonTextSpacing * 2);
-  if (hasGlyph) then
-    Result := Result + FGlyphTextSpacing;
 end;
 
 function TBGRASVGTheme.PreferredButtonWidth(const hasGlyph: boolean): Integer;

bgrathemebutton.pas

@@ -114,6 +114,11 @@ begin
   begin
     PreferredWidth := Canvas.TextWidth(Caption) + Theme.PreferredButtonWidth(Assigned(FImageList));
     PreferredHeight := Canvas.TextHeight(Caption) + Theme.PreferredButtonHeight(Assigned(FImageList));
+    if Assigned(FImageList) then
+    begin
+      PreferredWidth := PreferredWidth + FImageList.Width;
+      PreferredHeight := PreferredHeight + FImageList.Height;
+    end;
   end;
 end;