diff --git a/bcbutton.pas b/bcbutton.pas
index 7e8266eb..0127b2bb 100644
--- a/bcbutton.pas
+++ b/bcbutton.pas
@@ -91,8 +91,9 @@   TCustomBCButton = class(TBCStyleGraphicControl)
     FFlipArrow: boolean;
     FActiveButt: TBCButtonStyle;
     FBGRANormal, FBGRAHover, FBGRAClick: TBGRABitmapEx;
-    FCanvasScale: Single;
+    FCanvasScale, FRenderScale: Single;
     FCanvasScaleMode: TBCCanvasScaleMode;
+    FScaled: boolean;
     FGlyphAlignment: TBCAlignment;
     FGlyphOldPlacement: boolean;
     FGlyphScale: single;
@@ -217,6 +218,7 @@   TCustomBCButton = class(TBCStyleGraphicControl)
     function GetDebugText: string; override;
     {$ENDIF}
     function GetStyleExtension: string; override;
+    procedure ComputeScaling;
     procedure DrawControl; override;
     procedure RenderControl; override;
     property BGRANormal: TBGRABitmapEx read GetBGRANormal;
@@ -226,6 +228,7 @@   TCustomBCButton = class(TBCStyleGraphicControl)
     property AutoSizeExtraVertical: integer read AutoSizeExtraY;
     property AutoSizeExtraHorizontal: integer read AutoSizeExtraX;
     property CanvasScaleMode: TBCCanvasScaleMode read FCanvasScaleMode write SetCanvasScaleMode default csmAuto;
+    property Scaled: boolean read FScaled write FScaled default false;
     property StateNormal: TBCButtonState read FStateNormal write SetBCButtonStateNormal;
     property StateHover: TBCButtonState read FStateHover write SetBCButtonStateHover;
     property StateClicked: TBCButtonState read FStateClicked
@@ -307,6 +310,8 @@   TBCButton = class(TCustomBCButton)
     property StateNormal;
     property BorderSpacing;
     property CanvasScaleMode;
+    { Whether the component is DPI aware }
+    property Scaled;
     property Caption;
     property Color;
     property Constraints;
