diff --git a/lcl/interfaces/qt/qtthemes.pas b/lcl/interfaces/qt/qtthemes.pas
index 43d2dc0a5f..dab965f422 100644
--- a/lcl/interfaces/qt/qtthemes.pas
+++ b/lcl/interfaces/qt/qtthemes.pas
@@ -867,15 +867,13 @@ begin
         inc(Result.cx);
         inc(Result.cy);
       end;
-    {$IFDEF LINUX} // fix tbsButtonDrop arrow outside button bounds
     teToolBar:
-      if (Details.Part = TP_DROPDOWNBUTTON) then
+      if (Details.Part = TP_DROPDOWNBUTTON) or (Details.Part = TP_SPLITBUTTONDROPDOWN) then
       begin
         Result.cy := -1;
-        Result.cx := 14;
+        Result.cx := QStyle_pixelMetric(Style, QStylePM_MenuButtonIndicator, nil, nil);
       end else
         Result := inherited;
-    {$ENDIF}
     else
       Result := inherited;
   end;
diff --git a/lcl/interfaces/qt5/qtthemes.pas b/lcl/interfaces/qt5/qtthemes.pas
index 30a2172d5d..bc1a0c6dbb 100644
--- a/lcl/interfaces/qt5/qtthemes.pas
+++ b/lcl/interfaces/qt5/qtthemes.pas
@@ -865,15 +865,13 @@ begin
         inc(Result.cx);
         inc(Result.cy);
       end;
-    {$IFDEF LINUX} // fix tbsButtonDrop arrow outside button bounds
     teToolBar:
-      if (Details.Part = TP_DROPDOWNBUTTON) then
+      if (Details.Part = TP_DROPDOWNBUTTON) or (Details.Part = TP_SPLITBUTTONDROPDOWN) then
       begin
         Result.cy := -1;
-        Result.cx := 14;
+        Result.cx := QStyle_pixelMetric(Style, QStylePM_MenuButtonIndicator, nil, nil);
       end else
         Result := inherited;
-    {$ENDIF}
     else
       Result := inherited;
   end;