diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 1a268d3bf22f..c9a245203b35 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -262,6 +262,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -291,6 +292,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -644,6 +646,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 466ca4b40da7..1eb738d64bd5 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -135,6 +135,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
             <child>
               <placeholder/>
             </child>
@@ -258,6 +259,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
             <child>
               <placeholder/>
             </child>
@@ -273,6 +275,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
             <child>
               <placeholder/>
             </child>
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index cdaf2f3f8840..3b199c5df0a5 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -469,6 +469,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -499,6 +500,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui
index b683522f5c55..ad1fa38f0e06 100644
--- a/cui/uiconfig/ui/hatchpage.ui
+++ b/cui/uiconfig/ui/hatchpage.ui
@@ -291,6 +291,7 @@
                     <property name="halign">start</property>
                     <property name="valign">center</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -328,6 +329,7 @@
                     <property name="halign">start</property>
                     <property name="valign">center</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index c2334ef0f872..3cdeb4fe8757 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -236,6 +236,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -747,6 +748,7 @@
                             <property name="receives_default">True</property>
                             <property name="popup">menuSELECT</property>
                             <property name="use_popover">False</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index 3baf8618b039..3382171a2eb3 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -364,6 +364,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="popup">bitmapmenu</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -379,6 +380,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui
index 836e9a5ee05f..1624b6dd2026 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -232,6 +232,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -276,6 +277,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui
index d781d262bf50..391b4bed75ca 100644
--- a/cui/uiconfig/ui/shadowtabpage.ui
+++ b/cui/uiconfig/ui/shadowtabpage.ui
@@ -124,6 +124,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui
index c96e2f01281e..8cf74c00b201 100644
--- a/sc/uiconfig/scalc/ui/databaroptions.ui
+++ b/sc/uiconfig/scalc/ui/databaroptions.ui
@@ -252,6 +252,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -264,6 +265,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -389,6 +391,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
diff --git a/sc/uiconfig/scalc/ui/groupbydate.ui b/sc/uiconfig/scalc/ui/groupbydate.ui
index 59c7e9449c23..9c0ff003c5d7 100644
--- a/sc/uiconfig/scalc/ui/groupbydate.ui
+++ b/sc/uiconfig/scalc/ui/groupbydate.ui
@@ -155,6 +155,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -246,6 +247,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
diff --git a/sc/uiconfig/scalc/ui/headerfootercontent.ui b/sc/uiconfig/scalc/ui/headerfootercontent.ui
index 1fd4d4e29089..7ef031f12b43 100644
--- a/sc/uiconfig/scalc/ui/headerfootercontent.ui
+++ b/sc/uiconfig/scalc/ui/headerfootercontent.ui
@@ -246,6 +246,7 @@
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_FILE|tooltip_text">Title</property>
                 <property name="image">imageBTN_FILE</property>
+                <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/scenariodialog.ui b/sc/uiconfig/scalc/ui/scenariodialog.ui
index 0067c12a3f13..5dd935383618 100644
--- a/sc/uiconfig/scalc/ui/scenariodialog.ui
+++ b/sc/uiconfig/scalc/ui/scenariodialog.ui
@@ -279,6 +279,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
                                 <child>
                                   <placeholder/>
                                 </child>
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index 1bb828ece646..1178e151f2b9 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -452,6 +452,7 @@
                             <property name="receives_default">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -468,6 +469,7 @@
                             <property name="receives_default">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                             <child>
                               <placeholder/>
                             </child>
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index 52e889fb9898..315605791b69 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -258,6 +258,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/sd/uiconfig/simpress/ui/customanimationfragment.ui b/sd/uiconfig/simpress/ui/customanimationfragment.ui
index 0002338a61cf..44210c7ceb2f 100644
--- a/sd/uiconfig/simpress/ui/customanimationfragment.ui
+++ b/sd/uiconfig/simpress/ui/customanimationfragment.ui
@@ -242,6 +242,7 @@
         <property name="no_show_all">True</property>
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
+        <property name="draw_indicator">True</property>
         <child>
           <placeholder/>
         </child>
@@ -288,6 +289,7 @@
         <property name="receives_default">True</property>
         <property name="no_show_all">True</property>
         <property name="popup">menu</property>
+        <property name="draw_indicator">True</property>
         <child>
           <placeholder/>
         </child>
@@ -316,6 +318,7 @@
         <property name="receives_default">True</property>
         <property name="no_show_all">True</property>
         <property name="popup">menu1</property>
+        <property name="draw_indicator">True</property>
         <child>
           <placeholder/>
         </child>
@@ -344,6 +347,7 @@
         <property name="receives_default">True</property>
         <property name="no_show_all">True</property>
         <property name="popup">menu2</property>
+        <property name="draw_indicator">True</property>
         <child>
           <placeholder/>
         </child>
@@ -372,6 +376,7 @@
         <property name="receives_default">True</property>
         <property name="no_show_all">True</property>
         <property name="popup">menu3</property>
+        <property name="draw_indicator">True</property>
         <child>
           <placeholder/>
         </child>
@@ -401,6 +406,7 @@
         <property name="receives_default">True</property>
         <property name="no_show_all">True</property>
         <property name="popup">menu4</property>
