diff --git a/lcl/interfaces/gtk2/gtk2proc.inc b/lcl/interfaces/gtk2/gtk2proc.inc
index dc1d8c9aeb..11fddc7206 100644
--- a/lcl/interfaces/gtk2/gtk2proc.inc
+++ b/lcl/interfaces/gtk2/gtk2proc.inc
@@ -7047,7 +7047,7 @@ begin
 
           SysColorMap[COLOR_BTNFACE] := TGDKColorToTColor(bg[GTK_STATE_INSENSITIVE]);
           SysColorMap[COLOR_BTNSHADOW] := TGDKColorToTColor(dark[GTK_STATE_INSENSITIVE]);
-          SysColorMap[COLOR_BTNTEXT] := TGDKColorToTColor(fg[GTK_STATE_INSENSITIVE]);
+          SysColorMap[COLOR_BTNTEXT] := TGDKColorToTColor(fg[GTK_STATE_NORMAL]);
           SysColorMap[COLOR_BTNHIGHLIGHT] := TGDKColorToTColor(light[GTK_STATE_INSENSITIVE]);
           SysColorMap[COLOR_3DDKSHADOW] := TGDKColorToTColor(black);
           SysColorMap[COLOR_3DLIGHT] := TGDKColorToTColor(bg[GTK_STATE_INSENSITIVE]);
diff --git a/lcl/interfaces/gtk2/gtk2wscomctrls.pp b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
index 54f5a61671..3e592488b5 100644
--- a/lcl/interfaces/gtk2/gtk2wscomctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
@@ -205,7 +205,6 @@ type
     class procedure SetCallbacks(const AWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual;
   published
     class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
-    class function GetDefaultColor(const AControl: TControl; const ADefaultColorType: TDefaultColorType): TColor; override;
   end;
 
   { TGtk2WSTrackBar }
@@ -628,13 +627,4 @@ begin
   SetCallbacks(Widget, WidgetInfo);
 end;
 
-class function TGtk2WSToolBar.GetDefaultColor(const AControl: TControl;
-  const ADefaultColorType: TDefaultColorType): TColor;
-begin
-  if ADefaultColorType = dctFont then
-    Result := clWindowText
-  else
-    Result := clDefault;
-end;
-
 end.
diff --git a/lcl/interfaces/gtk2/gtk2wsextctrls.pp b/lcl/interfaces/gtk2/gtk2wsextctrls.pp
index 1c4f43897f..a3e1ec0810 100644
--- a/lcl/interfaces/gtk2/gtk2wsextctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wsextctrls.pp
@@ -191,7 +191,6 @@ type
     class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual;
   published
     class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
-    class function GetDefaultColor(const AControl: TControl; const ADefaultColorType: TDefaultColorType): TColor; override;
     class procedure SetColor(const AWinControl: TWinControl); override;
   end;
 
@@ -791,15 +790,6 @@ begin
   SetCallbacks(Widget, WidgetInfo);
 end;
 
-class function TGtk2WSCustomPanel.GetDefaultColor(const AControl: TControl;
-  const ADefaultColorType: TDefaultColorType): TColor;
-begin
-  if ADefaultColorType = dctFont then
-    Result := clWindowText
-  else
-    Result := clDefault;
-end;
-
 class procedure TGtk2WSCustomPanel.SetColor(const AWinControl: TWinControl);
 var
   MainWidget: PGtkWidget;