@@ -642,8 +647,8 @@ procedure TCustomBCButton.CalculateGlyphSize(out NeededWidth, NeededHeight: inte
 begin
   if Assigned(FGlyph) and not FGlyph.Empty then
   begin
-    NeededWidth := ceil(FGlyph.Width * FGlyphScale);
-    NeededHeight := ceil(FGlyph.Height * FGlyphScale);
+    NeededWidth := ceil(FGlyph.Width * FGlyphScale * FRenderScale);
+    NeededHeight := ceil(FGlyph.Height * FGlyphScale * FRenderScale);
   end
   else
   if Assigned(FImages) then
@@ -692,7 +697,9 @@ function TCustomBCButton.GetButtonRect: TRect;
 
 function TCustomBCButton.GetDropDownWidth(AFull: boolean): integer;
 begin
-  Result := FDropDownWidth + (ifthen(AFull, 2, 1) * FStateNormal.FBorder.Width);
+  Result := round(
+    (FDropDownWidth + (ifthen(AFull, 2, 1) * FStateNormal.FBorder.Width))
+    * FRenderScale / FCanvasScale);
 end;
 
 function TCustomBCButton.GetGlyph: TBitmap;
@@ -719,7 +726,7 @@ procedure TCustomBCButton.Render(ABGRA: TBGRABitmapEx; AState: TBCButtonState);
     if Assigned(FGlyph) and not FGlyph.Empty then
     begin
       ABitmap := FGlyph;
-      AScale := FCanvasScale * FGlyphScale;
+      AScale := FRenderScale * FGlyphScale;
     end else
     if Assigned(FImages) and (FImageIndex > -1) and (FImageIndex < FImages.Count) then
     begin
@@ -729,7 +736,7 @@ procedure TCustomBCButton.Render(ABGRA: TBGRABitmapEx; AState: TBCButtonState);
       AScale := 1;
       {$ELSE}
       FImages.GetBitmapRaw(FImageIndex, result);
-      ABitmap := AScale;
+      AScale := Screen.PixelsPerInch / 96 * FCanvasScale;
       {$ENDIF}
     end else
     begin
@@ -758,17 +765,18 @@ procedure TCustomBCButton.Render(ABGRA: TBGRABitmapEx; AState: TBCButtonState);
   if (csCreating in ControlState) or IsUpdating or (ABGRA = nil) then
     Exit;
 
-  if FCanvasScale <> 1 then
+
+  if FRenderScale <> 1 then
   begin
     scaledState := TBCButtonState.Create(nil);
     scaledState.Assign(AState);
-    scaledState.Scale(FCanvasScale, false);
+    scaledState.Scale(FRenderScale, false);
     scaledRounding := TBCRounding.Create(nil);
     scaledRounding.Assign(Rounding);
-    scaledRounding.Scale(FCanvasScale);
+    scaledRounding.Scale(FRenderScale);
     scaledRoundingDropDown := TBCRounding.Create(nil);
     scaledRoundingDropDown.Assign(RoundingDropDown);
-    scaledRoundingDropDown.Scale(FCanvasScale);
+    scaledRoundingDropDown.Scale(FRenderScale);
     freeScaled := true;
   end
   else
@@ -778,9 +786,9 @@ procedure TCustomBCButton.Render(ABGRA: TBGRABitmapEx; AState: TBCButtonState);
     scaledRoundingDropDown := RoundingDropDown;
     freeScaled := false;
   end;
-  scaledArrowSize := round(DropDownArrowSize * FCanvasScale);
-  scaledGlyphMargin := round(GlyphMargin * FCanvasScale);
-  scaledInnerMargin := round(InnerMargin * FCanvasScale);
+  scaledArrowSize := round(DropDownArrowSize * FRenderScale);
+  scaledGlyphMargin := round(GlyphMargin * FRenderScale);
+  scaledInnerMargin := round(InnerMargin * FRenderScale);
 
   ABGRA.NeedRender := False;
 
@@ -820,26 +828,27 @@ procedure TCustomBCButton.Render(ABGRA: TBGRABitmapEx; AState: TBCButtonState);
 
   // Click offset for text and glyph
   if FClickOffset and (AState = FStateClicked) then
-    r.Offset(round(1 * FCanvasScale), round(1 * FCanvasScale));
+    r.Offset(round(1 * FRenderScale), round(1 * FRenderScale));
 
   // DropDown arrow
   if FDropDownArrow and (FStyle <> bbtDropDown) then
   begin
     r_a := r;
-    r_a.Left := r_a.Right - round(FDropDownWidth * FCanvasScale);
+    r_a.Left := r_a.Right - round(FDropDownWidth * FRenderScale);
     if FFlipArrow then
       RenderArrow(TBGRABitmap(ABGRA), r_a, scaledArrowSize, badUp,
         scaledState.FontEx.Color)
     else
       RenderArrow(TBGRABitmap(ABGRA), r_a, scaledArrowSize, badDown,
         scaledState.FontEx.Color);
-    Dec(R.Right, round(FDropDownWidth * FCanvasScale));
+    Dec(R.Right, round(FDropDownWidth * FRenderScale));
   end;
 
   GetActualGlyph(g, gScale);
   if FShowCaption then actualCaption := self.Caption else actualCaption := '';
   r_g := ComputeGlyphPosition(r, g, GlyphAlignment, scaledGlyphMargin, actualCaption,
     scaledState.FontEx, GlyphOldPlacement, gScale);
+
   if FTextApplyGlobalOpacity then
   begin
     { Drawing text }
@@ -880,7 +889,7 @@ procedure TCustomBCButton.RenderState(ABGRA: TBGRABitmapEx;
   AState: TBCButtonState; const ARect: TRect; ARounding: TBCRounding);
 begin
   RenderBackgroundAndBorder(ARect, AState.FBackground, TBGRABitmap(ABGRA),
-    ARounding, AState.FBorder, round(FInnerMargin * FCanvasScale));
+    ARounding, AState.FBorder, round(FInnerMargin * FRenderScale));
 end;
 
 procedure TCustomBCButton.OnChangeGlyph(Sender: TObject);
@@ -1183,35 +1192,36 @@ procedure TCustomBCButton.CalculatePreferredSize(
   var PreferredWidth, PreferredHeight: integer; WithThemeSpace: boolean);
 var
 //  AWidth: integer;
-  gh,gw: integer;
+  gh, gw, gm: integer;
   actualCaption: TCaption;
   horizAlign, relHorizAlign: TAlignment;
   vertAlign, relVertAlign: TTextLayout;
   glyphHorzMargin, glyphVertMargin: integer;
   tw, th, availW: integer;
-  canvasScale: single;
   scaledFont: TBCFont;
   ownScaledFont: Boolean;
 begin
   if (Parent = nil) or (not Parent.HandleAllocated) then
     Exit;
 
