diff --git a/lcl/customdrawn_android.pas b/lcl/customdrawn_android.pas
index 3c24feacec..4819e8df1f 100644
--- a/lcl/customdrawn_android.pas
+++ b/lcl/customdrawn_android.pas
@@ -169,13 +169,13 @@ var
   Str: string;
 begin
   // Button shape -> This crashes in Gtk2
-{  TmpB.Canvas.Brush.Color := CDButton.Color;
+(*  TmpB.Canvas.Brush.Color := CDButton.Color;
   TmpB.Canvas.Brush.Style := bsSolid;
   TmpB.Canvas.RoundRect(0, 0, TmpB.Width, TmpB.Height, 8, 8);
   CDButton.SetShape(TmpB);
   ADest.Draw(0, 0, TmpB);
   TmpB.Free;
-  }
+  *)
 
   ADest.Brush.Color := CDButton.Parent.Color;
   ADest.Brush.Style := bsSolid;
diff --git a/lcl/customdrawn_common.pas b/lcl/customdrawn_common.pas
index aa7a1ce732..059c8d678b 100644
--- a/lcl/customdrawn_common.pas
+++ b/lcl/customdrawn_common.pas
@@ -1256,7 +1256,7 @@ begin
   // The outter frame
 
   // if BevelOuter is set then draw a frame with BevelWidth
-  if (AStateEx.BevelOuter <> bvNone) and (AStateEx.BevelWidth > 0) then
+  if (AStateEx.BevelOuter <> bvNone) then
   begin
     NextRectFactor := AStateEx.BevelWidth;
     DrawFrame3d(ADest, Point(0, 0), ASize, AStateEx.BevelWidth, AStateEx.BevelOuter); // Note: Frame3D inflates ARect
@@ -1266,7 +1266,7 @@ begin
   ASize.cy := ASize.cy - NextRectFactor*2;
 
   // if BevelInner is set then skip the BorderWidth and draw a frame with BevelWidth
-  if (AStateEx.BevelInner <> bvNone) and (AStateEx.BevelWidth > 0) then
+  if (AStateEx.BevelInner <> bvNone) then
     DrawFrame3d(ADest, Point(NextRectFactor, NextRectFactor), ASize, AStateEx.BevelWidth, AStateEx.BevelInner); // Note: Frame3D inflates ARect
 
   {if Caption <> '' then
diff --git a/lcl/include/custompanel.inc b/lcl/include/custompanel.inc
index a13c29da30..d9689b81fb 100644
--- a/lcl/include/custompanel.inc
+++ b/lcl/include/custompanel.inc
@@ -100,13 +100,13 @@ begin
   ARect := GetClientRect;
 
   // if BevelOuter is set then draw a frame with BevelWidth
-  if (BevelOuter <> bvNone) and (BevelWidth > 0) then
+  if (BevelOuter <> bvNone) then
     Canvas.Frame3d(ARect, BevelWidth, BevelOuter); // Note: Frame3D inflates ARect
 
   InflateRect(ARect, -BorderWidth, -BorderWidth);
 
   // if BevelInner is set then skip the BorderWidth and draw a frame with BevelWidth
-  if (BevelInner <> bvNone) and (BevelWidth > 0) then
+  if (BevelInner <> bvNone) then
     Canvas.Frame3d(ARect, BevelWidth, BevelInner); // Note: Frame3D inflates ARect
 
   if Caption <> '' then