+        <property name="draw_indicator">True</property>
         <child>
           <placeholder/>
         </child>
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 6c200603f41d..6aace9cc6f7a 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -87,6 +87,7 @@
                 <property name="use_underline">True</property>
                 <property name="popup">menu1</property>
                 <property name="use_popover">False</property>
+                <property name="draw_indicator">True</property>
                 <child>
                   <placeholder/>
                 </child>
diff --git a/starmath/uiconfig/smath/ui/spacingdialog.ui b/starmath/uiconfig/smath/ui/spacingdialog.ui
index d3ccd188ffec..e16c6b58d8e8 100644
--- a/starmath/uiconfig/smath/ui/spacingdialog.ui
+++ b/starmath/uiconfig/smath/ui/spacingdialog.ui
@@ -163,6 +163,7 @@
                 <property name="use_underline">True</property>
                 <property name="popup">menu</property>
                 <property name="use_popover">False</property>
+                <property name="draw_indicator">True</property>
                 <child>
                   <placeholder/>
                 </child>
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index f2ba8e98ca6f..13956a6b4d24 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -449,6 +449,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -502,6 +503,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/sw/uiconfig/swriter/ui/envformatpage.ui b/sw/uiconfig/swriter/ui/envformatpage.ui
index f49b6ea2db97..dec8241a337e 100644
--- a/sw/uiconfig/swriter/ui/envformatpage.ui
+++ b/sw/uiconfig/swriter/ui/envformatpage.ui
@@ -230,6 +230,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="popup">editmenu1</property>
+                                <property name="draw_indicator">True</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -427,6 +428,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="popup">editmenu2</property>
+                                <property name="draw_indicator">True</property>
                                 <child>
                                   <placeholder/>
                                 </child>
diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui b/sw/uiconfig/swriter/ui/footnoteareapage.ui
index ec0e9c253d18..bf2845c68326 100644
--- a/sw/uiconfig/swriter/ui/footnoteareapage.ui
+++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui
@@ -302,6 +302,7 @@
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -319,6 +320,7 @@
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui b/sw/uiconfig/swriter/ui/outlinenumbering.ui
index 37525bfd703b..1b1fac44c20d 100644
--- a/sw/uiconfig/swriter/ui/outlinenumbering.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui
@@ -118,6 +118,7 @@
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
                 <property name="popup">form</property>
+                <property name="draw_indicator">True</property>
                 <child>
                   <placeholder/>
                 </child>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui
index 820acaa3ffda..4dfd3fc480d1 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -495,6 +495,7 @@
                     <property name="receives_default">False</property>
                     <property name="halign">start</property>
                     <property name="valign">center</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 9522028fc1d1..90c5c6e2fa34 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -971,6 +971,7 @@
                         <property name="use_underline">True</property>
                         <property name="popup">filemenu</property>
                         <property name="use_popover">False</property>
+                        <property name="draw_indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 8035c6b9d47f..5c1005b1dcc2 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -202,6 +202,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 4fedce41c35f..c4a74ec53bf8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1209,13 +1209,13 @@ namespace
         return xWindow;
     }
 
-    VclPtr<Button> extractStockAndBuildMenuButton(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+    VclPtr<MenuButton> extractStockAndBuildMenuButton(vcl::Window *pParent, VclBuilder::stringmap &rMap)
     {
         WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
 
         nBits |= extractRelief(rMap);
 
-        VclPtr<Button> xWindow = VclPtr<MenuButton>::Create(pParent, nBits);
+        VclPtr<MenuButton> xWindow = VclPtr<MenuButton>::Create(pParent, nBits);
 
         if (extractStock(rMap))
         {
@@ -1431,6 +1431,18 @@ namespace
         }
         return sAdjustment;
     }
+
+    bool extractDrawIndicator(VclBuilder::stringmap &rMap)
+    {
+        bool bDrawIndicator = false;
+        VclBuilder::stringmap::iterator aFind = rMap.find(OString("draw-indicator"));
+        if (aFind != rMap.end())
+        {
+            bDrawIndicator = toBool(aFind->second);
+            rMap.erase(aFind);
+        }
+        return bDrawIndicator;
+    }
 }
 
 void VclBuilder::extractModel(const OString &id, stringmap &rMap)
@@ -1708,13 +1720,16 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
     }
     else if (name == "GtkMenuButton")
     {
-        VclPtr<Button> xButton;
-        xButton = extractStockAndBuildMenuButton(pParent, rMap);
+        VclPtr<MenuButton> xButton = extractStockAndBuildMenuButton(pParent, rMap);
         OUString sMenu = extractPopupMenu(rMap);
         if (!sMenu.isEmpty())
             m_pParserState->m_aButtonMenuMaps.emplace_back(id, sMenu);
         xButton->SetImageAlign(ImageAlign::Left); //default to left
         xButton->SetAccessibleRole(css::accessibility::AccessibleRole::BUTTON_MENU);
+
+        if (!extractDrawIndicator(rMap))
+            xButton->SetDropDown(PushButtonDropdownStyle::NONE);
+
         setupFromActionName(xButton, rMap, m_xFrame);
         xWindow = xButton;
     }