+  ComputeScaling;
+
   FLastBorderWidth := FStateNormal.Border.Width;
   CalculateGlyphSize(gw, gh);
+  gm := round(GlyphMargin * FRenderScale);
 
   // more precise computation of font with Retina scaling
-  canvasScale := GetCanvasScaleFactor;
-  if (canvasScale <> 1) and FShowCaption then
+  // and DPI aware computation
+  if (FRenderScale <> 1) and FShowCaption then
   begin
     scaledFont := TBCFont.Create(nil);
     scaledFont.Assign(FStateNormal.FontEx);
-    scaledFont.Scale(canvasScale, false);
+    scaledFont.Scale(FRenderScale, false);
     ownScaledFont := true;
   end else
   begin
     scaledFont := FStateNormal.FontEx;
     ownScaledFont := false;
-    canvasScale := 1;
   end;
 
   if GlyphOldPlacement then
@@ -1226,19 +1236,17 @@ procedure TCustomBCButton.CalculatePreferredSize(
     if FShowCaption then
     begin
       CalculateTextSize(Caption, scaledFont, PreferredWidth, PreferredHeight);
-      PreferredWidth := ceil(PreferredWidth/canvasScale);
-      PreferredHeight := ceil(PreferredHeight/canvasScale);
     end;
 
     // Extra pixels for DropDown
     if Style = bbtDropDown then
       if FDropDownPosition in [bdpBottom] then
-        Inc(PreferredHeight, GetDropDownWidth)
+        Inc(PreferredHeight, round(GetDropDownWidth * FCanvasScale))
       else
-        Inc(PreferredWidth, GetDropDownWidth);
+        Inc(PreferredWidth, round(GetDropDownWidth * FCanvasScale));
 
     if (Style = bbtButton) and FDropDownArrow then
-      Inc(PreferredWidth, FDropDownArrowSize);// GetDropDownWidth);
+      Inc(PreferredWidth, round(FDropDownArrowSize * FRenderScale));
 
 
     //if (FGlyph <> nil) and (not FGlyph.Empty) then
@@ -1252,63 +1260,63 @@ procedure TCustomBCButton.CalculatePreferredSize(
       end
       else
       begin
-        Inc(PreferredWidth, gw + FGlyphMargin);
+        Inc(PreferredWidth, gw + gm);
         if gh > PreferredHeight then
           PreferredHeight := gh;
       end;
     end;
 
     // Extra pixels for AutoSize
-    Inc(PreferredWidth, AutoSizeExtraX);
-    Inc(PreferredHeight, AutoSizeExtraY);
+    Inc(PreferredWidth, round(AutoSizeExtraX * FRenderScale));
+    Inc(PreferredHeight, round(AutoSizeExtraY * FRenderScale));
   end else
   begin
     if ShowCaption then actualCaption := Caption else actualCaption := '';
-    PreferredWidth := round(InnerMargin);
-    PreferredHeight := round(InnerMargin);
+    PreferredWidth := round(InnerMargin * FRenderScale);
+    PreferredHeight := round(InnerMargin * FRenderScale);
     case FStyle of
     bbtDropDown:
       case FDropDownPosition of
-        bdpBottom: inc(PreferredHeight, GetDropDownWidth(False));
-        else{bdpLeft} inc(PreferredWidth, GetDropDownWidth(False));
+        bdpBottom: inc(PreferredHeight, round(GetDropDownWidth(False) * FCanvasScale));
+        else{bdpLeft} inc(PreferredWidth, round(GetDropDownWidth(False) * FCanvasScale));
       end;
     else{bbtButton} if FDropDownArrow then
-      inc(PreferredWidth, FDropDownWidth);
+      inc(PreferredWidth, round(FDropDownWidth * FRenderScale));
     end;
-    inc(PreferredWidth, FStateNormal.Border.Width);
-    inc(PreferredHeight, FStateNormal.Border.Width);
+    inc(PreferredWidth, round(FStateNormal.Border.Width * FRenderScale));
+    inc(PreferredHeight, round(FStateNormal.Border.Width * FRenderScale));
 
     if actualCaption='' then
     begin
       inc(PreferredWidth,gw);
       inc(PreferredHeight,gh);
-      if gw>0 then inc(PreferredWidth, GlyphMargin*2);
-      if gh>0 then inc(PreferredHeight, GlyphMargin*2);
+      if gw>0 then inc(PreferredWidth, gm*2);
+      if gh>0 then inc(PreferredHeight, gm*2);
     end else
     begin
-      GetGlyphActualLayout(actualCaption, FStateNormal.FontEx, GlyphAlignment, GlyphMargin,
+      GetGlyphActualLayout(actualCaption, scaledFont, GlyphAlignment, gm,
         horizAlign, vertAlign, relHorizAlign, relVertAlign, glyphHorzMargin, glyphVertMargin);
       availW := 65535;
       if (Align in [alTop,alBottom]) and (Parent <> nil) then
-        availW := Parent.ClientWidth - PreferredWidth;
+        availW := round((Parent.ClientWidth - BorderSpacing.Left - BorderSpacing.Right) * FCanvasScale - PreferredWidth);
       CalculateTextSizeEx(actualCaption, scaledFont, tw, th, availW);
-      tw := ceil(tw/canvasScale);
-      th := ceil(th/canvasScale);
 
-      if (tw<>0) and FStateNormal.FontEx.WordBreak then inc(tw);
+      if (tw<>0) and scaledFont.WordBreak then inc(tw);
       if vertAlign<>relVertAlign then
       begin
-        inc(PreferredWidth,  max(gw+2*GlyphMargin,tw));
-        inc(PreferredHeight, GlyphMargin+gh+th);
+        inc(PreferredWidth,  max(gw+2*gm,tw));
+        inc(PreferredHeight, gm+gh+th);
       end
       else
       begin
-        inc(PreferredWidth,  GlyphMargin+gw+tw);
-        inc(PreferredHeight, max(gh+2*GlyphMargin,th));
+        inc(PreferredWidth,  gm+gw+tw);
+        inc(PreferredHeight, max(gh+2*gm,th));
       end;
     end;
   end;
   if ownScaledFont then scaledFont.Free;
+  PreferredWidth:= ceil(PreferredWidth / FCanvasScale);
+  PreferredHeight := ceil(PreferredHeight / FCanvasScale);
 end;
 
 class function TCustomBCButton.GetControlClassDefaultSize: TSize;
@@ -1848,16 +1856,28 @@ function TCustomBCButton.GetDebugText: string;
 
 {$ENDIF}
 
-procedure TCustomBCButton.DrawControl;
-var
-  bgra: TBGRABitmapEx;
-  r: TRect;
+procedure TCustomBCButton.ComputeScaling;
 begin
+  // Scaling relative to screen coordinates
   if (CanvasScaleMode = csmFullResolution) or
     ((CanvasScaleMode = csmAuto) and not Assigned(OnAfterRenderBCButton)) then
     FCanvasScale := GetCanvasScaleFactor
     else FCanvasScale := 1;
 
+  // Scaling relative to DPI and or screen coordinates
+  if Scaled then
+    FRenderScale := (Screen.PixelsPerInch / GetDesignTimePPI(self)) * FCanvasScale
+  else
+    FRenderScale := FCanvasScale;
+end;
+
+procedure TCustomBCButton.DrawControl;
+var
+  bgra: TBGRABitmapEx;
+  r: TRect;
+begin
+  ComputeScaling;
+
   // If style is without dropdown button or state of each button
   // is the same (possible only for msNone) or static button then
   // we can draw whole BGRABitmap
diff --git a/bccombobox.pas b/bccombobox.pas
index 7f20a667..d488a539 100644
--- a/bccombobox.pas
+++ b/bccombobox.pas
@@ -17,6 +17,7 @@   TBCComboBox = class(TBCStyleCustomControl)
   private
     FButton: TBCButton;
     FCanvasScaleMode: TBCCanvasScaleMode;
+    FScaled: boolean;
     FDropDownBorderSize: integer;
     FDropDownCount: integer;
     FDropDownColor: TColor;
@@ -90,6 +91,7 @@   TBCComboBox = class(TBCStyleCustomControl)
     procedure SetMemoryUsage(AValue: TBCButtonMemoryUsage);
     procedure SetOnDrawSelectedItem(AValue: TOnAfterRenderBCButton);
     procedure SetRounding(AValue: TBCRounding);
+    procedure SetScaled(AValue: boolean);
     procedure SetStateClicked(AValue: TBCButtonState);
     procedure SetStateHover(AValue: TBCButtonState);
     procedure SetStateNormal(AValue: TBCButtonState);
@@ -127,6 +129,7 @@   TBCComboBox = class(TBCStyleCustomControl)
     procedure AdaptDropDownContainerSize;
     function GetListBox: TListBox;
     procedure UpdateButtonCanvasScaleMode;
+    procedure Resize; override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -143,6 +146,7 @@   TBCComboBox = class(TBCStyleCustomControl)
     property BorderSpacing;
     property Canvas: TCanvas read GetComboCanvas;
     property CanvasScaleMode: TBCCanvasScaleMode read FCanvasScaleMode write SetCanvasScaleMode default csmAuto;
+    property Scaled: boolean read FScaled write SetScaled default false;
     property Hint: TTranslateString read GetButtonHint write SetButtonHint;
     property Items: TStrings read GetItems write SetItems;
     property ItemIndex: integer read GetItemIndex write SetItemIndex;
@@ -188,7 +192,7 @@ procedure Register;
 
 implementation
 
-uses math, PropEdits, BGRAText;
+uses math, PropEdits, BGRAText, BCTools;
 
 procedure Register;
 begin
@@ -197,6 +201,16 @@ procedure Register;
 
 { TBCComboBox }
 
+procedure TBCComboBox.Resize;
+begin
+  inherited Resize;
+
+  // Ensure button really fills us
+  if Assigned(FButton) then FButton.SetBounds(0,0,ClientWidth,ClientHeight);
+  // If dropdown is created, update its width
+  if Assigned(FListBox) then AutosizeListBox;
+end;
+
 procedure TBCComboBox.ButtonClick(Sender: TObject);
 const MinDelayReopen = 500/(1000*60*60*24);
 var
@@ -636,6 +650,14 @@ procedure TBCComboBox.SetRounding(AValue: TBCRounding);
   Button.Rounding := AValue;
 end;
 
+procedure TBCComboBox.SetScaled(AValue: boolean);
+begin
+  if FScaled=AValue then Exit;
+  FScaled:=AValue;
+  if Assigned(FButton) then
+    FButton.Scaled := AValue;
+end;
+
 procedure TBCComboBox.SetStateClicked(AValue: TBCButtonState);
 begin
   Button.StateClicked := AValue;
@@ -927,12 +949,23 @@ function TBCComboBox.CloseDropDown: boolean;
 procedure TBCComboBox.PrepareListBoxForDropDown;
 var
   h: Integer;
+  scale: single;
 begin
   FListBox.Font.Name := Button.StateNormal.FontEx.Name;
   FListBox.Font.Style := Button.StateNormal.FontEx.Style;
-  FListBox.Font.Height := FontEmHeightSign*Button.StateNormal.FontEx.Height;
+  if Scaled then
+    scale := Screen.PixelsPerInch / GetDesignTimePPI(self)
+  else
+    scale := 1;
+  FListBox.Font.Height :=
+    round(FontEmHeightSign * Button.StateNormal.FontEx.Height * scale);
   if Assigned(FOnDrawItem) and (FItemHeight <> 0) then
-    h := FItemHeight else h := self.Canvas.GetTextHeight('Hg');
+    h := FItemHeight
+  else
+  begin
+    FListBox.Canvas.Font.Assign(FListBox.Font);
+    h:=FListBox.Canvas.GetTextHeight('Hg');
+  end;
   {$IF defined(LCLgtk2)}
   inc(h,2);
   {$ELSEIF defined(LCLgtk3)}
@@ -946,10 +979,12 @@ procedure TBCComboBox.PrepareListBoxForDropDown;
 
 procedure TBCComboBox.AutosizeListBox;
 var
+  visibleCount: Integer;
   s: TSize;
 begin
-  s := TSize.Create(FButton.Width,
-    (FListBox.ItemHeight + FItemPadding)*min(Items.Count, FDropDownCount)
+  visibleCount := Min(Items.Count, FDropDownCount);
+  s := TSize.Create(Width,
+    (FListBox.ItemHeight + FItemPadding)*visibleCount
     + 2*FDropDownBorderSize);
   {$IFDEF DARWIN}
   // on MacOS there is a top and bottom margin of both 10
@@ -1006,6 +1041,7 @@ constructor TBCComboBox.Create(AOwner: TComponent);
   FButton.OnClick := ButtonClick;
   FButton.DropDownArrow := True;
   FButton.OnAfterRenderBCButton := OnAfterRenderButton;
+  FButton.Scaled := FScaled;
   FFocusBorderColor := clBlack;
   FFocusBorderOpacity := 0;
   UpdateButtonCanvasScaleMode;
diff --git a/bctools.pas b/bctools.pas
index 32f48220..9daa6cc0 100644
--- a/bctools.pas
+++ b/bctools.pas
@@ -73,10 +73,12 @@ procedure RenderText(const ARect: TRect; AFont: TBCFont;
 function BCAlign2HAlign(AAlign: TBCAlignment): TAlignment;
 // Return LCL vertical equivalent for BCAlignment
 function BCAlign2VAlign(AAlign: TBCAlignment): TTextLayout;
+// Retrieve the original PPI used to design the form or return the default (96)
+function GetDesignTimePPI(AControl: TControl): integer;
 
 implementation
 
-uses BGRAPolygon, BGRAFillInfo, BGRAText, math, BGRAUTF8, LazUTF8;
+uses Forms, BGRAPolygon, BGRAFillInfo, BGRAText, math, BGRAUTF8, LazUTF8;
 
 function ComputeGlyphPosition(var rAvail: TRect; AGlyph: TBitmap;
   AGlyphAlignment: TBCAlignment; AGlyphMargin: integer; ACaption: string;
@@ -272,6 +274,17 @@ function BCAlign2VAlign(AAlign: TBCAlignment): TTextLayout;
     Result := tlTop;
 end;
 
+function GetDesignTimePPI(AControl: TControl): integer;
+begin
+  if AControl is TCustomDesignControl then
+    exit(TCustomDesignControl(Acontrol).DesignTimePPI)
+  else
+  if AControl.Parent = nil then
+    exit(96)
+  else
+    exit(GetDesignTimePPI(AControl.Parent));
+end;
+
 function ScaleRect(ARect: TRect; AScale: Single): TRect;
 begin
   with ARect do
diff --git a/test/test_bcbutton/bcsample.lpi b/test/test_bcbutton/bcsample.lpi
index 839ca127..660f6264 100644
--- a/test/test_bcbutton/bcsample.lpi
+++ b/test/test_bcbutton/bcsample.lpi
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="bcsample"/>
+      <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True"/>
+      </XPManifest>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>
@@ -94,8 +100,6 @@
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <FormatVersion Value="2"/>
diff --git a/test/test_bcbutton/bcsample.lpr b/test/test_bcbutton/bcsample.lpr
index 75a97e6e..3e1b2ad4 100644
--- a/test/test_bcbutton/bcsample.lpr
+++ b/test/test_bcbutton/bcsample.lpr
@@ -14,6 +14,7 @@
 
 begin
   RequireDerivedFormResource := True;
+  Application.Scaled:=True;
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/test/test_bcbutton/unit1.lfm b/test/test_bcbutton/unit1.lfm
index a48c57af..6b981c4f 100644
--- a/test/test_bcbutton/unit1.lfm
+++ b/test/test_bcbutton/unit1.lfm
@@ -14,6 +14,7 @@ object Form1: TForm1
     Top = 68
     Width = 160
     Action = Action1
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -36,7 +37,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -67,7 +68,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -97,7 +98,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -129,6 +130,7 @@ object Form1: TForm1
     Height = 50
     Top = 230
     Width = 330
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -151,7 +153,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -182,7 +184,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -212,7 +214,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -249,6 +251,7 @@ object Form1: TForm1
     Height = 50
     Top = 170
     Width = 160
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -271,7 +274,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -302,7 +305,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -332,7 +335,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -362,6 +365,7 @@ object Form1: TForm1
     Height = 50
     Top = 350
     Width = 330
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -384,7 +388,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -415,7 +419,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -445,7 +449,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -454,10 +458,11 @@ object Form1: TForm1
     StateNormal.FontEx.Style = []
     StateNormal.FontEx.PaddingLeft = 6
     StateNormal.FontEx.PaddingRight = 6
-    Caption = 'Flipped arrow and Right aligned Popup'
+    Caption = 'Flipped arrow & Right aligned Popup'
     Color = clNone
     DropDownWidth = 16
     DropDownArrowSize = 4
+	FlipArrow = True
     GlobalOpacity = 255
     GlyphOldPlacement = False
     GlyphMargin = 4
@@ -482,6 +487,7 @@ object Form1: TForm1
     Height = 110
     Top = 230
     Width = 170
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -504,7 +510,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.SingleLine = False
     StateClicked.FontEx.Shadow = False
@@ -537,7 +543,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.SingleLine = False
     StateHover.FontEx.Shadow = False
@@ -569,7 +575,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.SingleLine = False
     StateNormal.FontEx.Shadow = False
@@ -606,6 +612,7 @@ object Form1: TForm1
     Height = 50
     Top = 68
     Width = 160
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -628,7 +635,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -659,7 +666,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -689,7 +696,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -722,6 +729,7 @@ object Form1: TForm1
     Height = 50
     Top = 170
     Width = 160
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -744,7 +752,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -775,7 +783,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -803,7 +811,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -834,6 +842,7 @@ object Form1: TForm1
     Height = 50
     Top = 410
     Width = 330
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -856,7 +865,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -887,7 +896,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -917,7 +926,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -955,6 +964,7 @@ object Form1: TForm1
     Height = 50
     Top = 290
     Width = 330
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -977,7 +987,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.Shadow = False
     StateClicked.FontEx.ShadowRadius = 5
@@ -1008,7 +1018,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.Shadow = False
     StateHover.FontEx.ShadowRadius = 5
@@ -1038,7 +1048,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.Shadow = False
     StateNormal.FontEx.ShadowRadius = 5
@@ -1075,6 +1085,7 @@ object Form1: TForm1
     Height = 110
     Top = 350
     Width = 170
+	Scaled = True
     StateClicked.Background.Color = 15981500
     StateClicked.Background.Gradient1.StartColor = 15981500
     StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1097,7 +1108,7 @@ object Form1: TForm1
     StateClicked.Border.Style = bboSolid
     StateClicked.FontEx.Color = clBlack
     StateClicked.FontEx.FontQuality = fqSystemClearType
-    StateClicked.FontEx.Height = 11
+    StateClicked.FontEx.Height = 15
     StateClicked.FontEx.Name = 'Verdana'
     StateClicked.FontEx.SingleLine = False
     StateClicked.FontEx.Shadow = False
@@ -1130,7 +1141,7 @@ object Form1: TForm1
     StateHover.Border.Style = bboSolid
     StateHover.FontEx.Color = clBlack
     StateHover.FontEx.FontQuality = fqSystemClearType
-    StateHover.FontEx.Height = 11
+    StateHover.FontEx.Height = 15
     StateHover.FontEx.Name = 'Verdana'
     StateHover.FontEx.SingleLine = False
     StateHover.FontEx.Shadow = False
@@ -1162,7 +1173,7 @@ object Form1: TForm1
     StateNormal.Border.Style = bboSolid
     StateNormal.FontEx.Color = clBlack
     StateNormal.FontEx.FontQuality = fqSystemClearType
-    StateNormal.FontEx.Height = 11
+    StateNormal.FontEx.Height = 15
     StateNormal.FontEx.Name = 'Verdana'
     StateNormal.FontEx.SingleLine = False
     StateNormal.FontEx.Shadow = False
@@ -1203,7 +1214,6 @@ object Form1: TForm1
     Caption = 'Show Caption'
     Checked = True
     OnChange = CheckBox1Change
-    ParentFont = False
     State = cbChecked
     TabOrder = 0
   end
@@ -1259,6 +1269,7 @@ object Form1: TForm1
       Width = 40
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1281,7 +1292,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -1310,7 +1321,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -1338,7 +1349,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -1371,6 +1382,7 @@ object Form1: TForm1
       Width = 40
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1393,7 +1405,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -1422,7 +1434,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -1450,7 +1462,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -1483,6 +1495,7 @@ object Form1: TForm1
       Width = 40
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1505,7 +1518,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -1534,7 +1547,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -1562,7 +1575,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -1605,6 +1618,7 @@ object Form1: TForm1
       Width = 80
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1627,7 +1641,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -1658,7 +1672,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -1688,7 +1702,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -1723,6 +1737,7 @@ object Form1: TForm1
       Width = 90
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1745,7 +1760,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -1776,7 +1791,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -1806,7 +1821,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -1841,6 +1856,7 @@ object Form1: TForm1
       Width = 82
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1863,7 +1879,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -1894,7 +1910,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -1924,7 +1940,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -1960,6 +1976,7 @@ object Form1: TForm1
       Width = 59
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -1982,7 +1999,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -2013,7 +2030,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -2043,7 +2060,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -2088,6 +2105,7 @@ object Form1: TForm1
       Width = 25
       Align = alLeft
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -2110,7 +2128,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.Shadow = False
       StateClicked.FontEx.ShadowRadius = 5
@@ -2139,7 +2157,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.Shadow = False
       StateHover.FontEx.ShadowRadius = 5
@@ -2167,7 +2185,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboNone
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.Shadow = False
       StateNormal.FontEx.ShadowRadius = 5
@@ -2196,10 +2214,10 @@ object Form1: TForm1
     end
   end
   object BCPanel2: TBCPanel
-    Left = 656
+    Left = 626
     Height = 555
     Top = 41
-    Width = 79
+    Width = 109
     Align = alRight
     Background.Color = clBtnFace
     Background.Gradient1.StartColor = clWhite
@@ -2239,6 +2257,7 @@ object Form1: TForm1
       Width = 75
       Align = alTop
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -2261,7 +2280,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.SingleLine = False
       StateClicked.FontEx.Shadow = False
@@ -2294,7 +2313,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.SingleLine = False
       StateHover.FontEx.Shadow = False
@@ -2326,7 +2345,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboSolid
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.SingleLine = False
       StateNormal.FontEx.Shadow = False
@@ -2370,6 +2389,7 @@ object Form1: TForm1
       Width = 75
       Align = alTop
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -2392,7 +2412,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.SingleLine = False
       StateClicked.FontEx.Shadow = False
@@ -2425,7 +2445,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.SingleLine = False
       StateHover.FontEx.Shadow = False
@@ -2457,7 +2477,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboSolid
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.SingleLine = False
       StateNormal.FontEx.Shadow = False
@@ -2501,6 +2521,7 @@ object Form1: TForm1
       Width = 75
       Align = alTop
       AutoSize = True
+	  Scaled = True
       StateClicked.Background.Color = 15981500
       StateClicked.Background.Gradient1.StartColor = 15981500
       StateClicked.Background.Gradient1.EndColor = 16312531
@@ -2523,7 +2544,7 @@ object Form1: TForm1
       StateClicked.Border.Style = bboSolid
       StateClicked.FontEx.Color = clBlack
       StateClicked.FontEx.FontQuality = fqSystemClearType
-      StateClicked.FontEx.Height = 11
+      StateClicked.FontEx.Height = 15
       StateClicked.FontEx.Name = 'Verdana'
       StateClicked.FontEx.SingleLine = False
       StateClicked.FontEx.Shadow = False
@@ -2556,7 +2577,7 @@ object Form1: TForm1
       StateHover.Border.Style = bboSolid
       StateHover.FontEx.Color = clBlack
       StateHover.FontEx.FontQuality = fqSystemClearType
-      StateHover.FontEx.Height = 11
+      StateHover.FontEx.Height = 15
       StateHover.FontEx.Name = 'Verdana'
       StateHover.FontEx.SingleLine = False
       StateHover.FontEx.Shadow = False
@@ -2588,7 +2609,7 @@ object Form1: TForm1
       StateNormal.Border.Style = bboSolid
       StateNormal.FontEx.Color = clBlack
       StateNormal.FontEx.FontQuality = fqSystemClearType
-      StateNormal.FontEx.Height = 11
+      StateNormal.FontEx.Height = 15
       StateNormal.FontEx.Name = 'Verdana'
       StateNormal.FontEx.SingleLine = False
       StateNormal.FontEx.Shadow = False
@@ -3076,6 +3097,7 @@ object Form1: TForm1
       C0FF7098C0FF7098C0FF6098C0FF6098C0FF6090C0FF6090C0FF6090C0FF6090
       C0FF6088B0FF6088B0FF85ACD3FF
     }
+	Scaled = True
   end
   object PopupMenu1: TPopupMenu
     left = 380
diff --git a/test/test_bcbutton_functions/test.lpi b/test/test_bcbutton_functions/test.lpi
index 6da730f0..9deffe2d 100644
--- a/test/test_bcbutton_functions/test.lpi
+++ b/test/test_bcbutton_functions/test.lpi
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="test"/>
+      <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <XPManifest>
diff --git a/test/test_bcbutton_functions/test.lpr b/test/test_bcbutton_functions/test.lpr
index 47aa74ff..9ed76e0f 100644
--- a/test/test_bcbutton_functions/test.lpr
+++ b/test/test_bcbutton_functions/test.lpr
@@ -14,6 +14,7 @@
 
 begin
   RequireDerivedFormResource:=True;
+  Application.Scaled:=True;
   Application.Initialize;
   Application.CreateForm(TaForm, aForm);
   Application.Run;
diff --git a/test/test_bccombobox/umain.lfm b/test/test_bccombobox/umain.lfm
index eb96907c..4d4cf73d 100644
--- a/test/test_bccombobox/umain.lfm
+++ b/test/test_bccombobox/umain.lfm
@@ -30,6 +30,7 @@ object Form1: TForm1
     MemoryUsage = bmuHigh
     Rounding.RoundX = 12
     Rounding.RoundY = 12
+	Scaled = True
     StateClicked.Background.Gradient1.StartColor = 8404992
     StateClicked.Background.Gradient1.EndColor = 4194304
     StateClicked.Background.Gradient1.GradientType = gtRadial