diff --git a/lcl/buttons.pp b/lcl/buttons.pp
index 2e9ad9a625..bad719912e 100644
--- a/lcl/buttons.pp
+++ b/lcl/buttons.pp
@@ -199,7 +199,7 @@ type
     procedure LoadGlyphFromResourceName(Instance: THandle; const AName: String);
     procedure LoadGlyphFromLazarusResource(const AName: String);
     procedure LoadGlyphFromStock(idButton: Integer);
-    function CanShowGlyph: Boolean;
+    function CanShowGlyph(const AWithShowMode: Boolean = False): Boolean;
   public
     property Caption stored IsCaptionStored;
     property DefaultCaption: Boolean read FDefaultCaption write FDefaultCaption default False;
diff --git a/lcl/include/bitbtn.inc b/lcl/include/bitbtn.inc
index dfa74e3f27..480f780a61 100644
--- a/lcl/include/bitbtn.inc
+++ b/lcl/include/bitbtn.inc
@@ -90,9 +90,11 @@ begin
     Images := nil;
 end;
 
-function TCustomBitBtn.CanShowGlyph: Boolean;
+function TCustomBitBtn.CanShowGlyph(const AWithShowMode: Boolean): Boolean;
 begin
   Result := FButtonGlyph.CanShowGlyph;
+  if AWithShowMode then
+    Result := Result and FButtonGlyph.CanShow;
 end;
 
 function TCustomBitBtn.GetGlyph : TBitmap;
diff --git a/lcl/interfaces/qt/qtwsbuttons.pp b/lcl/interfaces/qt/qtwsbuttons.pp
index 85d1b7139c..7793b9058a 100644
--- a/lcl/interfaces/qt/qtwsbuttons.pp
+++ b/lcl/interfaces/qt/qtwsbuttons.pp
@@ -99,7 +99,7 @@ begin
 
   TQtBitBtn(ABitBtn.Handle).GlyphLayout := Ord(ABitBtn.Layout);
   AIcon := QIcon_create();
-  if ABitBtn.CanShowGlyph then
+  if ABitBtn.CanShowGlyph(True) then
   begin
     AGlyph := TBitmap.Create;
     APixmap := QPixmap_create();
diff --git a/lcl/interfaces/qt5/qtwsbuttons.pp b/lcl/interfaces/qt5/qtwsbuttons.pp
index 4d082777e9..3e1b79ae4a 100644
--- a/lcl/interfaces/qt5/qtwsbuttons.pp
+++ b/lcl/interfaces/qt5/qtwsbuttons.pp
@@ -98,7 +98,7 @@ begin
 
   TQtBitBtn(ABitBtn.Handle).GlyphLayout := Ord(ABitBtn.Layout);
   AIcon := QIcon_create();
-  if ABitBtn.CanShowGlyph then
+  if ABitBtn.CanShowGlyph(True) then
   begin
     AGlyph := TBitmap.Create;
     APixmap := QPixmap_create();