diff --git a/dbaccess/uiconfig/ui/useradminpage.ui b/dbaccess/uiconfig/ui/useradminpage.ui
index e76349a49b90..7407e2574757 100644
--- a/dbaccess/uiconfig/ui/useradminpage.ui
+++ b/dbaccess/uiconfig/ui/useradminpage.ui
@@ -75,6 +75,7 @@
                     <property name="receives-default">True</property>
                     <property name="halign">end</property>
                     <property name="popup">menu</property>
+                    <property name="draw-indicator">True</property>
                     <child>
                       <placeholder/>
                     </child>
diff --git a/libreofficekit/qa/gtktiledviewer/gtv.ui b/libreofficekit/qa/gtktiledviewer/gtv.ui
index 79cb9a9ec409..a66cefefef3f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv.ui
+++ b/libreofficekit/qa/gtktiledviewer/gtv.ui
@@ -455,6 +455,7 @@
             <property name="can_focus">False</property>
             <property name="tooltip_text">Content control date</property>
             <property name="popover">calendar</property>
+            <property name="draw-indicator">True</property>
             <child>
               <placeholder/>
             </child>
diff --git a/sc/uiconfig/scalc/ui/sortcriteriapage.ui b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
index df7e23219161..67ebed40ab82 100644
--- a/sc/uiconfig/scalc/ui/sortcriteriapage.ui
+++ b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
@@ -96,7 +96,6 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="use-underline">True</property>
-                <property name="active">True</property>
                 <property name="draw-indicator">True</property>
                 <property name="group">rbTopDown</property>
               </object>
diff --git a/svx/uiconfig/ui/dockingfontwork.ui b/svx/uiconfig/ui/dockingfontwork.ui
index ecfd6a543b15..797bf9527036 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -44,7 +44,6 @@
             <child>
               <object class="GtkRadioToolButton" id="off">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|off|tooltip_text">Baseline Off</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw01.png</property>
@@ -73,7 +72,6 @@
             <child>
               <object class="GtkRadioToolButton" id="rotate">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|rotate|tooltip_text">Rotate</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw02.png</property>
@@ -92,7 +90,6 @@
             <child>
               <object class="GtkRadioToolButton" id="upright">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|upright|tooltip_text">Upright</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw03.png</property>
@@ -111,7 +108,6 @@
             <child>
               <object class="GtkRadioToolButton" id="hori">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw04.png</property>
@@ -130,7 +126,6 @@
             <child>
               <object class="GtkRadioToolButton" id="vert">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw05.png</property>
@@ -160,7 +155,6 @@
             <child>
               <object class="GtkToggleToolButton" id="orientation">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|orientation|tooltip_text">Orientation</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw06.png</property>
@@ -188,7 +182,6 @@
             <child>
               <object class="GtkRadioToolButton" id="left">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|left|tooltip_text">Align Left</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw07.png</property>
@@ -207,7 +200,6 @@
             <child>
               <object class="GtkRadioToolButton" id="center">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|center|tooltip_text">Align Center</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw08.png</property>
@@ -226,7 +218,6 @@
             <child>
               <object class="GtkRadioToolButton" id="right">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|right|tooltip_text">Align Right</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw09.png</property>
@@ -245,7 +236,6 @@
             <child>
               <object class="GtkRadioToolButton" id="autosize">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw010.png</property>
@@ -364,7 +354,6 @@
             <child>
               <object class="GtkToggleToolButton" id="contour">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|contour|tooltip_text">Contour</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw011.png</property>
@@ -382,7 +371,6 @@
             <child>
               <object class="GtkToggleToolButton" id="textcontour">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw012.png</property>
@@ -410,7 +398,6 @@
             <child>
               <object class="GtkRadioToolButton" id="noshadow">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|noshadow|tooltip_text">No Text Shadow</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw013.png</property>
@@ -429,7 +416,6 @@
             <child>
               <object class="GtkRadioToolButton" id="vertical">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|vertical|tooltip_text">Add Text Shadow</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw014.png</property>
@@ -448,7 +434,6 @@
             <child>
               <object class="GtkRadioToolButton" id="slant">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="dockingfontwork|slant|tooltip_text">Slant Text Shadow</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">svx/res/fw015.png</property>